|
|
4968ac58b4
|
Do not abort battle opening sound, only allow actions
|
2023-03-21 13:49:19 +02:00 |
|
|
|
2864a04bda
|
Minor refactoring
|
2023-03-20 20:19:05 +02:00 |
|
|
|
688b8db3eb
|
Removed delays due to thread waits from battle animations
|
2023-03-20 20:19:05 +02:00 |
|
|
|
4718396f5f
|
Prevent crashing when pressing auto-combat button on enemy turn
|
2023-03-17 15:40:14 +01:00 |
|
|
|
7030fa8fe7
|
Allow changing queue size instantly on option toggle
|
2023-03-05 19:55:38 +02:00 |
|
|
|
b57a07b10f
|
Restored ambient sounds functionality
|
2023-03-05 18:02:59 +02:00 |
|
|
|
7e409df3cb
|
Apply manual changes from code review
|
2023-02-18 16:35:07 +01:00 |
|
|
|
9101f05835
|
Fixes for new battle settings
|
2023-02-15 22:38:41 +01:00 |
|
|
|
be9c71934c
|
Merge remote-tracking branch 'origin/develop' into settings-rework
|
2023-02-14 21:00:17 +01:00 |
|
|
|
91b17bed79
|
Partial encapsulation of AdvMapInt
|
2023-02-14 11:18:42 +02:00 |
|
|
|
fc7d2b9778
|
Merge remote-tracking branch 'origin/develop' into settings-rework
|
2023-02-12 11:55:21 +01:00 |
|
|
|
ab8b407294
|
Style cleanup
|
2023-02-08 13:56:09 +02:00 |
|
|
|
1e09c39c0e
|
Fix battle cursor after attack command
|
2023-02-02 14:36:58 +02:00 |
|
|
|
a2035122e1
|
Removed makingTurn variable
|
2023-02-02 13:25:55 +02:00 |
|
|
|
d04c53e7e0
|
Merge branch 'develop' into settings-rework
|
2023-02-02 11:55:13 +01:00 |
|
|
|
108a42e4ba
|
Reorganized includes for new layout. New class - IImageLoader
|
2023-02-01 20:42:06 +02:00 |
|
|
|
cc9d65a341
|
Make battle settings callable without battle, save last settings tab
|
2023-01-30 22:15:37 +01:00 |
|
|
|
3749074a4d
|
Renamed speed setting name to force-reset it to new scale
|
2023-01-28 16:49:35 +02:00 |
|
|
|
9d1a075806
|
Fix battle speed selector in settings
|
2023-01-28 14:00:49 +02:00 |
|
|
|
d34efaeb81
|
All battle effects now use time-based timings
|
2023-01-28 13:19:35 +02:00 |
|
|
|
cf56f7ccce
|
vcmi: remove unused-but-set-variables
|
2023-01-26 23:49:00 +03:00 |
|
|
|
05ac217b0f
|
Merge with vcmi/develop
|
2023-01-17 23:02:25 +02:00 |
|
|
|
0e8ee929df
|
Renamed CCursorHandler -> CursorHandler
|
2023-01-15 21:18:34 +02:00 |
|
|
|
4f3ea0d1d9
|
Renamed Terrain.h/cpp -> TerrainHandler.h/cpp
|
2023-01-10 00:01:35 +02:00 |
|
|
|
f51b3bca57
|
use JsonKey or NameTranslated instead of ambiguos Name
|
2023-01-10 00:01:35 +02:00 |
|
|
|
7c7ae26e67
|
Map/Road/River identifiers are now private members
|
2023-01-10 00:01:35 +02:00 |
|
|
|
9895dca615
|
Play sound if spell was resisted
|
2023-01-07 14:27:12 +02:00 |
|
|
|
a25214ae71
|
Fixes graphical artifacts on toggling stack queue visibility
Battlefield rendering now uses local coordinates
|
2023-01-05 14:16:01 +02:00 |
|
|
|
d8a70de068
|
Improved ordering of movement animation, fixes potential visual artifact
|
2023-01-04 23:04:48 +02:00 |
|
|
|
a9808a6541
|
Fix battle start when hero has tactics and no battle sounds mod is on
|
2022-12-30 11:55:22 +02:00 |
|
|
|
5d80457eda
|
Merge with vcmi/develop branch
|
2022-12-30 00:52:23 +02:00 |
|
|
|
c8cd8aaf10
|
merge fix - do not attempt to display multiple dialogs at once
|
2022-12-29 22:11:47 +02:00 |
|
|
|
da7766e90b
|
Fix battle start with disabled opening sounds
|
2022-12-28 16:51:44 +02:00 |
|
|
|
ae3f6c5e79
|
Renamed PointEffectAnimation -> EffectAnimation
|
2022-12-25 21:39:55 +02:00 |
|
|
|
5b41ced427
|
Removed sound playback from PointEffectAnimation
|
2022-12-25 21:35:13 +02:00 |
|
|
|
5a7eed01da
|
Made BattleInterface class less friendly
|
2022-12-25 17:44:40 +02:00 |
|
|
|
eb20a4b208
|
Merge remote-tracking branch 'vcmi/develop' into warnings_fix
|
2022-12-23 14:40:45 +02:00 |
|
|
|
bab5922951
|
Spells can now define color muxer effect (e.g. Bloodlust & Petrify)
|
2022-12-22 00:25:35 +02:00 |
|
|
|
41b87088d5
|
Color muxer effects can now be (partially) configured by user.
TODO: move color muxer effects from spells into spell config
|
2022-12-21 23:29:56 +02:00 |
|
|
|
8a9a7b9650
|
Fix UI on battle start if hero has tactics
|
2022-12-21 20:01:50 +02:00 |
|
|
|
541d98143b
|
Renamed BattleControlPanel -> BattleWindow
|
2022-12-21 17:06:47 +02:00 |
|
|
|
c835a84051
|
Moved all GUI handling from BattleInterface to BattleControlPanel
|
2022-12-21 17:02:53 +02:00 |
|
|
|
6138ff1670
|
Minor refactoring of BattleHero class
|
2022-12-21 01:08:56 +02:00 |
|
|
|
16c4851d3b
|
Animated cursor for spell selection, removed hardcoded cursor ID's
|
2022-12-18 22:32:07 +02:00 |
|
|
|
e9e549148d
|
Implemented teleportation animation effect
|
2022-12-18 18:26:43 +02:00 |
|
|
|
deffba01b9
|
All battle effects are now fully client sided
|
2022-12-17 17:35:15 +02:00 |
|
|
|
70eac47f08
|
Fixes #1051, #1042 - highlight creatures that will be affected by spell
|
2022-12-17 00:10:12 +02:00 |
|
|
|
4d5311789e
|
Fixes #831 - do not process any incoming Packs until opening is over
|
2022-12-16 23:22:04 +02:00 |
|
|
|
bbabc991ee
|
Clean up logging
|
2022-12-16 22:37:44 +02:00 |
|
|
|
4d628a8ba1
|
Fixed several assertion failures on shutting down game
|
2022-12-16 16:19:57 +02:00 |
|
