Ivan Savenko
|
317183e00d
|
Merge branch 'develop' into info-box-army-management
|
2023-07-18 16:05:09 +03:00 |
|
Ivan Savenko
|
e0977693b0
|
Merge pull request #2336 from IvanSavenko/left_button_map_drag
Left button map drag
|
2023-07-18 16:03:05 +03:00 |
|
Dydzio
|
48a72f90f7
|
Add option for persistent hero info window as in HD mod
|
2023-07-17 23:25:16 +02:00 |
|
SoundSSGood
|
ff278d5f3a
|
cleanup unused
|
2023-07-17 22:26:21 +03:00 |
|
SoundSSGood
|
f33dec9337
|
picked art fixed
|
2023-07-17 22:24:43 +03:00 |
|
Ivan Savenko
|
64a22d8590
|
Workaround for false double-clicking of elements in hero/town lists
|
2023-07-17 17:40:28 +03:00 |
|
Ivan Savenko
|
36efef0ee3
|
Do not play new day animation on game start
|
2023-07-17 16:30:12 +03:00 |
|
SoundSSGood
|
b1351d8532
|
two scrolling modes demo
|
2023-07-16 21:16:12 +03:00 |
|
Dydzio
|
ee663b1595
|
Changes from code review
|
2023-07-16 15:56:42 +02:00 |
|
Dydzio
|
1b676933e5
|
Fix indent
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
|
2023-07-16 15:46:43 +02:00 |
|
Dydzio
|
5882cbae78
|
Merge branch 'develop' into unlimited-autosave
|
2023-07-16 15:19:04 +02:00 |
|
Dydzio
|
fe26ab4501
|
Add settings entry, immediately refresh info bar on setting toggle
|
2023-07-16 14:52:43 +02:00 |
|
Ivan Savenko
|
61750d30c2
|
Implemented dragging map via left mouse click (off by default)
|
2023-07-16 12:00:40 +03:00 |
|
Dydzio
|
f8fbafff2f
|
Fix github #2335 - town garrison not updating in info box
|
2023-07-16 10:18:43 +02:00 |
|
Dydzio
|
dbfcb5a749
|
Implement interactable town tooltip
|
2023-07-16 10:17:37 +02:00 |
|
Dydzio
|
013d4cd208
|
Fix slot deselect when selected shortly after new day animation bypass
|
2023-07-15 23:15:59 +02:00 |
|
Dydzio
|
ea0ee87299
|
Interactable hero status - alternative infobox component
|
2023-07-15 23:14:59 +02:00 |
|
Dydzio
|
484d03334c
|
New garrison interface layout: Reversed two rows + labels below slot
|
2023-07-15 23:11:21 +02:00 |
|
Michael
|
4e242f98fd
|
Battleintro: Skip with mouse button
|
2023-07-15 21:18:04 +02:00 |
|
SoundSSGood
|
9427de6344
|
initial files
|
2023-07-15 22:15:32 +03:00 |
|
SoundSSGood
|
3ea6f530ad
|
backpack window initial
|
2023-07-15 22:15:32 +03:00 |
|
Ivan Savenko
|
a4ba5a9b65
|
Merge pull request #2327 from IvanSavenko/bugfixing_from_stream
Fix accumulated minor bugs
|
2023-07-15 21:55:19 +03:00 |
|
Dydzio
|
1711b3848f
|
Remove unused variable
|
2023-07-15 20:03:07 +02:00 |
|
Ivan Savenko
|
3c0037efca
|
Fix dismissing hero from opening hero window in town window that is
opened in kindom overview window
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
8129cbc514
|
Allow dismissing hero from town
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
3e8debc243
|
Allow dismissing heroes from kingdom overview window
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
189a0c6e0d
|
Re-center map on active object after screen resize
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
8a92941681
|
Allow merging stack on recruitment to give place for recruited unit
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
366239bf8d
|
Do not play movement sound on non-movement actions
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
8dc009e2c9
|
Always show correct game resolution in settings, unaffected by scaling
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
e4e353449e
|
Recreate screen on UI scaling change
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
c0f0c3cedd
|
Fix shortcuts not working sometimes
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
0ec9af7d9b
|
Replaced WoG opening with H3:SoD files
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
3836217da5
|
Fix updating of heroes when moving to/from garrison
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
3e1125570d
|
Fix updating of hero & town lists on adventure map
|
2023-07-15 16:09:44 +03:00 |
|
Michael
|
bea6effcb7
|
haptic feedback only if menu opens
fix
|
2023-07-14 22:49:44 +02:00 |
|
Michael
|
c6e860720e
|
haptic feedback only if menu opens
|
2023-07-14 22:47:13 +02:00 |
|
Dydzio
|
ad66acdd79
|
End turn autosave support + making it default
|
2023-07-13 22:07:42 +02:00 |
|
Dydzio
|
616916714a
|
Unrelated typo fix
|
2023-07-13 21:56:53 +02:00 |
|
Dydzio
|
404ab23bc6
|
Get autosave day without leading 0, delete ancient saveprefix stuff
|
2023-07-13 21:55:51 +02:00 |
|
Dydzio
|
bcb061b58f
|
Merge branch 'develop' into unlimited-autosave
|
2023-07-13 20:53:10 +02:00 |
|
Ivan Savenko
|
9ef959a7f8
|
Merge pull request #2310 from IvanSavenko/left_click_refactor
Left click input refactor
|
2023-07-13 13:03:06 +03:00 |
|
Ivan Savenko
|
fb00bf4067
|
Merge pull request #2322 from dydzio0614/resolution-fix
Fix for fullscreen game always starting in native resolution
|
2023-07-13 12:57:32 +03:00 |
|
Ivan Savenko
|
c2845d120b
|
Merge pull request #2324 from mikeiit/develop
Fixed selection update in saving screen
|
2023-07-13 12:57:06 +03:00 |
|
Ivan Savenko
|
b30db5fc1f
|
Merge pull request #2301 from Laserlicht/haptic_feedback
Haptic feedback
|
2023-07-13 12:56:54 +03:00 |
|
Michael
|
1abd8bbe92
|
Update client/windows/settings/GeneralOptionsTab.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
|
2023-07-12 22:56:35 +02:00 |
|
Mike
|
3c707d8e31
|
Cleanup
|
2023-07-11 23:12:59 -07:00 |
|
Mike
|
5134583111
|
Added missing redraw after selection update
|
2023-07-11 23:10:02 -07:00 |
|
Mike
|
90397a9604
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2023-07-11 19:06:21 -07:00 |
|
Dydzio
|
42db24b4b2
|
Fix for fullscreen game always starting in native resolution
|
2023-07-11 17:59:22 +02:00 |
|
Ivan Savenko
|
9acab48bc3
|
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
|
2023-07-11 14:36:08 +03:00 |
|
Ivan Savenko
|
78415c573b
|
Merge pull request #2289 from IvanSavenko/resolution_fixes
Fix issues with changing game resolution
|
2023-07-11 14:35:07 +03:00 |
|
DjWarmonger
|
f6cc61e0be
|
Merge pull request #2297 from vcmi/rmg_roads
Rmg roads
|
2023-07-11 09:25:24 +02:00 |
|
Ivan Savenko
|
d99fab8496
|
Reduce usage of getCursorPosition
|
2023-07-09 18:09:22 +03:00 |
|
Ivan Savenko
|
0deeff30b9
|
replaced clickPressed with clickReleased where applicable to H3
|
2023-07-09 17:55:39 +03:00 |
|
Ivan Savenko
|
18db944083
|
Replaced clickReleased with clickPressed where applicable in H3
|
2023-07-09 17:48:25 +03:00 |
|
Ivan Savenko
|
9449899098
|
Fix regressions
|
2023-07-09 17:08:37 +03:00 |
|
Ivan Savenko
|
8750aa2c5b
|
Merged server savegame and (broken and unused) client savegame files
|
2023-07-09 15:30:47 +03:00 |
|
Mike
|
b327f890f2
|
Partially fixed initial loading of save file
Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.
|
2023-07-08 23:00:48 -07:00 |
|
Dydzio
|
fbf0bf78d6
|
Configurable autosave limit and prefix - ingame handling
|
2023-07-08 23:04:01 +02:00 |
|
Michael
|
d911756827
|
changes from code review
|
2023-07-08 21:02:03 +02:00 |
|
Michael
|
70b7f992de
|
fix
|
2023-07-08 20:34:11 +02:00 |
|
Michael
|
06541211d5
|
Rename var
|
2023-07-08 19:11:26 +02:00 |
|
Michael
|
050a22c257
|
only pop up for now
|
2023-07-08 18:50:59 +02:00 |
|
Michael
|
ff51b8f46b
|
Setting for haptic feedback
|
2023-07-08 18:47:38 +02:00 |
|
Michael
|
da8bcdd2dd
|
ios Support
|
2023-07-08 18:15:36 +02:00 |
|
Michael
|
a5fe6cc80b
|
hapticFeedback
|
2023-07-08 17:02:44 +02:00 |
|
Ivan Savenko
|
ca889a5c2a
|
Replaced clickLeft with clickPressed clickReleased methods
|
2023-07-08 14:33:04 +03:00 |
|
Tomasz Zieliński
|
730b36612c
|
Respect GUI settings for roads. By default, all road types are enabled.
|
2023-07-08 08:44:10 +02:00 |
|
Ivan Savenko
|
2a634b2ec0
|
Fixed UI updates on switching to/from fullscreen
|
2023-07-07 15:26:42 +03:00 |
|
Ivan Savenko
|
7e00a702c1
|
Fix switching to exclusive fullscreen to borderless windowed
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
0c83e34093
|
Implemented reserved area for iOS notch / cutout
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
5143ca266d
|
Moved SDL renderer access to ScreenHandler class
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
fa4a0004b2
|
Merge pull request #2291 from IvanSavenko/terrain_animations_config
Moved hardcoded terrain palette-cycling animations to config
|
2023-07-07 14:28:39 +03:00 |
|
Ivan Savenko
|
ae8579558d
|
Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
|
2023-07-07 14:27:58 +03:00 |
|
Ivan Savenko
|
a9d25b0109
|
Fix map grid visibility on game load
|
2023-07-07 01:27:57 +03:00 |
|
Ivan Savenko
|
41755c9d87
|
Fix slider scroll via UI buttons
|
2023-07-07 01:23:17 +03:00 |
|
Mike
|
6414e3b3fc
|
Changed resource cost value label position
|
2023-07-05 18:43:52 -07:00 |
|
Ivan Savenko
|
3bce245780
|
Moved hardcoded terrain palette-cycling animations to config
|
2023-07-05 22:07:20 +03:00 |
|
SoundSSGood
|
9b5f6ec7cf
|
CArtifact getters setters
|
2023-07-05 15:48:08 +03:00 |
|
Ivan Savenko
|
85655d5534
|
Block map level toggle on maps without underground
|
2023-07-04 21:42:37 +03:00 |
|
Ivan Savenko
|
b775385179
|
Fix usage of left/right button to select amounts, e.g. in recruit screen
|
2023-07-04 21:35:26 +03:00 |
|
Ivan Savenko
|
07d9674828
|
Mouse click that activates a window will also trigger mouse event
|
2023-07-04 20:28:02 +03:00 |
|
Ivan Savenko
|
1dff721747
|
Fix infobox resetting to current hero during enemy turn
|
2023-07-04 20:28:02 +03:00 |
|
Ivan Savenko
|
1cbc6457ce
|
Fix possible assertion failure on removing non-owned town
|
2023-07-04 20:28:02 +03:00 |
|
Ivan Savenko
|
4fd5a2b3ea
|
Fixed sorting maps breaking after multiple clicks in succession
|
2023-07-04 20:28:00 +03:00 |
|
Ivan Savenko
|
f914ec9d57
|
Fix activation of in-game console in other windows
|
2023-07-04 20:27:45 +03:00 |
|
Ivan Savenko
|
900b1c1763
|
Simplified text input handling, fixes hotkeys on windows with text input
|
2023-07-04 18:42:52 +03:00 |
|
Ivan Savenko
|
81b9aec527
|
Fix map edge scrolling after swiping usage
|
2023-07-03 23:50:09 +03:00 |
|
SoundSSGood
|
fd9c7352a0
|
suggested changes
|
2023-07-03 22:54:03 +03:00 |
|
Ivan Savenko
|
4e80356bea
|
Do not hide minimap on human player turn
|
2023-07-03 19:36:10 +03:00 |
|
Ivan Savenko
|
8b61c0d59b
|
Replaced CIntObject::type bitfield with bool's. Added input blocking.
|
2023-07-03 19:24:12 +03:00 |
|
Ivan Savenko
|
48eb8ab54f
|
Play sound when receiving message, not just on sending ours
|
2023-07-03 17:12:31 +03:00 |
|
Ivan Savenko
|
aacef72125
|
Attempt to remove native pinch handling from ios
|
2023-07-03 17:00:03 +03:00 |
|
Ivan Savenko
|
8efa7911b7
|
Implemented "Allied Adventure Map AI" option
|
2023-07-03 14:34:53 +03:00 |
|
SoundSSGood
|
060aecc61c
|
CArtifact refactoring
|
2023-06-30 19:41:26 +03:00 |
|
SoundSSGood
|
d44821e733
|
CArtifactInstance moved to own file
|
2023-06-30 19:41:19 +03:00 |
|
SoundSSGood
|
f8023ad283
|
CScrollArtifactInstance
|
2023-06-30 19:41:04 +03:00 |
|
SoundSSGood
|
07c811dd67
|
CCombinedArtifactInstance refactoring
|
2023-06-30 19:40:57 +03:00 |
|
Ivan Savenko
|
9cd246ab8b
|
Merge pull request #2259 from IvanSavenko/campaign_refactoring
Fix accumulated issues with campaigns
|
2023-06-30 12:59:48 +03:00 |
|
Mike
|
c35d9d66a6
|
Brought back missing fort level in info box
This is to fix #2158
|
2023-06-28 22:21:34 -07:00 |
|
Ivan Savenko
|
cdc27d1fcf
|
Play correct music file in campaign menu
|
2023-06-27 20:09:11 +03:00 |
|
Ivan Savenko
|
0fdbf54937
|
Use HeroTypeID instead of int
|
2023-06-27 19:32:27 +03:00 |
|
Ivan Savenko
|
96eab03b16
|
Fix UI updates
|
2023-06-27 14:09:04 +03:00 |
|
Ivan Savenko
|
88566cb1ef
|
Fix another unprotected UI access
|
2023-06-26 22:14:21 +03:00 |
|
Ivan Savenko
|
0f8d53e978
|
Replaced SDL user events list with dispatching of arbitrary functors
|
2023-06-26 21:51:10 +03:00 |
|
Ivan Savenko
|
3d66455cd1
|
Fix build
|
2023-06-26 19:44:38 +03:00 |
|
Ivan Savenko
|
e2bd98e21e
|
CampaignRegions class encapsulation
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
f6b2f58da9
|
Use inheritance instead of composition for campaign header
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
a08fe09517
|
Added encapsulation for CampaignState class
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
8420a90aa4
|
Reorganization of campaigns code
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
d1e5a347ff
|
Refactoring of campaign handler: rename types and use strong typing
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
85262cf4f5
|
Moved CGameState files into a separate directory
|
2023-06-26 17:15:59 +03:00 |
|
Mike
|
75820c3bdf
|
Fixed overlapped text display in adventure map settings
|
2023-06-25 16:27:00 -07:00 |
|
Ivan Savenko
|
6546242c03
|
Workaround-ish fix for last scenario of Angel Wings (un)equipping
|
2023-06-25 17:42:36 +03:00 |
|
Ivan Savenko
|
08cfbe79cf
|
Added encapsulation for movement points access
|
2023-06-25 17:42:36 +03:00 |
|
Ivan Savenko
|
edf7756783
|
Recalculate paths on (un)equipping Angel Wings
|
2023-06-25 17:42:36 +03:00 |
|
Ivan Savenko
|
90c68588f9
|
Implemented fly movement sound
|
2023-06-25 17:42:36 +03:00 |
|
Ivan Savenko
|
a84ccb37c2
|
Merge pull request #2250 from IvanSavenko/event_handling_fixes
Slider input event fix
|
2023-06-25 17:39:55 +03:00 |
|
krs
|
27c488e62f
|
Small changes after review.
|
2023-06-23 20:05:15 +03:00 |
|
krs
|
afe0146021
|
Renamed settings option to reflect that same option is used for both ranges.
|
2023-06-23 19:50:39 +03:00 |
|
krs
|
b6ab1e1505
|
Removed #regions
|
2023-06-23 19:13:39 +03:00 |
|
krs
|
1cba41a3c3
|
IsHexInRangeLimit() is now a common function
Plus some minor rearranging of code.
|
2023-06-23 19:13:39 +03:00 |
|
krs
|
1ba9a2a42a
|
calculateRangeLimitAndHighlightImages() is now separate function
|
2023-06-23 19:13:39 +03:00 |
|
krs
|
e668ea3a03
|
A common function is used for getting hexes in a certain range
getRangeHexes()
|
2023-06-23 19:13:39 +03:00 |
|
krs
|
192f82152d
|
A common function is used to get range limit hexes
getRangeLimitHexes()
|
2023-06-23 19:13:39 +03:00 |
|
krs
|
33bbbefdeb
|
First working prototype that mimics rangedFullDamageLimit code
Next step is to create more generic functions that can be shared between the 2.
|
2023-06-23 19:13:39 +03:00 |
|
Ivan Savenko
|
6a08a96d0c
|
Added createObject call as wrapper around NewObject netpack
|
2023-06-23 13:42:08 +03:00 |
|
Ivan Savenko
|
d8879f1e53
|
NewObject pack now receives visitable position instead of h3m position
|
2023-06-23 13:34:51 +03:00 |
|
Ivan Savenko
|
56680e102d
|
Merge pull request #2245 from IvanSavenko/platform_settings
Allow defining default values of settings per platform
|
2023-06-23 13:32:30 +03:00 |
|
Ivan Savenko
|
69dc95c3c8
|
Merge pull request #2235 from IvanSavenko/hota_h3m_support
Hota h3m support
|
2023-06-23 13:32:10 +03:00 |
|
Ivan Savenko
|
a505cc464e
|
Fixed slider's behavior, especially for mobile systems
|
2023-06-22 23:49:38 +03:00 |
|
Ivan Savenko
|
7c5dcfd47b
|
Fix closing dropdown box via clicking outside bounds
|
2023-06-22 22:34:05 +03:00 |
|
Ivan Savenko
|
dfeeeb1f5f
|
Removed no longer used
|
2023-06-22 22:12:05 +03:00 |
|
Ivan Savenko
|
4e7412faa6
|
Split mouseDragged event from mouseMoved
|
2023-06-22 22:11:48 +03:00 |
|
Ivan Savenko
|
ccc85ff4eb
|
Merge pull request #2246 from IvanSavenko/pathfinding_reorganization
Pathfinding code reorganization
|
2023-06-21 18:22:44 +03:00 |
|
Ivan Savenko
|
ebc7a82c2e
|
Converted pathfinder enum's to enum class
|
2023-06-21 15:38:57 +03:00 |
|
Ivan Savenko
|
bd4d2788ed
|
Split pathfinder into multiple smaller files
|
2023-06-21 13:46:09 +03:00 |
|
Ivan Savenko
|
87fcfa4add
|
Removed excessive pathfinder includes
|
2023-06-21 12:00:44 +03:00 |
|
Ivan Savenko
|
8f602b2ef6
|
Allow defining default values of settings per platform
|
2023-06-21 10:55:30 +03:00 |
|
Ivan Savenko
|
967dc95867
|
Rename panning->gesturing for consistency
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
0be9aff99f
|
Fix battle queue stack highlighting
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
108688389e
|
Fix accessing potentially non-existing UI element
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
e5df7656a2
|
Added debug option to test touchscreen input on desktop systems
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
ffdac314e9
|
Added selection of long touch duration
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
06437cbde6
|
Renamed gesture-related methods, remove unused code
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
563d7dd41f
|
Renamed RCLICK -> SHOW_POPUP
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
8ad577255f
|
Replaced isMouseButtonPressed with isMouseLeftButtonPressed
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
82288996a2
|
Fix cursor visibility on closing popup
|
2023-06-20 19:58:05 +03:00 |
|
Ivan Savenko
|
85a11c090e
|
Enter popup await mode only if there is an active popup
|
2023-06-20 19:58:05 +03:00 |
|