Ivan Savenko
|
e8453916cf
|
Merge remote-tracking branch 'vcmi/beta' into develop
|
2023-09-08 18:49:06 +03:00 |
|
Ivan Savenko
|
5d67481aaf
|
Merge pull request #2774 from IvanSavenko/beta_bugfixing
(1.3.2) Beta bugfixing
|
2023-09-08 13:15:52 +03:00 |
|
Ivan Savenko
|
f39fbe5151
|
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
|
2023-09-07 10:51:02 +03:00 |
|
Ivan Savenko
|
346eead8e0
|
Show spell cursor when casting spell in touch input mode
|
2023-09-06 23:01:43 +03:00 |
|
Ivan Savenko
|
d7fb2bcf83
|
Show message on cancelling spell in combat
|
2023-09-06 21:54:26 +03:00 |
|
Ivan Savenko
|
9fa7a93fb0
|
Properly pass battleID in all battle netpack's
|
2023-09-06 16:03:47 +03:00 |
|
Ivan Savenko
|
41210c1dbf
|
Client-side support for multiple battles
|
2023-09-06 16:03:47 +03:00 |
|
Ivan Savenko
|
5d1d559d81
|
Fix possible unprotected access to battleint
|
2023-09-05 23:31:07 +03:00 |
|
Ivan Savenko
|
86a7f5f5cd
|
Removed getStr(bool), replaced with similar toString()
|
2023-09-04 22:21:02 +03:00 |
|
Ivan Savenko
|
1d0e696db6
|
Added RenderHandler that acts as factory for images and animations
|
2023-09-04 18:22:34 +03:00 |
|
Ivan Savenko
|
8dfdfffd87
|
Use ResourcePath for audio files
|
2023-09-04 18:22:34 +03:00 |
|
Ivan Savenko
|
97b7d44c88
|
Use ResourcePath for video accessing
|
2023-09-04 18:22:34 +03:00 |
|
Ivan Savenko
|
6f0108e462
|
Use ResourcePath for referencing texts and json's
|
2023-09-04 18:22:34 +03:00 |
|
Ivan Savenko
|
823ffa7a07
|
Always use ResourcePath for referencing images and animations
|
2023-09-04 18:22:34 +03:00 |
|
Konstantin
|
e554a2766d
|
BattleActions: do not pass unnecessary targetStack
It was unused for everything except teleport, so pass it only wher we
attempt to teleport.
Reworking sacrifice is out of scope from beta
|
2023-08-31 23:44:00 +03:00 |
|
Ivan Savenko
|
695a51d8c8
|
Merge remote-tracking branch 'vcmi/beta' into develop
|
2023-08-28 21:19:53 +03:00 |
|
Dydzio
|
cba9ddd66a
|
Update client/battle/BattleActionsController.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
|
2023-08-27 23:01:04 +02:00 |
|
Dydzio
|
321c9c2ca6
|
Remove now unused enum
|
2023-08-27 20:18:19 +02:00 |
|
Dydzio
|
e1eb245565
|
Better default stack action handling + "F shortcut" mode fixes
|
2023-08-27 17:33:10 +02:00 |
|
Ivan Savenko
|
e2718db791
|
Converted several enumerations into constants
|
2023-08-25 13:38:02 +03:00 |
|
Ivan Savenko
|
0240ee886d
|
Converted (almost) all namespace enum's to enum classes
|
2023-08-25 13:38:02 +03:00 |
|
Ivan Savenko
|
b0eec85aca
|
Merge pull request #2632 from rilian-la-te/resist-rework-pt1
Spell resistance rework: part 1
|
2023-08-25 01:13:57 +03:00 |
|
Ivan Savenko
|
e40dc76304
|
Fix giving commands in battles in hotseat
|
2023-08-24 23:34:33 +03:00 |
|
Ivan Savenko
|
81242d3500
|
Fixed ending of battles due to retreat/surrender
|
2023-08-23 18:46:56 +03:00 |
|
Konstantin
|
344593e891
|
vcmi: made some CSpell properties private
There are getters for it.
|
2023-08-23 17:53:08 +03:00 |
|
Ivan Savenko
|
3eb19e6ed7
|
Fix possible unprotected access to battleint
|
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
|
142889e3a5
|
Give all threads created by client human-readable name for debug
|
2023-08-23 16:32:29 +03:00 |
|
Ivan Savenko
|
1c552ba9d9
|
Remove unused code
|
2023-08-21 17:55:49 +03:00 |
|
Ivan Savenko
|
013417fb7e
|
Code cleanup
|
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 |
|
Dydzio
|
6bfbe80cc9
|
Allow toggling quick combat spells usage
|
2023-08-19 17:23:55 +02:00 |
|
Ivan Savenko
|
f13a53c1d9
|
Merge remote-tracking branch 'vcmi/beta' into develop
|
2023-08-12 17:28:47 +03:00 |
|
Ivan Savenko
|
8ba3f771be
|
Merge pull request #2529 from IvanSavenko/hero_defeat_fix
Fix potential access to empty std function on hero vs hero combat
|
2023-08-11 11:37:12 +03:00 |
|
Ivan Savenko
|
dc2135da7f
|
Fix potential access to empty std function on hero vs hero combat
|
2023-08-09 00:46:55 +03:00 |
|
Ivan Savenko
|
62a5eeebbc
|
Fixed rendering priority of battlefield background obstacles
|
2023-08-07 21:18:43 +03:00 |
|
Ivan Savenko
|
537f9fa048
|
Merged master into develop
|
2023-08-03 23:38:32 +03:00 |
|
Ivan Savenko
|
3213800097
|
Fix assertion failure on teleport cast
|
2023-08-03 14:20:54 +03:00 |
|
Ivan Savenko
|
791eb1a37b
|
Added workaround for running game with outdated extras mod from 1.2
|
2023-08-01 14:47:17 +03:00 |
|
Ivan Savenko
|
43795c39a5
|
Replaced all usage of SDL_Color outside of render with ColorRGBA
|
2023-07-31 21:07:30 +03:00 |
|
Ivan Savenko
|
aed8c411fc
|
Minor rework & cleanup of combat replays
|
2023-07-27 19:25:55 +03:00 |
|
Ivan Savenko
|
32f7a95e38
|
Use capture by value since thread might start after local method returns
|
2023-07-25 22:33:59 +03:00 |
|
Ivan Savenko
|
a280cc8845
|
Merge pull request #2384 from IvanSavenko/bugfixing_beta
Bugfixing iteration
|
2023-07-24 00:49:34 +03:00 |
|
Dydzio
|
47b6358e6e
|
Improve feature by triggering hero window refresh in response to netpack
|
2023-07-22 21:51:14 +02:00 |
|
Ivan Savenko
|
5be4f6ec2f
|
Fix visibility of creature amount label after casting spell before turn
|
2023-07-22 22:49:48 +03:00 |
|
Dydzio
|
05735a20e1
|
Fix for hero info window mana points not getting spent on spellcast
|
2023-07-22 15:32:00 +02:00 |
|
Ivan Savenko
|
e6d8b65e2c
|
Fix toggling of auto combat
|
2023-07-22 12:15:27 +03:00 |
|
Ivan Savenko
|
cefbe5152e
|
Merge pull request #2359 from IvanSavenko/crashfixing
Fix crashes from 1.2.1 statistics on Google Play
|
2023-07-21 15:44:37 +03:00 |
|
Ivan Savenko
|
9e58f67ab5
|
Fix autocombat AI threading
|
2023-07-19 12:09:03 +03:00 |
|