nordsoft
|
fb4db41891
|
Single player spectator
|
2023-04-13 02:01:13 +04:00 |
|
nordsoft
|
f005dbbc14
|
Spectator mode
|
2023-04-13 00:59:44 +04:00 |
|
nordsoft
|
e669d31d33
|
Hidden maps
|
2023-04-12 02:44:17 +04:00 |
|
Ivan Savenko
|
644f0f4b32
|
Removed ARRAY_COUNT in favor of std::size
|
2023-04-12 01:04:26 +03:00 |
|
Ivan Savenko
|
506c3d29bc
|
Replaced vstd clamp with std version
|
2023-04-12 01:03:14 +03:00 |
|
Ivan Savenko
|
5f74aca341
|
Fix missing attribute
|
2023-04-12 01:03:14 +03:00 |
|
Ivan Savenko
|
63b197b78a
|
Converted attributes to use c++17 functionality
|
2023-04-12 01:03:14 +03:00 |
|
nordsoft
|
30281d5991
|
Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
|
2023-04-11 21:44:31 +04:00 |
|
Nordsoft91
|
3951bbb395
|
Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
|
2023-04-11 21:18:04 +04:00 |
|
Ivan Savenko
|
dfa2e2a349
|
Merge beta into develop
|
2023-04-11 19:37:35 +03:00 |
|
nordsoft
|
39f4bc0072
|
Reset battle bonuses on client side
|
2023-04-11 17:25:19 +04:00 |
|
nordsoft
|
8e77b833d9
|
Merge remote-tracking branch 'upstream/develop' into battle-dialog
|
2023-04-11 15:54:08 +04:00 |
|
Ivan Savenko
|
e25cd7f90f
|
Merge pull request #1934 from IvanSavenko/beta_fixes
Fixed bugs for 1.2 release
|
2023-04-11 11:08:40 +03:00 |
|
Ivan Savenko
|
ff66592fad
|
Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
|
2023-04-11 02:14:37 +03:00 |
|
nordsoft
|
bfc75ccd39
|
Merge remote-tracking branch 'upstream/develop' into battle-dialog
|
2023-04-11 02:22:42 +04:00 |
|
Nordsoft91
|
ebd17c9e4a
|
Merge pull request #1928 from Nordsoft91/cast-reward
Spell cast reward
|
2023-04-10 22:49:36 +04:00 |
|
Konstantin
|
fedf7d377c
|
vcmi: remove TFaction
This is a huge change and will break save compatibility
|
2023-04-10 19:28:16 +03:00 |
|
Ivan Savenko
|
42b2be4bbb
|
Merge pull request #1908 from SoundSSGood/art-client-server-fixes
Artifact related fixes
|
2023-04-10 18:26:49 +03:00 |
|
Konstantin
|
40bea35a26
|
CHeroWindow: fix picked art mana limit display
|
2023-04-10 15:35:21 +03:00 |
|
Ivan Savenko
|
07230f3b47
|
Attempt to fix stack splitting on macos
|
2023-04-10 14:34:17 +03:00 |
|
Ivan Savenko
|
02c9a3f3d8
|
Correctly reset UI on aborting Clone/Sacrifice
|
2023-04-10 14:33:24 +03:00 |
|
nordsoft
|
c0b90432cb
|
Change callback interface
|
2023-04-10 05:40:03 +04:00 |
|
nordsoft
|
e440343921
|
Bypass initial version of spell callback
|
2023-04-10 04:34:24 +04:00 |
|
Ivan Savenko
|
e2d0cd37e4
|
Merge pull request #1910 from IvanSavenko/beta_fixes
Fixes for 1.2 branch
|
2023-04-09 20:09:03 +03:00 |
|
Ivan Savenko
|
6e90c0fd09
|
Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot
Fix initialization of spell effects registry
|
2023-04-09 20:07:29 +03:00 |
|
nordsoft
|
08809f1cdc
|
String building id
|
2023-04-09 04:53:06 +04:00 |
|
nordsoft
|
307fb071a2
|
VCMI campaign format support prototype
|
2023-04-09 03:24:40 +04:00 |
|
nordsoft
|
9e5e1aebbc
|
Remove hardcoded campaign screens
|
2023-04-09 00:16:11 +04:00 |
|
Adriankhl
|
1d6192ca62
|
Shut down the thread for tactic phase properly
|
2023-04-08 22:52:46 +04:00 |
|
Ivan Savenko
|
84af64ce6b
|
Removed magical initialization of registry via static variables
|
2023-04-08 21:29:04 +03:00 |
|
krs
|
7eda4b6c1e
|
replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown()
|
2023-04-08 20:42:37 +03:00 |
|
krs
|
3194999809
|
Add SHIFT + hover shortcut to show movement highlight while pressed.
|
2023-04-08 20:42:37 +03:00 |
|
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 |
|
nordsoft
|
50115c3113
|
Rename variables
|
2023-04-08 20:56:05 +04:00 |
|
Ivan Savenko
|
454168897e
|
Fix handling of invalid hotkeys in configurable UI
|
2023-04-08 19:53:13 +03:00 |
|
Ivan Savenko
|
71ddaeea6e
|
Fix crash on missing music file
|
2023-04-08 19:47:16 +03:00 |
|
Ivan Savenko
|
4d37686eb3
|
Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll
InfoBar: disable scrollbar
|
2023-04-08 19:12:48 +03:00 |
|
Ivan Savenko
|
d00fa5bf86
|
Merge pull request #1887 from Adriankhl/fix_dropbox_left_click
Fix: close dropbox with left mouse click outside of the dropbox
|
2023-04-08 19:11:50 +03:00 |
|
Ivan Savenko
|
0abc00f82e
|
Fix assertion failure in in-game console
|
2023-04-08 18:53:47 +03:00 |
|
Ivan Savenko
|
3dedc963f7
|
Fix double-playing of battle effects
|
2023-04-08 18:53:28 +03:00 |
|
SoundSSGood
|
e58be8e7f7
|
vcmiartifacts fixed
|
2023-04-08 12:28:53 +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 |
|
Konstantin
|
50c9a57133
|
InfoBar: fix tiny selection with data
|
2023-04-08 01:44:08 +03:00 |
|
nordsoft
|
52b53ab307
|
Feature and setting implemented
|
2023-04-08 01:49:59 +04:00 |
|
SoundSSGood
|
ea7dd14d8b
|
client is able to erase artifact
|
2023-04-08 00:41:55 +03:00 |
|
Konstantin
|
f8c15f3a4b
|
InfoBar: disable scrollbar
|
2023-04-07 20:50:47 +03:00 |
|
Ivan Savenko
|
c675e6878a
|
Merge pull request #1878 from IvanSavenko/fix_battle_ui
Fix visual glitches in battle UI
|
2023-04-07 12:41:29 +03:00 |
|
nordsoft
|
b1d06b6141
|
Complete quick combat feature
|
2023-04-06 22:49:38 +04:00 |
|
nordsoft
|
e85593dbb3
|
Save & restore mana
|
2023-04-06 21:19:46 +04:00 |
|
Adriankhl
|
57409a0d94
|
fix: close dropbox with left mouse click outside of the dropbox
|
2023-04-06 18:32:21 +02:00 |
|
nordsoft
|
3e28b58c80
|
Fixes
|
2023-04-06 19:59:22 +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
|
0770a1a153
|
TTF fonts can now be used as fallback for H3 fonts
|
2023-04-04 22:23:32 +03:00 |
|
Ivan Savenko
|
307065a633
|
Merge beta into develop
|
2023-04-04 16:06:20 +03:00 |
|
Ivan Savenko
|
5b480124b8
|
Merge pull request #1862 from IvanSavenko/fix_garrison_move_shortcut
Space and left-clicking on second hero in town now have share code
|
2023-04-04 11:23:19 +03:00 |
|
Ivan Savenko
|
d6cb513374
|
Merge pull request #1858 from IvanSavenko/sliders_fix
Allow defining active areas for sliders.
|
2023-04-04 11:21:45 +03:00 |
|
Ivan Savenko
|
93b77d0c99
|
Space and left-clicking on second hero in town now have share code
|
2023-04-03 00:43:18 +03:00 |
|
Ivan Savenko
|
507d8bf7fd
|
Allow defining active areas for sliders. Fixes settings window.
|
2023-04-02 22:24:07 +03:00 |
|
Ivan Savenko
|
c661419897
|
Merge pull request #1700 from rilian-la-te/resource-array
Modernize resourceSet.
|
2023-04-02 20:12:45 +03:00 |
|
Ivan Savenko
|
efbc5cf581
|
Merge pull request #1815 from IvanSavenko/beta_fixes
Beta fixes
|
2023-04-02 20:02:41 +03:00 |
|
Ivan Savenko
|
519513e512
|
Merge pull request #1830 from SoundSSGood/beta
Graphical glitches fixed
|
2023-04-01 23:14:13 +03:00 |
|
SoundSSGood
|
348684f93e
|
Graphical glitches fixed
|
2023-04-01 16:15:10 +03:00 |
|
krs
|
a8f13bb927
|
Add RALT key check for movement info
|
2023-04-01 00:20:51 +03:00 |
|
Ivan Savenko
|
e9aed2761c
|
Fix target selection for teleport
|
2023-03-31 23:18:45 +03:00 |
|
Ivan Savenko
|
4c6dbb5037
|
Fix town UI update on building new structures
|
2023-03-31 23:18:45 +03:00 |
|
Ivan Savenko
|
839172cd30
|
Do not attempt to play animations when map is inactive
|
2023-03-31 23:18:45 +03:00 |
|
Adriankhl
|
8c5c943da9
|
Show movement cost immediately after pressing left alt key
|
2023-03-31 17:48:31 +02:00 |
|
Konstantin
|
c1fd7309ad
|
ResourceSet: composition
|
2023-03-31 14:00:49 +03:00 |
|
Ivan Savenko
|
ea1d177c9b
|
Fixed false error messages on game startup
|
2023-03-31 01:28:56 +03:00 |
|
Ivan Savenko
|
6e28b6ed90
|
Do not crash on invalid callback name
|
2023-03-31 01:28:33 +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
|
46ccd65080
|
Removed largely unused signal handling, fixes build with musl c library
|
2023-03-30 14:56:13 +03:00 |
|
Konstantin
|
5716925b47
|
NetPacks: change GiveBonus enum to enum class.
|
2023-03-30 12:41:17 +03:00 |
|
Ivan Savenko
|
1084da00df
|
Fix initial value of sound/music labels in settings
|
2023-03-30 12:23:47 +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
|
0c023347dd
|
Fix potential nullptr dereference
|
2023-03-28 23:50:57 +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
|
2cca15c2db
|
Fix graphical artifact in hero movement animation
|
2023-03-28 22:37:53 +03:00 |
|
Ivan Savenko
|
9062d67f80
|
Fixed volume of ambient sounds
|
2023-03-28 18:56:44 +03:00 |
|
Ivan Savenko
|
238de8a5d7
|
Properly disable combat panel during spell targeting
|
2023-03-28 18:14:09 +03:00 |
|
Ivan Savenko
|
47e774897d
|
Show simple message on left-clicking empty buildings
|
2023-03-28 17:36:46 +03:00 |
|
Ivan Savenko
|
fd3f80e860
|
Fix game hang on invalid shooter animation config
|
2023-03-28 17:04:18 +03:00 |
|
Ivan Savenko
|
b2f5042942
|
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
|
2023-03-27 21:21:25 +03:00 |
|
Ivan Savenko
|
b875da108b
|
Merge pull request #1717 from SoundSSGood/backpack-limit-size
Introducing backpack size limit functionality
|
2023-03-27 17:17:49 +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
|
5857ad0169
|
Fix corrupted UI redraw in artifact merchant
|
2023-03-25 23:54:51 +02:00 |
|
Ivan Savenko
|
c246cadaa7
|
Fix potential crash on exit
|
2023-03-25 23:54:51 +02:00 |
|
Ivan Savenko
|
46461e5c33
|
Improve performance of window redraws
|
2023-03-25 23:54:51 +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
|
339bbce7b7
|
Added more checks to avoid potential nullptr dereference crash
|
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
|
786035085a
|
Merge pull request #1770 from Adriankhl/fix_label_update_on_hit
Process attack/attacked animation before dealing damage to units
|
2023-03-25 20:06:23 +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
|
382fbf423d
|
Merge pull request #1762 from IvanSavenko/reactivation_fix
Do not activate new items when parent widget is inactive
|
2023-03-25 20:02:46 +02:00 |
|
Adriankhl
|
792ea2f06f
|
Process attack/attacked animation before dealing damage to units
|
2023-03-25 15:00:25 +01: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
|
b0a3f95d20
|
Do not activate new items when parent widget is inactive
|
2023-03-24 18:56:38 +02: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
|
a8fe8c0f3b
|
Converted timer event into tick event that is called every frame
|
2023-03-22 23:10:50 +02:00 |
|
Ivan Savenko
|
8af76947cb
|
Do not cache hovered tile and always update state
|
2023-03-22 19:49:57 +02:00 |
|
Ivan Savenko
|
fa9abf6adc
|
Lock UI while adventure map has animations
|
2023-03-22 19:49:24 +02:00 |
|
Ivan Savenko
|
54e8abb3eb
|
Fix map animation playback speed
|
2023-03-22 15:51:25 +02:00 |
|
Ivan Savenko
|
ef07935fbc
|
Update town visual when new structure is built
|
2023-03-22 14:41:36 +02:00 |
|
Ivan Savenko
|
c81d57ab8c
|
Remove excessive totalRedraw's
|
2023-03-22 00:57:08 +02:00 |
|
Ivan Savenko
|
a78f7de9cd
|
Fix crash on defeating hero in boat
|
2023-03-22 00:38:55 +02:00 |
|
SoundSSGood
|
19096f39f0
|
Backpack limit. Amount of fixes.
|
2023-03-21 22:11:42 +02:00 |
|
Ivan Savenko
|
bb03abdce6
|
Fix crash on switching players in hotseat
|
2023-03-21 19:06:38 +02:00 |
|
Ivan Savenko
|
bfe7bb11ab
|
Fix crash on winning scenario
|
2023-03-21 18:40:48 +02:00 |
|
Ivan Savenko
|
9dceed4f56
|
Merge pull request #1729 from IvanSavenko/battle_animation_fixes
Fixes for battle UI regressions
|
2023-03-21 14:32:45 +02:00 |
|
Ivan Savenko
|
4968ac58b4
|
Do not abort battle opening sound, only allow actions
|
2023-03-21 13:49:19 +02:00 |
|
SoundSSGood
|
f0f9eecf97
|
Backpack limit part5. End of battle. Other stuff
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
9f8aa25297
|
Backpack limit part4 (Using cheats, buying)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
e23766280f
|
Backpack limit part2 (Pick up, Dig up, Object rewards)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
96e8a1f21c
|
Backpack limit part1 (move, disassemble)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
72122fb433
|
CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization
|
2023-03-21 12:14:33 +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 |
|
Konstantin
|
5462a92930
|
Fix #1688 again
|
2023-03-18 01:19:41 +03:00 |
|
Ivan Savenko
|
dfd6998a9e
|
Merge pull request #1702 from IvanSavenko/disable_client_state_load
Disable loading of client save game
|
2023-03-17 22:15:18 +02:00 |
|
Adriankhl
|
4718396f5f
|
Prevent crashing when pressing auto-combat button on enemy turn
|
2023-03-17 15:40:14 +01:00 |
|
Ivan Savenko
|
a3059033f2
|
Fixes broken client state, e.g. movement. Effectively reverts #1663
|
2023-03-17 16:00:47 +02:00 |
|
Konstantin
|
bbbbfe00f0
|
Modernize resourceSet
|
2023-03-17 02:26:54 +03:00 |
|