Commit Graph
12430 Commits
Author SHA1 Message Date
Konstantin d746a96d55 vcmi: use SpellSchool identifier instead of enum
Use identifier instead of enum inside callbacks. It is better and more
expandable solution.
2023-08-23 17:53:09 +03:00
Konstantin 75c39c6562 vcmi: handle icons for SPELL_DAMAGE_REDUCTION
For all schools and for ANY subtype
2023-08-23 17:53:09 +03:00
Konstantin d20711bcd6 immunities: polishing 2023-08-23 17:53:09 +03:00
Konstantin 344593e891 vcmi: made some CSpell properties private
There are getters for it.
2023-08-23 17:53:08 +03:00
Konstantin 4d67a7e3d1 BonusParams: add XXX_IMMUNITY to deprecated
This bonuses does not exist now.
2023-08-23 17:52:16 +03:00
Konstantin 8724181a0f vcmi: spell resistance rework
Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool
subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY.
All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY,
and all previous bonuses of subtype 1 is covered by
NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.
2023-08-23 17:52:16 +03:00
Konstantin c9bc3fd4e1 CSpellHandler: use getBonusBearer
Use getBonusBearer method and cachingStr method for optimization
2023-08-23 17:52:16 +03:00
Ivan Savenko a852236602 Merge pull request #2627 from IvanSavenko/threading_cleanup
Threading cleanup
2023-08-23 17:30:31 +03:00
Ivan Savenko 3eb19e6ed7 Fix possible unprotected access to battleint 2023-08-23 16:32:29 +03:00
Ivan Savenko a44c08a847 Slightly better thread names 2023-08-23 16:32:29 +03:00
Ivan Savenko 0613756abc Remove unused code 2023-08-23 16:32:29 +03:00
Ivan Savenko dfe8ca3d61 Use more lightweight scoped_lock 2023-08-23 16:32:29 +03:00
Ivan Savenko 44d16b32fe Use API identical to std classes where possible 2023-08-23 16:32:29 +03:00
Ivan Savenko 87957e74c1 Replaced boost::thread_specific_ptr with thread_local 2023-08-23 16:32:29 +03:00
Ivan Savenko 142889e3a5 Give all threads created by client human-readable name for debug 2023-08-23 16:32:29 +03:00
Nordsoft91 1bad0e96ef Merge pull request #2635 from Nordsoft91/loading-bar
Loading progress bar
2023-08-23 17:28:19 +04:00
nordsoft cda4ae84aa Don't send loading updates too frequently 2023-08-23 15:45:00 +04:00
Nordsoft91 e09b13c00a Merge pull request #2576 from Nordsoft91/turn-timer
Implement turn timer feature
2023-08-23 01:48:12 +04:00
nordsoft 937935ce8c Fix compiling (how does it work on mac?) 2023-08-23 01:20:29 +04:00
nordsoft 15847c89b6 Fix tests 2023-08-22 21:02:32 +04:00
nordsoft dfaf778d16 Redesign loading solution 2023-08-22 20:10:20 +04:00
nordsoft d9a2a7bfd0 Fix minor points 2023-08-22 16:00:14 +04:00
nordsoft fb21620c60 Fix battle timer reset after refactoring 2023-08-22 14:14:50 +04:00
nordsoft dd3e9f102b Fix game crash at AI turn 2023-08-22 02:08:42 +04:00
Nordsoft91 ec4da06b56 Merge pull request #2631 from Laserlicht/date_alignment
date alignment
2023-08-22 02:00:49 +04:00
nordsoft 7b4b01a280 Adopt turn timer to battle refactoring 2023-08-22 01:49:50 +04:00
nordsoft d50edc28ab Merge remote-tracking branch 'upstream/develop' into turn-timer
# Conflicts:
#	server/CGameHandler.cpp
#	server/CGameHandler.h
2023-08-22 00:54:38 +04:00
nordsoft dbc3a93013 Merge remote-tracking branch 'upstream/develop' into loading-bar
# Conflicts:
#	server/CGameHandler.h
2023-08-22 00:46:54 +04:00
nordsoft 4cf28fe00e Fix linux clang compiling 2023-08-22 00:40:03 +04:00
nordsoft b1bfc2239f Backward compatibility with mods 2023-08-22 00:32:26 +04:00
Ivan Savenko 78780bb20c Merge pull request #2579 from IvanSavenko/server_battle_processor
(develop) Refactoring of server-side battles code
2023-08-21 23:21:40 +03:00
Michael 0dab3b83a0 date alignment 2023-08-21 20:45:00 +02:00
nordsoft a60d503078 Fix progress bar 2023-08-21 19:21:32 +04:00
nordsoft 45f13c7964 Progress update on client side 2023-08-21 19:21:27 +04:00
nordsoft 584dd20943 Progress on server side for rmg 2023-08-21 19:21:22 +04:00
Ivan Savenko 5f7f0ec2ea Declare enum classes as int8_t 2023-08-21 17:55:49 +03:00
Ivan Savenko 1c552ba9d9 Remove unused code 2023-08-21 17:55:49 +03:00
Ivan Savenko 8154e84825 Fix tactics usage 2023-08-21 17:55:49 +03:00
Ivan Savenko 276c00b284 Removed excessive includes 2023-08-21 17:55:49 +03:00
Ivan Savenko 2be9664d26 Remove no longer used code 2023-08-21 17:55:49 +03:00
Ivan Savenko 67eaef3520 Fixed few more discovered regressions 2023-08-21 17:55:49 +03:00
Ivan Savenko 013417fb7e Code cleanup 2023-08-21 17:55:49 +03:00
Ivan Savenko c516b5a64e Fixes for several discovered edge cases 2023-08-21 17:55:49 +03:00
Ivan Savenko a1092e0f3f Fix battle ending 2023-08-21 17:55:49 +03:00
Ivan Savenko a1d3181a98 Unified spellcasting handling with other actions 2023-08-21 17:55:49 +03:00
Ivan Savenko 6297140bf5 Start of stabilization - battles now start correctly 2023-08-21 17:55:49 +03:00
Ivan Savenko 44832f3797 Split BattleProcessor into few more parts 2023-08-21 17:55:49 +03:00
Ivan Savenko 5c78060a07 Moved battle netpack validation to battle processor 2023-08-21 17:55:48 +03:00
Ivan Savenko 323772fc2e Split CQuery file into multiple files 2023-08-21 17:55:07 +03:00
Ivan Savenko 629ca3f13e Created directory structure for server files 2023-08-21 17:55:07 +03:00