games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
7,104 Commits 21 Branches 61 Tags 104 MiB
1fb25c46d3
Commit Graph

7104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS
1fb25c46d3 cleanup 2018-04-03 21:46:12 +03:00
Henning Koehler
82f334b503 Enable Limiter nesting with AllOf, AnyOf, NoneOf (#439) 
* Renamed LimiterList to AllOfLimiter and added AnyOfLimiter, NoneOfLimiter
* Updated bonus schema to new limiter format
 2018-04-01 18:17:34 +07:00
Henning Koehler
6ddcb079a4 Enabled new secondary skills to be created (#438) 
* Universities, Scholars and Witch Huts may offer new skills
* Moved encode/decodeSkill to CSkillHandler
* Refactored CSkill interface and CSkill::LevelInfo image storage
* Legacy game constants renamed to ORIGINAL_XXX_QUANTITY
 2018-03-31 12:56:40 +07:00
AlexVinS
b09a54fa9c [tweaks] IImage * -> auto 2018-03-30 14:29:55 +03:00
AlexVinS
43acfa160b [tweaks] IImage * -> auto 2018-03-30 14:02:04 +03:00
AlexVinS
031d3204f7 Fixed "Error: accessing unavailable frame" in some cases 2018-03-30 13:40:40 +03:00
Arseniy Shestakov
66e9db4bc3 CMake: extend linker workaround for all MSVC versions for now. 
Debug builds in MSVS 2017 are also affected.

32-bit Release builds in MSVS 2015 are probably affected as well.
Though in that case problem only appear for vcmitest, but not client.
 2018-03-29 11:05:48 +07:00
Arseniy Shestakov
8577bba417 CMake: add workaround for Visual Studio 2015 linking issue 
I tried to workaround it in code, but completely failed that.
So for now we'll just tell linker to ignore multiple definitions.
 2018-03-29 02:02:00 +07:00
Henning Koehler
02b5a5e830 Make bonus stacking configurable + fix duplicate propagation/inheritance (#433) 
Addresses several related problems:
* Propagation / unpropagation of duplicate bonuses is inconsistent, causing bugs
* Duplicate bonuses never stack, which is not always intended behaviour (e.g. multiple copies of resource generating artifacts)
* Different bonuses always stack, which is not always intended behaviour (e.g. Angel + Archangel morale bonuses)

This is addressed as follows:
* Duplicate bonuses are never eliminated during propagation/inheritance.
* Unpropagation eliminates only a single copy of duplicated bonus
* Bonus receives a new field stacking that determines stacking behaviour:
* * empty string = no stacking with duplicates (default)
* * "ALWAYS" = stacks with duplicates & everything else
* * some other value = no stacking with bonuses with same stacking value
Also Morale/Luck window now hides non-stacking bonuses.
 2018-03-27 14:54:58 +07:00
Henning Koehler
2b64bf29ed Fix Issue 2214 (#437) 
CGameInfoCallback::getAvailableHeroes: add checks for tavern
 2018-03-22 18:14:43 +07:00
AlexVinS
cac83379f5 Fixed https://bugs.vcmi.eu/view.php?id=2928 2018-03-22 12:56:15 +07:00
Alexander Shishkin
5d0cb31504
Merge pull request #434 from vcmi/CADDINFO_FIX2 
Bugfix for last CAddInfo bugfix
 2018-03-20 04:11:14 +03:00
Henning Koehler
591928fc4b fixed bug introduced in last CAddInfo fix 2018-03-20 12:58:02 +13:00
AlexVinS
df0aa2f69c Removes excess assertion in HeroVisit::applyCl 2018-03-17 17:10:13 +03:00
Henning Koehler
1685641357 Flexible necromancy (#430) 
* made IMPROVED_NECROMANCY bonus configurable
* updated cloak of the undead king
 2018-03-17 16:46:16 +08:00
AlexVinS
e666b2740c Do not use CCreature in CSimpleArmy 2018-03-17 13:24:12 +08:00
AlexVinS
03cfd2cb78 Do not use StackLocation in netpacks 2018-03-17 13:24:12 +08:00
AlexVinS
8cec07afbd Replaced CGHeroInstance and CGObjectInstance with ObjectInstanceID in NetPacks 2018-03-17 13:24:12 +08:00
Raphnalor
0f00dbf8cf Fix highlighting of a selected bonus for campaign. (#432) 2018-03-17 12:23:22 +08:00
Alexander Shishkin
1e9a3e0fe4
Merge pull request #431 from vcmi/ISSUE_2918 
Fixed Issue 2914 & 2918
 2018-03-17 02:49:11 +03:00
Henning Koehler
8e7aa910cb spacing fix 2018-03-17 11:32:30 +13:00
Henning Koehler
68b757eb53 fixed CAddInfo::operator[] (mutable version) 2018-03-17 11:03:02 +13:00
Henning Koehler
7f76648a7c Extend Bonus.addInfo to integer vector (#427) 
* changed Bonus::additionalInfo to integer vector

* fixed deserialization for old savegames

* removed newline from JsonNode::toJson()

* updated bonus schema; SPELL_AFTER_ATTACK and SPELL_BEFORE_ATTACK use new addInfo format

* removed unnecessary init in Bonus constructor
 2018-03-12 08:20:18 +03:00
Raphnalor
83c6ffbda0 Reflect changes in boost::asio released in Boost 1.66. (#428) 
The service template parameters are disabled by default for now.
Use BOOST_ASIO_ENABLE_OLD_SERVICES macro to enable the old interface.
 2018-03-11 21:02:20 +08:00
AlexVinS
9d108d59db Redone RMG template serialization using JSON serializer, added tests 2018-03-10 19:36:19 +03:00
AlexVinS
7d27d144a5 Possible fix for https://bugs.vcmi.eu/view.php?id=2913 2018-03-10 19:35:20 +03:00
AlexVinS
b2faf30d0d [tests] Moved JsonComparer to own file 2018-03-05 21:26:00 +03:00
ArseniyShestakov
079cd470c2
Merge pull request #425 from vcmi/CatapultRework 
Catapult rework
 2018-03-06 01:16:53 +08:00
Henning Koehler
e455d97fc7 cleanup of CBonusSystemNode::removeBonusesRecursive 2018-03-05 22:13:23 +08:00
Henning Koehler
6263c4c3eb renamed CGHeroInstance::updateSkill to updateSkillBonus 2018-03-05 22:13:23 +08:00
Henning Koehler
d3e4fc6e7a renamed CBonusSystemNode::popBonuses to removeBonusesRecursive 2018-03-05 22:13:23 +08:00
Henning Koehler
4c0a67041b secondary skill bonuses get updated via replacement (issue 2796) 2018-03-05 22:13:23 +08:00
AlexVinS
26aad17295 Actually copy zone data from map generator template 
* fixes https://bugs.vcmi.eu/view.php?id=2482
 2018-03-05 17:05:48 +03:00
Dydzio
07cf59592b Updated catapult spell effect to match new code 2018-03-05 12:55:44 +01:00
Henning Koehler
4ee9d7f65a Configure JSON merge behaviour via #override flag (#423) 
* added json flags; override flag affects how structs are merged
 2018-03-05 11:30:10 +08:00
AlexVinS
f126a34a5e Fixed https://bugs.vcmi.eu/view.php?id=2904 2018-03-04 11:15:24 +03:00
jerryskye
dec825fdc2 redefined lctrl to lgui for macs (#426) 
keyboard shortcuts for splitting armies will use left command key
instead of left control
 2018-03-04 10:46:29 +08:00
AlexVinS
5ea1888a14 Summon effect fixes. 2018-03-03 20:37:49 +03:00
Dydzio
fb9ee9ddf7 Visual fix - destroy shooters together with tower 2018-03-02 15:36:44 +01:00
Dydzio
e68a2e7ef5 Fix arrow tower destruction mechanics 2018-03-02 15:23:07 +01:00
Dydzio
b55d506e22 Grant advanced catapult proficiency with CATAPULT_EXTRA_SHOTS 2018-03-02 13:46:14 +01:00
Dydzio
44d653b835 Update VS files to match latest develop (#424) 2018-03-02 14:32:00 +03:00
Alexander Shishkin
8b002ad774
Issue2888 (#421) 
Fixed issue 2888
* Merged AFTER_ATTACK & BEFORE_ATTACK cast modes.
* Introduced new caster class for creature ability usage
* Added few tests
 2018-03-02 13:22:51 +03:00
AlexVinS
386805c4e0 [BattleAI] Battle magic fixes 
* should fix https://bugs.vcmi.eu/view.php?id=2901
 2018-03-01 22:18:01 +03:00
Arseniy Shestakov
e48797f7e8 CMake: enable /MP flag by default for Visual Studio solution 
Can be toggled with ENABLE_MULTI_PROCESS_BUILDS option to CMake
 2018-02-28 22:30:31 +08:00
ArseniyShestakov
7fd090786c
Merge pull request #379 from henningkoehlernz/hero_specialty_scaling 
Hero specialty scaling
 2018-02-28 15:03:24 +08:00
AlexVinS
f917ec5254 Revert "Fixed ancient backward compatibility regression" 
This reverts commit 3c67e12620.
 2018-02-28 15:00:38 +08:00
AlexVinS
166c04e2e0 Hack fixed serializer assertion by completely disabling AI goals serialization 2018-02-28 15:00:38 +08:00
AlexVinS
3c67e12620 Fixed ancient backward compatibility regression 2018-02-24 19:48:49 +03:00
Arseniy Shestakov
434deffb54 CAdvMapInt: improve hero reminder by checking hero path 
Dialog won't show up if movement points insufficient for first step on current path.
 2018-02-24 21:49:42 +08:00