krs
aba5840a6f
Removed Max Movement Highlight stubs
2023-04-08 20:40:30 +03:00
krs
1644cab938
Added combat option Highlight Movement on Hover
2023-04-08 20:40:30 +03:00
krs
9012a25276
Stub For Max Movement Range highlight
...
When a creature is hovered., besides movement, for max possible movement, a hex in center of map is now highlighted.
2023-04-08 20:39:59 +03:00
krs
51ad49532b
Fix for wrong merge :(
2023-04-08 20:39:59 +03:00
krs
dab07bdef9
Now unit range is shown in Tactics phase as well
...
A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.
2023-04-08 20:39:59 +03:00
krs
e1c388465a
HD mod highlighting of movement for hovered stack.
...
Does not work as intended in tactics mode.
2023-04-08 20:39:59 +03:00
Ivan Savenko
e35a1ba471
Merge pull request #1876 from rilian-la-te/refactoring-v1
...
VCMI Refactoring
2023-04-08 11:14:05 +03:00
nordsoft
52b53ab307
Feature and setting implemented
2023-04-08 01:49:59 +04:00
nordsoft
b1d06b6141
Complete quick combat feature
2023-04-06 22:49:38 +04:00
nordsoft
ce3028bd73
Intermediate commit
2023-04-06 19:34:07 +04:00
Konstantin
11b237a23c
vcmi: massive refactoring v1
2023-04-05 22:33:12 +03:00
Ivan Savenko
a3c5f75600
Fix visibility of alternative actions button in tactics stage
2023-04-05 18:36:10 +03:00
Ivan Savenko
cf966015bb
Correctly update battle queue state after changing its state
2023-04-05 18:35:45 +03:00
Konstantin
e0715a76c8
vcmi: reduce CStack usage a little bit
2023-04-04 23:02:54 +03:00
Ivan Savenko
307065a633
Merge beta into develop
2023-04-04 16:06:20 +03:00
Ivan Savenko
e9aed2761c
Fix target selection for teleport
2023-03-31 23:18:45 +03:00
Konstantin
d83e58f948
vcmi: use new animation functions in client
2023-03-31 01:01:25 +03:00
Konstantin
eff41f66ed
vcmi: now obstacles can have disappearing anim
...
It is a reverse version of appearingAnimation.
2023-03-31 01:01:25 +03:00
Konstantin
7543fdf787
vcmi: add reverse effect animation type
...
To be used later with obstacle removal
2023-03-31 01:01:25 +03:00
Konstantin
c4d5a7a2d6
vcmi:towns now can choose if moat render is needed
...
Using invalid points. Also removed unused variable.
2023-03-31 01:01:25 +03:00
Ivan Savenko
484f0a175a
Blocked movement of war machines in tactics phase
2023-03-30 12:20:13 +03:00
Ivan Savenko
974be97e6d
Merge pull request #1792 from IvanSavenko/happy_dydzio
...
Fixes for beta - graphical artifacts
2023-03-30 00:11:19 +03:00
Ivan Savenko
a42dc923e4
Remove hardcoded constant
2023-03-29 14:33:44 +03:00
Ivan Savenko
1fcaeba8e0
Fix stack amount boxes flickering between actions
2023-03-29 13:21:43 +03:00
Ivan Savenko
3af829e6af
Fix stack label position updates
2023-03-29 13:03:40 +03:00
Ivan Savenko
06f9759aee
Fix crash on using Teleport/Sacrifice spells
2023-03-28 23:50:42 +03:00
Ivan Savenko
0ce06e0f30
Improved rendering of stack amount boxes
2023-03-28 23:50:22 +03:00
Ivan Savenko
238de8a5d7
Properly disable combat panel during spell targeting
2023-03-28 18:14:09 +03:00
Ivan Savenko
fd3f80e860
Fix game hang on invalid shooter animation config
2023-03-28 17:04:18 +03:00
Konstantin
1b893fa525
client: do not show obstacles placed by another player
2023-03-26 21:23:54 +03:00
Ivan Savenko
da3a05bc8b
Fix special colors in battle
2023-03-26 00:46:21 +02:00
Ivan Savenko
4c311da21b
Clamp potential kills tooltip to target unit size
2023-03-26 00:07:21 +02:00
Ivan Savenko
4eed0b2c9e
Added workaround for Dungeon towers
2023-03-25 23:54:51 +02:00
Ivan Savenko
49fa628e9b
Turret creature cutoff position should match H3
2023-03-25 23:54:51 +02:00
Ivan Savenko
dcff463d36
Fixed handling of special palette colors in palette transformations
...
Fixes black color turning semi-transparent in some creatures from mods
2023-03-25 23:54:51 +02:00
Ivan Savenko
2167cb2a68
Fix battle startup with "no intro sound" mod
2023-03-25 23:54:51 +02:00
Ivan Savenko
5288e3761e
Merge pull request #1764 from IvanSavenko/selectable_spellcaster
...
Implemented support for multi-spell casters
2023-03-25 20:08:47 +02:00
Ivan Savenko
6f631a0aa7
Merge pull request #1759 from IvanSavenko/kills_in_tooltip
...
Show potential kill amount in attack tooltip
2023-03-25 20:03:27 +02:00
Ivan Savenko
9a19feaf4a
Fix spellcasters with massive spells
2023-03-25 01:23:49 +02:00
Ivan Savenko
dc099b2a35
Implemented support for multi-spell casters
2023-03-25 00:48:14 +02:00
Adriankhl
76a71226a2
Deactivate activeStack during spellCast
2023-03-24 22:43:41 +01:00
Ivan Savenko
970981cfc9
Show information on potential kills in attack tooltip
2023-03-24 17:18:47 +02:00
Adriankhl
49662f6f36
Deactivate activeStack when auto combat starts
2023-03-23 22:37:39 +01:00
Ivan Savenko
31147ac83b
refactoring: TDmgRange pair -> DamageRange struct
2023-03-23 17:49:33 +02:00
Ivan Savenko
4968ac58b4
Do not abort battle opening sound, only allow actions
2023-03-21 13:49:19 +02:00
Ivan Savenko
4919550a19
Show a message that battle intro can be skipped
2023-03-20 21:58:32 +02:00
Ivan Savenko
2864a04bda
Minor refactoring
2023-03-20 20:19:05 +02:00
Ivan Savenko
31b718898a
Fix playback of shooter animations at max speed
2023-03-20 20:19:05 +02:00
Ivan Savenko
688b8db3eb
Removed delays due to thread waits from battle animations
2023-03-20 20:19:05 +02:00
Adriankhl
4718396f5f
Prevent crashing when pressing auto-combat button on enemy turn
2023-03-17 15:40:14 +01:00
Konstantin
9205ef2c91
vcmi: skill-agnostic ballistics
...
Made ballistics by using spell action and more code is shared now.
2023-03-16 16:46:41 +03:00
Konstantin
84f53485e2
vcmi: skill-agnostic first aid
...
Now first aid is passive battle spell, and skill just bumps
specific spell power for this spell. Everything about healing
is handled into Heal spell effect.
2023-03-16 16:46:41 +03:00
Konstantin
5366f9190e
vcmi: reduce boost::lexical_cast usage
2023-03-09 16:36:46 +03:00
Ivan Savenko
7030fa8fe7
Allow changing queue size instantly on option toggle
2023-03-05 19:55:38 +02:00
Ivan Savenko
f09897b2b4
Remove unnecessary redraws
2023-03-05 19:51:42 +02:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite
...
Adventure Map - rendering rewrite
2023-03-05 19:51:07 +02:00
Ivan Savenko
b57a07b10f
Restored ambient sounds functionality
2023-03-05 18:02:59 +02:00
Ivan Savenko
7df5c612f7
Fix battle rendering
2023-03-05 17:48:02 +02:00
Ivan Savenko
acdb8d6e06
renamed Unicode -> TextOperations, to use for all text processing
2023-03-05 17:39:23 +02:00
Dydzio
6bd4eac27a
Rename settings files
2023-02-18 17:58:22 +01:00
Dydzio
7e409df3cb
Apply manual changes from code review
2023-02-18 16:35:07 +01:00
Dydzio
9101f05835
Fixes for new battle settings
2023-02-15 22:38:41 +01:00
Dydzio
be9c71934c
Merge remote-tracking branch 'origin/develop' into settings-rework
2023-02-14 21:00:17 +01:00
Ivan Savenko
91b17bed79
Partial encapsulation of AdvMapInt
2023-02-14 11:18:42 +02:00
Dydzio
7430616ada
Move settings to separate subfolder
2023-02-12 17:29:23 +01:00
Dydzio
34227a0dab
Integrate new settings with battle UI
2023-02-12 15:49:17 +01:00
Dydzio
fc7d2b9778
Merge remote-tracking branch 'origin/develop' into settings-rework
2023-02-12 11:55:21 +01:00
Ivan Savenko
4a0a82ceb4
Merge pull request #1553 from IvanSavenko/sdl_cleanup
...
SDL usage cleanup
2023-02-08 18:14:15 +02:00
Ivan Savenko
ab8b407294
Style cleanup
2023-02-08 13:56:09 +02:00
nordsoft
fd6987ea0a
Fix alternative actions button redraw
2023-02-05 03:29:50 +04:00
Ivan Savenko
34dcb4127a
Removed text utilities from SDL_Extensions
2023-02-03 18:55:25 +02:00
Ivan Savenko
7c58a46279
Removed some instances of access to screen surface
2023-02-03 18:23:53 +02:00
Ivan Savenko
ae9f040abf
removed unused method
2023-02-03 11:42:27 +02:00
Ivan Savenko
3fef2a5e1f
Moved Colors to a separate file, updated includes
2023-02-03 11:39:40 +02:00
Ivan Savenko
cfcaf5cbb6
renamed keyDown -> keyPressed
2023-02-03 11:39:40 +02:00
Ivan Savenko
d4fba3787c
Removed usage of SDL_KeyboardEvent from UI code
2023-02-03 11:39:40 +02:00
Ivan Savenko
6669ffd4b3
Moved input-related code from SDL_Extensions to GuiHandler
2023-02-03 11:39:40 +02:00
Ivan Savenko
214fc19e74
CIntObject now receives mouse position as point instead of SDL event
2023-02-03 11:39:39 +02:00
Ivan Savenko
64faa13b6d
Merge pull request #1487 from IvanSavenko/battle_actions_refactoring
...
Battle actions refactoring
2023-02-03 11:28:14 +02:00
Dydzio
2ef33d54ab
Merge branch 'develop' into battle-queue-improvement
2023-02-02 18:26:31 +01:00
Dydzio
5a08ec04fe
Initial split of BattleOptionsWindow
2023-02-02 17:17:16 +01:00
Ivan Savenko
2ac997d8a9
Fix "holding" animation speed
2023-02-02 14:37:34 +02:00
Ivan Savenko
731f7b0578
Fix opening spellbook via clicking on hero
2023-02-02 14:37:16 +02:00
Ivan Savenko
1e09c39c0e
Fix battle cursor after attack command
2023-02-02 14:36:58 +02:00
Ivan Savenko
3c8a0b9e70
Add missing text
2023-02-02 13:43:20 +02:00
Ivan Savenko
9678296875
Hero interaction is now battle action
2023-02-02 13:43:19 +02:00
Ivan Savenko
d3c85a19cb
Merged CClickableHex class into BattleFieldController
2023-02-02 13:35:57 +02:00
Ivan Savenko
c3b79c786b
Spellcasters UI now shares handling with hero spellcasting
2023-02-02 13:25:55 +02:00
Ivan Savenko
f150ced14c
All spellcasters should work correctly now
2023-02-02 13:25:55 +02:00
Ivan Savenko
55a58596bc
Mostly finished refactoring of BattleActionsController
...
TODO: test actions
TODO: test casters
TODO: fix random casters
2023-02-02 13:25:55 +02:00
Ivan Savenko
a2035122e1
Removed makingTurn variable
2023-02-02 13:25:55 +02:00
Ivan Savenko
4d62bf22f2
Removed no longer used code
2023-02-02 13:25:55 +02:00
Dydzio
d04c53e7e0
Merge branch 'develop' into settings-rework
2023-02-02 11:55:13 +01:00
Ivan Savenko
108a42e4ba
Reorganized includes for new layout. New class - IImageLoader
2023-02-01 20:42:06 +02:00
Ivan Savenko
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations
...
Time based animations
2023-02-01 12:25:54 +02:00
Ivan Savenko
bf343126c4
Fix Hero animation speed in battles
2023-01-31 00:42:50 +02:00
Dydzio
cc9d65a341
Make battle settings callable without battle, save last settings tab
2023-01-30 22:15:37 +01:00
Ivan Savenko
9c3030603d
Removed most SDL includes from headers, removed SDL int's
2023-01-30 19:55:32 +02:00
Ivan Savenko
e14290fde0
Removed loading of images from file into SDL_Surface
2023-01-30 18:25:47 +02:00
Ivan Savenko
42df5626d9
Added Color class to replace SDL_Color
2023-01-30 00:12:43 +02:00
