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
6,953 Commits 30 Branches 75 Tags
20ac1d68804cd1a05346437196a69a8682fd8a00
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AlexVinS 2c525fc76e Attempt to fix headless tests crash. 2017-07-12 17:02:25 +03:00
AlexVinS f1d35dd3f2 [c::b] update 2017-07-12 15:43:03 +03:00
AlexVinS 3bc082a1c5 Reduced code duplication in CHealthTest 2017-07-10 09:30:23 +03:00
AlexVinS e677373241 tweak 2017-07-10 08:53:29 +03:00
AlexVinS 1fe01b7254 Moved defensive stance log message building to server side. 2017-07-10 04:05:36 +03:00
AlexVinS de01a797a6 added more tests 2017-07-09 22:31:00 +03:00
AlexVinS 2d0613b40b Added some CHealth tests. 2017-07-09 22:15:06 +03:00
AlexVinS ea3502ed60 Removed CStack::totalHealth() 2017-07-09 20:23:51 +03:00
AlexVinS 44fc0cb57b Broken CHealth dependency on CStack 2017-07-09 19:49:52 +03:00
AlexVinS f0713c1d36 Better handling of HYPNOTISED stacks in case of spellcasting 2017-07-09 16:55:10 +03:00
AlexVinS 00bd1bd100 formatting 2017-07-09 15:49:37 +03:00
AlexVinS 7bf8c9bd69 fixed and cleanup 2017-07-08 21:20:38 +03:00
AlexVinS 4f14f22d3a Unified CStack ammo, casts and counterattacks 
* it is possible now to add casts and shoots OTF (f.e. with spell bonus)

Centralized stack 'ammo' loading from bonus system.
* introduced small proxy class for local bonus cache
(no need to use global cache if particular selector used on node only in one place)
* handle killing resurrected creatures
* use IBonusBearer::MaxHealth() where possible
* Fixed https://bugs.vcmi.eu/view.php?id=2486
* Possible fix for 0 HP after resurrection.
* Hack-fixed https://bugs.vcmi.eu/view.php?id=2584
* Unified CStack health API
* Use CHealth for CStack count and health points
* increased SERIALIZATION_VERSION
 2017-07-08 20:29:59 +03:00
AlexVinS 4d204095cf fix 2017-07-07 02:55:23 +03:00
AlexVinS 5f1fadf71c Fixed https://bugs.vcmi.eu/view.php?id=2706 2017-07-04 11:21:22 +03:00
AlexVinS dbaf3cb023 Cleanup & formatting 2017-07-04 01:32:40 +03:00
AlexVinS dfbc9cea8a Hack-fixed icon position 2017-07-03 22:01:03 +03:00
AlexVinS 6dd89efc9a tweaks 2017-07-03 21:43:05 +03:00
AlexVinS a65befaa08 Moved town portal logic to mechanics class 2017-07-03 21:43:04 +03:00
AlexVinS 3d1a84875e Queries refactoring 
* Moved SUMMON_BOAT special case to mechanics
* Partially moved Town portal logic to mechanics class
* Added generic query reply to CCallback
* Redesigned Queries so that base API do not depends on CGameHandler
* Got rid of CGameHandler::castSpellRequest
* Removed CGameHandler::castSpell
* Added new Query type for town portal dialog (not used yet)
 2017-07-03 21:43:04 +03:00
AlexVinS f463dc2fa3 fixed war machine spawning 2017-07-03 21:42:17 +03:00
AlexVinS 3ce238e4d3 Tweak 2017-07-03 13:40:22 +03:00
AlexVinS e4c14c4cc2 avoid assertions in stack position checks 2017-07-03 12:59:33 +03:00
AlexVinS 4f8c7bd4bb CStack refactoring 
* removed all occurrences of attackerOwned
* Use BattleSide enum
* more tweaks
 2017-07-01 19:17:08 +03:00
AlexVinS ab4c848169 fixed relative include paths 2017-06-29 00:09:35 +03:00
AlexVinS 02ae95aca3 Fixed random map format test crash 2017-06-14 12:40:46 +03:00
AlexVinS bb0f388f23 Cheat 'vcminahar' now give FREE_SHIP_BOARDING bonus 
https://bugs.vcmi.eu/view.php?id=2092
 2017-06-14 11:41:36 +03:00
AlexVinS 86f9df5f68 Made gamestate lock static 2017-06-14 07:59:41 +03:00
AlexVinS cf60aa61b0 cleanup 2017-06-14 07:39:23 +03:00
AlexVinS 0af9aa382c Possible fix for https://bugs.vcmi.eu/view.php?id=2692 2017-06-14 04:53:26 +03:00
AlexVinS 648b122b10 Fix old savegame corruption in PR 301 2017-06-14 01:43:26 +03:00
AlexVinSandArseniy Shestakov 754d63f7a5 hack-fixed ENCHANTED trigger for first 2 rounds 2017-06-13 21:50:59 +03:00
AlexVinSandArseniy Shestakov 0f5202689e Cumulative spell effects 
* Added experimental support for cumulative effects for ENCHANTED bonus
* Updated and fixed SPECIAL_PECULIAR_ENCHANT processing
* Initial implementation of cumulative spell effects.
* Scheme for new spell feature - cumulative bonus.
 2017-06-13 21:50:50 +03:00
AlexVinSandDJWarmonger f073031689 Fixed https://bugs.vcmi.eu/view.php?id=2686 2017-06-10 19:55:39 +02:00
AlexVinS 0190c9804e formatting 2017-06-06 19:45:34 +03:00