Alexander Shishkin
e90fcea3d3
Merge pull request #396 from FeniksFire/update
...
Update graphics for QuickRecruitmentWindow
2018-01-14 10:42:23 +03:00
Alexander Shishkin
aadc09b9f0
Merge pull request #405 from dydzio0614/vsupdate
...
Update project files to Visual Studio 2017
2018-01-14 03:03:45 +03:00
Dydzio
38d836d1a5
Update project files to Visual Studio 2017
2018-01-13 16:33:49 +01:00
Arseniy Shestakov
da117e9255
Code style: remove void from constructors without arguments
2018-01-13 11:51:47 +03:00
FeniksFire
1331c81a8b
Update graphics for QuickRecruitmentWindow
...
Adding graphics maded by edeksumo
2018-01-13 09:49:29 +01:00
AlexVinS
759416ed88
Fixed https://bugs.vcmi.eu/view.php?id=2851
2018-01-13 05:05:28 +03:00
DjWarmonger
2498f917d4
Merge pull request #404 from dydzio0614/bug2846
...
Thanks!
2018-01-12 18:15:27 +01:00
Dydzio
baaa1a0f13
Add magic resistance for crystal dragons
2018-01-12 13:36:17 +01:00
AlexVinS
6033d32b5b
Fixed https://bugs.vcmi.eu/view.php?id=2845
2018-01-09 10:14:56 +03:00
DjWarmonger
c098b835ff
Merge pull request #195 from vcmi/feature/ambientSounds
...
And merge!
...Travis timeout issues are not my task.
2018-01-02 20:59:54 +01:00
Arseniy Shestakov
d3b3389a37
Implement configurable object sounds: ambient, visit and removal
...
* If there more than one sound for visit or removal random is played
* At moment only the first ambient sound will be used
2018-01-02 18:16:35 +01:00
DJWarmonger
20ac1d6880
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2018-01-02 17:57:11 +01:00
Dydzio
707257c2c8
Update file names in vs project ( #400 )
2018-01-02 19:40:23 +03:00
DJWarmonger
1a1de5366a
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2018-01-02 17:36:51 +01:00
DJWarmonger
b778623734
Merge branch 'feature/ambientSounds' into develop
2018-01-02 09:51:11 +01:00
Arseniy Shestakov
fc0ab5b970
TerrainTileObject: store ambientSound for every object
...
Though ambient sounds won't work for heroes objects since they added separately.
2018-01-02 09:50:05 +01:00
Arseniy Shestakov
d96a3aa5b7
CAudioBase: move mutex to base class since CSoundHandler need it
2018-01-02 09:49:04 +01:00
Arseniy Shestakov
c5ca75bc53
CRewardableObject: remove now unused soundID
2018-01-02 09:49:04 +01:00
Arseniy Shestakov
f15cadc87b
Implement configurable object sounds: ambient, visit and removal
...
* If there more than one sound for visit or removal random is played
* At moment only the first ambient sound will be used
2018-01-02 09:49:03 +01:00
Arseniy Shestakov
e9bfbb70c1
Ambient sounds: implement chebyshev distance for getTilesInRange
2018-01-02 09:48:17 +01:00
Arseniy Shestakov
e7fa9f8cd6
config: add ambient, visit and removal sounds to schemas / objects
2018-01-02 09:48:17 +01:00
Michał Janiszewski
6c2d082676
Use Ninja as build system ( #399 )
...
* Remove redunant command
* Use ninja as build system
* Install ninja on OS X
* Install ninja for MXE
2017-12-30 15:00:57 +03:00
DJWarmonger
f523ae5545
Fixed Magic resistance display.
2017-12-30 12:25:29 +01:00
DjWarmonger
c2a0b13332
Merge pull request #371 from dydzio0614/NewAbilities
...
Tested and approved. Congrats!
2017-12-29 14:19:05 +01:00
godric3
ad20528a7b
fix osx build
2017-12-27 16:11:42 +03:00
godric3
e7ad517bb5
fix mxe build
2017-12-26 17:21:23 +03:00
Alexander Shishkin
a209d10f23
Merge pull request #395 from FeniksFire/update
...
Adding simple background for quick recruitment window
2017-12-23 16:30:51 +03:00
FeniksFire
bf4024c3ac
Adding bacground for QuickRecruitmentWindow
...
Adding bacground for CreaturePurchaseCard in QuickRecruitmentWindow
2017-12-23 13:15:05 +01:00
AlexVinS
368ba0e2bf
fixes
2017-12-21 21:27:39 +03:00
FeniksFire
f82fd41a14
Quick Recruitment Window upgrade
...
Now is possible to switch by button between creatures upgrades.
Fixed small typo, rename from purhase to purchase.
2017-12-21 18:23:28 +01:00
Michał Kalinowski
26a222ac62
Change JsonType to enum class ( #393 )
...
Change enum JsonType to enum class JsonType
2017-11-27 00:18:18 +03:00
Dydzio
6df536bb31
Siege tower handling improvements ( #392 )
...
* Fix bug #2581 - siege tower damage
* Improved siege tower damage calculation a bit
2017-11-18 12:41:07 +03:00
Alexander Shishkin
ffe4dc582b
Merge pull request #391 from dydzio0614/VS_quickrecruitment_update
...
Update VS project files to mach latest develop
2017-11-17 18:43:10 +03:00
Dydzio
6ca1845515
Update VS project files to mach latest develop
2017-11-17 16:38:29 +01:00
AlexVinS
9bdd2c8d3f
Implemented new debug command "convert txt"
...
* use it to extract essential texts in json format
2017-11-16 23:23:03 +03:00
AlexVinS
e8a7078bb1
Quick fix for #389 .
...
* modded music support should be redone separately
2017-11-16 17:47:52 +03:00
AlexVinS
805b5215de
Client threading tweak
2017-11-16 14:15:43 +03:00
AlexVinS
d7366f04a9
[Map format, PreGame] allow selection of any allowed faction
2017-11-16 02:06:07 +03:00
AlexVinS
b8d0dfac5f
[Map format] fixed player options "canPlay" field
2017-11-16 00:03:27 +03:00
godric3
5a01aba9c8
fix for banks(crypt, ships) not giving morale penalty ( #384 )
...
* fix for banks(crypt, ships) not giving morale penalty
also texts should be closer to original now
2017-11-15 23:16:44 +03:00
AlexVinS
9cf3f4fe93
Merge remote-tracking branch 'remotes/godric3/customBattleMusic' into develop
2017-11-15 22:39:14 +03:00
AlexVinS
39194a0629
Merge branch 'SplittingShortcuts' into develop
2017-11-15 22:31:55 +03:00
AlexVinS
42a2aa2020
[C::B] project update
2017-11-15 22:31:30 +03:00
FeniksFire
3c3aaa7bb5
Improvement quick recruitment window
...
-Position is now relative to castle interface
-The highest level of creature is now presented.
-Improve positioning of creature card, now it's look like in hd mod.
2017-11-15 19:44:54 +01:00
AlexVinS
d93ef36750
Fixed https://bugs.vcmi.eu/view.php?id=2818
2017-11-15 15:54:54 +03:00
FeniksFire
f2b7c85811
Adding object construction macro with parameter
...
- Adding macro "OBJECT_CONSTRUCTION_CAPTURING" that take as parameter
action flag.
- Fixed minor errors
2017-11-14 08:52:33 +01:00
Dydzio
c6731f3b90
Fix code formatting
2017-11-13 14:18:38 +01:00
Dydzio
da6d01b0c7
Ability rename + bugfix + changelog extend
2017-11-13 01:59:41 +01:00
FeniksFire
a4f701014b
Quick Army Purhase in Town Screen
...
Mouse click on castle icon (it is now clickable) - quick recruit of all
available creatures.
2017-11-12 17:37:08 +01:00
godric3
76eed8682c
Allow mods to add music played during battles and ai turn
2017-11-11 21:16:11 +01:00
