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
DJWarmonger
bf20b165ec
Fix. Don't skip usual condition.
2017-11-04 22:50:11 +01:00
DJWarmonger
3eb5de9534
Fixed AI trying to visit tavern over and over.
...
TODO: AI still can't use it, anyway.
2017-11-04 22:45:19 +01:00
DJWarmonger
edc4c01805
Fixed a case when AI could spend all money on army and not build anything in secondary towns.
2017-11-04 22:14:56 +01:00
AlexVinS
654fea56a4
Fixed memory leak in CAnimation (regression of #376 )
2017-11-04 06:03:43 +03:00
DJWarmonger
8f42cdea67
Refactoring: use private pointer to CMapGenerator
2017-11-03 21:03:51 +01:00
AlexVinS
97d73f47b0
Fixed https://bugs.vcmi.eu/view.php?id=2817
2017-11-03 18:39:43 +03:00
AlexVinS
8b5cbf6ba7
fix
2017-11-01 07:42:58 +03:00
Arseniy Shestakov
75c3e30404
CMake: further improvements for generated VS solutions
...
* Set vcmiclient as VS_STARTUP_PROJECT so it's will be default debug target instead of ALL_BUILD.
* Add AIs and server as dependencies for client so VS will suggest to rebuild them before debugging.
2017-10-31 09:30:58 +03:00
Arseniy Shestakov
719587b091
Travis CI: avoid probolems with brew for with macOS builds
...
Also remove Sparkle since it's no longer used
2017-10-29 23:02:37 +03:00
Alexander Shishkin
fd4ecbd40b
Merge pull request #385 from Chocimier/altar
...
Fixed "Altar of Sacrifice only sacrifices creatures one kind at a time"
* https://bugs.vcmi.eu/view.php?id=2607
2017-10-28 14:04:34 +03:00
Piotr Wójcik
7171fa7ad4
Formatting
2017-10-28 11:04:55 +02:00
AlexVinS
c39cd5f951
Town building build mode fixes
...
* CGameHandler::buildStructure was using wrong requirements for buildings in auto mode.
* Build mode loading was wrong in case of omitted value
* Show town hall slot for not built building only if it have normal build mode
2017-10-28 03:27:39 +03:00
AlexVinS
8027650f4a
Hide Dungeon horde1Upgr in town hall
2017-10-28 00:22:14 +03:00
AlexVinS
4b24bea196
Fixed Dungeon horde1 was always shown upgraded
2017-10-27 13:30:23 +03:00
Alexander Shishkin
52e837bde3
Merge pull request #386 from FeniksFire/SplittingShortcuts
...
Add keyboard shortcuts for splitting army from HD mod.
2017-10-27 07:08:27 +03:00
FeniksFire
86021f0bda
Add keyboard shortcuts for quick army management from HD mod.
...
Just want add fast some really nice shortcuts from HD mod.
1) [LShift] + LClick – splits a half units from the selected stack into
an empty slot. WARNING: The second behaviour ("smart split, ignores
single creatures") of this HD mod option is not done.
2) [LCtrl] + LClick – splits a single unit from the selected stack into
an empty slot.
3) [LCtrl] + [LShift] + LClick – split single units from the selected
stack into all empty hero/garrison slots
2017-10-27 05:21:33 +02:00
Piotr Wójcik
58b427345f
Constify
2017-10-18 21:39:04 +02:00
Piotr Wójcik
78e5d39ea0
Change variables type
2017-10-18 21:02:23 +02:00
Piotr Wójcik
802680f925
Fix compilation
2017-10-17 09:55:11 +02:00
Piotr Wójcik
f9ed952869
Properly calculate experience on altar
2017-10-14 22:10:59 +02:00
Piotr Wójcik
f145b4be91
Correctly sacrifice many stacks or many atrifacts, fixes #2607
2017-10-14 21:30:56 +02:00
