games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
7,126 Commits 30 Branches 75 Tags
8ead3e3b91bd46deaee7de8f34047ff4d58fcab7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS d9d5b7b6e5 [c::b] update projects 2018-04-08 18:37:54 +03:00
AlexVinS db60983b5a Fixed broken town`s marketplace 2018-04-06 05:49:18 +03:00
AlexVinS a8e1c51c36 [c::b] projects update 2018-04-05 21:12:21 +03:00
AlexVinS 1fb25c46d3 cleanup 2018-04-03 21:46:12 +03: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
AlexVinS cac83379f5 Fixed https://bugs.vcmi.eu/view.php?id=2928 2018-03-22 12:56:15 +07:00
AlexVinS df0aa2f69c Removes excess assertion in HeroVisit::applyCl 2018-03-17 17:10:13 +03: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
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
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
AlexVinS f126a34a5e Fixed https://bugs.vcmi.eu/view.php?id=2904 2018-03-04 11:15:24 +03:00
AlexVinS 5ea1888a14 Summon effect fixes. 2018-03-03 20:37:49 +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
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
AlexVinS 080a81db3a Fixed summoned units not being removed after battle 2018-02-23 21:58:05 +03:00
AlexVinS 6d8536b12a Fixed https://bugs.vcmi.eu/view.php?id=2882 2018-02-20 14:29:06 +03:00
AlexVinS 2b49df2cab [Spells] Do not use Unit State in heal effect 2018-02-20 13:19:01 +03:00
AlexVinS 2add0e443e [Spells] Added "summonByHealth" option to Summon effect 
* with summonByHealth on, effect power (levelPower * SP) treated as HP
* default behavior (effect power = amount) not changed
* tests included
 2018-02-20 08:08:34 +03:00
AlexVinS 35b01eb379 Fixed https://bugs.vcmi.eu/view.php?id=2466 2018-02-10 08:37:15 +03:00
AlexVinS c94daf6faa Fixed https://bugs.vcmi.eu/view.php?id=2864 2018-02-10 07:31:02 +03:00
AlexVinS 10dd7e8a43 Cleanup 2018-02-10 04:03:17 +03:00
AlexVinS b194f8f13b Fixed https://bugs.vcmi.eu/view.php?id=2865 2018-02-10 00:02:56 +03:00
AlexVinS 0a2b04709f Fixed https://bugs.vcmi.eu/view.php?id=2873 2018-02-09 22:12:21 +03:00
AlexVinS 8220053864 Cleanup 2018-02-09 20:52:56 +03:00
AlexVinS 0b70baa95e Spells configuration version 2 (effect-based) 
* Indirect spell effects loading
* Json serializer improvements
* spell->canBeCastAt do not allow useless cast for any spell
* Added proxy caster class for spell-created obstacles
* Handle damage from spell-created obstacles inside mechanics
* Experimental GameState integration/regression tests
* Ignore mod settings and load only "vcmi" mod when running tests
* fixed https://bugs.vcmi.eu/view.php?id=2765 (with tests)
* Huge improvements of BattleAI regarding spell casts
* AI can cast almost any combat spell except TELEPORT, SACRIFICE and obstacle placement spells.
* Possible fix for https://bugs.vcmi.eu/view.php?id=1811
* CStack factored out to several classes
* [Battle] Allowed RETURN_AFTER_STRIKE effect on server side to be optional
* [Battle] Allowed BattleAction have multiple destinations
* [Spells] Converted limit|immunity to target condition
* [Spells] Use partial configuration reload for backward compatibility handling
* [Tests] Started tests for CUnitState
* Partial fixes of fire shield effect
* [Battle] Do HP calculations in 64 bits
* [BattleAI] Use threading for spell cast evaluation
* [BattleAI] Made AI be able to evaluate modified turn order (on hypothetical battle state)
* Implemented https://bugs.vcmi.eu/view.php?id=2811
* plug rare freeze when hypnotized unit shots vertically
* Correctly apply ONLY_MELEE_FIGHT / ONLY_DISTANCE_FIGHT for unit damage, attack & defense
* [BattleAI] Try to not waste a cast if battle is actually won already
* Extended JsonSerializeFormat API
* fixed https://bugs.vcmi.eu/view.php?id=2847
* Any unit effect can be now chained (not only damage like Chain Lightning)
** only damage effect for now actually uses "chainFactor"
* Possible quick fix for https://bugs.vcmi.eu/view.php?id=2860
 2018-02-08 11:37:21 +03:00
AlexVinS 759416ed88 Fixed https://bugs.vcmi.eu/view.php?id=2851 2018-01-13 05:05:28 +03:00
AlexVinS 6033d32b5b Fixed https://bugs.vcmi.eu/view.php?id=2845 2018-01-09 10:14:56 +03:00
AlexVinS 368ba0e2bf fixes 2017-12-21 21:27:39 +03: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
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
AlexVinS d93ef36750 Fixed https://bugs.vcmi.eu/view.php?id=2818 2017-11-15 15:54:54 +03:00
AlexVinS 654fea56a4 Fixed memory leak in CAnimation (regression of #376) 2017-11-04 06:03:43 +03: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
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
AlexVinS fc1938c341 fix 2017-10-08 11:03:12 +03:00
AlexVinS 891eb5771a Use hero battle victory and failure animations 2017-09-27 17:35:30 +03:00
AlexVinS 270e1b75ce Support for creature 2-hex attack, alternate death and cast animation types 
* margin option .json animation
* Use ranged attack animation for spell cast if there is no cast animation, display cast animation only on active casting.
 2017-09-12 19:51:54 +03:00
AlexVinS c30d9f2fd6 Fix 2017-09-06 15:50:59 +03:00
AlexVinS 3bbff27127 Wiped CDefEssential 2017-09-06 15:13:28 +03:00
AlexVinS 6cd0dd9843 Use CAnimation for creature projectiles 2017-09-05 20:04:17 +03:00
AlexVinS 05bb8b13e9 Use CAnimation for battle creature animation 2017-09-05 18:59:26 +03:00
AlexVinS 78b86224a0 Use CAnimation fro custom battle effects 2017-09-05 17:21:44 +03:00
AlexVinS 882e279818 Use CAnimation in CBattleInterfaceClasses 2017-09-05 16:44:27 +03:00
AlexVinS 69c6643893 More CCursorHandler style tweaks 
# Conflicts:
#	AI/FuzzyLite
 2017-09-05 15:25:49 +03:00
AlexVinS 9423555015 Declare ownership of CCursorHandler::dndObject 
# Conflicts:
#	AI/FuzzyLite
#	client/gui/CGuiHandler.cpp
 2017-09-05 15:25:31 +03:00
AlexVinS a8d25ea7b2 CHeroWindow tweaks 
# Conflicts:
#	AI/FuzzyLite
#	client/windows/CHeroWindow.cpp
 2017-09-05 15:22:48 +03:00
AlexVinS ce4b206472 More complete support of .def format 2017-09-05 14:32:52 +03:00
AlexVinS 3a9d73da23 [c::b] Update project, fixed build 2017-09-05 14:31:34 +03:00
AlexVinS 2f7968b803 Fixed wrong animation paths 2017-09-04 18:41:22 +03:00
AlexVinS b964a53abe Fixed battle animation 2017-09-04 17:52:36 +03:00
AlexVinS df34a2cc96 Dirty hackfix for https://bugs.vcmi.eu/view.php?id=2780 2017-09-03 23:38:15 +03:00
AlexVinS 2400bec52c Merge remote-tracking branch 'remotes/FeniksFire/develop' into develop 2017-08-19 00:37:32 +03:00
AlexVinS 43fad700b4 [C::B] updated FuzzyLite.cbp 2017-08-16 00:16:40 +03:00
AlexVinS 0868164147 (int) -> static_cast<int> 2017-08-12 15:43:41 +03:00
AlexVinS 8c0fab1dcf fixes 2017-08-12 14:36:37 +03:00
AlexVinS 15138c23de Finished conversion to new logging API 
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
 2017-08-11 23:06:27 +03:00
AlexVinS f2de6d1122 fix 2017-08-11 17:38:28 +03:00
AlexVinS a8a3230798 Logging cleanup (server). 2017-08-11 16:50:00 +03:00
AlexVinS 046e1a7c29 Prepared JsonNode for new logging API. 2017-08-11 16:27:42 +03:00
AlexVinS 64d9dadd64 Logging cleanup. 2017-08-11 15:47:50 +03:00
AlexVinS c293589c07 A bit more logging cleanup 2017-08-10 23:47:58 +03:00
AlexVinS 143ff682bc Logging cleanup 2017-08-10 21:59:55 +03:00
AlexVinS 96eb9c0ac7 tweak 2017-08-10 20:57:36 +03:00
AlexVinS 85e952f25f Logging cleanup 3 2017-08-10 20:17:10 +03:00
AlexVinS 61e241308d Logging cleanup 2017-08-10 19:52:05 +03:00
AlexVinS 18b8e1c7ad Tweaked CBonusTypeHandler 2017-08-09 12:18:49 +03:00
AlexVinS 2d31d5710f [tests] Reduced code duplication 2017-08-03 15:56:45 +03:00
AlexVinS 12b42f4495 Improved map format tests 2017-08-03 13:50:54 +03:00
AlexVinS 3de0fa37f8 Possible fix for https://bugs.vcmi.eu/view.php?id=2759 2017-08-01 17:00:26 +03:00
AlexVinS 980926a7bd Fixed https://bugs.vcmi.eu/view.php?id=2749 2017-07-27 11:58:51 +03:00
AlexVinS 2e2642ef7a [C::B] test project update 2017-07-20 15:46:40 +03:00
AlexVinS 303a3b670c Merge branch 'improvingTheBattle' into develop 2017-07-20 15:46:29 +03:00
AlexVinS ef73f416dc fixed resurrection corner case 2017-07-17 02:50:38 +03:00
AlexVinS 21c0c95049 tweak 2017-07-16 01:53:13 +03:00
AlexVinS f1a4831813 [Spells] Get rid of SpellTargetingContext. 2017-07-16 01:43:50 +03:00
AlexVinS 7374689301 Fixed https://bugs.vcmi.eu/view.php?id=2715 2017-07-16 00:02:55 +03:00
AlexVinS df13851176 fixed wrong battle result 2017-07-14 23:43:03 +03:00
AlexVinS 2fb531b6d0 Display actual moral and luck for batlle stack 2017-07-14 21:42:36 +03:00
AlexVinS 9586fd9b0a quick fix 2017-07-14 19:14:34 +03:00
AlexVinS 09df2dcfbb fixed possible race condition 2017-07-12 19:40:14 +03:00
AlexVinS 78885b8acc fixed possible race condition 2017-07-12 18:51:36 +03:00
AlexVinS a85bf3638f fixed illegal memory access 2017-07-12 18:32:22 +03:00
AlexVinS bc626c2446 Fixed race condition 2017-07-12 18:26:20 +03:00