Commit Graph
100 Commits
Author SHA1 Message Date
Ivan Savenko fb55719671 Map format support status can now be loaded from gameSettings 2023-05-31 23:01:57 +03:00
Ivan Savenko 402823e3d5 Fix loading of some user-made maps 2023-05-31 23:01:57 +03:00
Ivan Savenko eff6551f80 Merge pull request #2171 from krs0/feature/schema_updates
Rearranging Schemas
2023-05-29 15:37:50 +03:00
Ivan Savenko 9d7a6063b6 Merge pull request #2188 from Nordsoft91/fix_2187
Strict weak ordering on the data
2023-05-29 15:37:42 +03:00
Ivan Savenko 5b392639b5 Merge pull request #2181 from IvanSavenko/fix_mod_repo_url
Use 1.3 repo on Android
2023-05-23 16:46:26 +03:00
Ivan Savenko 59232e827d Use 1.3 repo on Android 2023-05-23 15:28:45 +03:00
Ivan Savenko 2c3e8c3390 Merge pull request #2168 from IvanSavenko/gui_handler_event_handling_refactoring
Event handling refactoring
2023-05-23 15:08:10 +03:00
Ivan Savenko 10fc6cecef Merge pull request #2157 from IvanSavenko/interface_layouts
Update in-game settings window to recent changes
2023-05-20 19:25:34 +03:00
Ivan Savenko d6619e2605 Merge pull request #2173 from Laserlicht/patch-1
case-insensitive cheats
2023-05-20 19:25:27 +03:00
Ivan Savenko 956ff22e64 Merge pull request #2163 from IvanSavenko/adventure_map_zoom
Adventure map zoom
2023-05-20 13:35:53 +03:00
Ivan Savenko 867c5355da Fix tower shooters animation updates 2023-05-20 13:11:52 +03:00
Ivan Savenko 6981848288 Better documentation & cleanup 2023-05-20 01:51:49 +03:00
Ivan Savenko a4000f2fc8 Removed isActive(int) method since its usages were redundant or wrong 2023-05-20 01:51:49 +03:00
Ivan Savenko c77f8482e3 Replaced event handling break system with key capturing 2023-05-20 01:51:49 +03:00
Ivan Savenko f4d67fe675 Restore SDL_main in CMT.cpp 2023-05-20 01:51:49 +03:00
Ivan Savenko e23dfec6c5 Fix SDL_Hints location 2023-05-20 01:51:49 +03:00
Ivan Savenko bb36336aed Changed event queue to vector 2023-05-20 01:51:49 +03:00
Ivan Savenko 0e70f2998f SDL event handling is now done exclusively in input handler 2023-05-20 01:51:49 +03:00
Ivan Savenko 5e86b00dda Moved input handling from GuiHandler to set of classes in eventsSDL dir 2023-05-20 01:51:49 +03:00
Ivan Savenko 5bd044521a Added method descriptions 2023-05-20 01:51:49 +03:00
Ivan Savenko 6012e0cb45 Minor code reorganization 2023-05-20 01:51:49 +03:00
Ivan Savenko ff1c94541f Fix button interaction with hotkey & mouse 2023-05-20 01:51:49 +03:00
Ivan Savenko d5d0ca96a8 Minor fixes and cleanup 2023-05-20 01:51:49 +03:00
Ivan Savenko 1f513fd280 Extracted event management from GuiHandler and CIntObject 2023-05-20 01:51:49 +03:00
Ivan Savenko 008a1ebec4 split massive handleCurrentEvent method into per-event parts 2023-05-20 01:51:49 +03:00
Ivan Savenko 06b6f59107 Resolution selector will now correctly update in borderless window mode 2023-05-19 23:54:43 +03:00
Ivan Savenko 20ec747440 Do not show desktop-only options on mobile systems 2023-05-19 23:19:43 +03:00
Ivan Savenko d18b240d6d Added separate borderless & exclusive fullscreen options 2023-05-19 22:43:52 +03:00
Ivan Savenko f2dfd6de42 Updated settings window to use new layouts & library 2023-05-19 22:43:52 +03:00
Ivan Savenko 7cbfd8117e Implemented simple layout to simplify widget json definitions 2023-05-19 22:43:52 +03:00
Ivan Savenko 7cd898a87a Implemented "customTypes" in UI json to reduce duplicated definitions 2023-05-19 22:43:52 +03:00
Ivan Savenko 1c82a10fdd Fix graphical artifacts on map scaling 2023-05-19 17:09:46 +03:00
Ivan Savenko cb4cf224a9 Merge pull request #2169 from IvanSavenko/fix_timer
Fix map freeze on enemy turn
2023-05-19 14:44:52 +03:00
Ivan Savenko be2e101c8c Fix map freeze on enemy turn 2023-05-19 13:22:18 +03:00
Ivan Savenko 9817aaa466 Merge pull request #2145 from IvanSavenko/fix_hota_support
Minor fixed for compatibility with hota data files
2023-05-18 22:50:10 +03:00
Ivan Savenko 796666ede1 Merge pull request #2161 from IvanSavenko/gui_handler_separate_window_handler
Separate Gui Handler into components - Window management
2023-05-18 22:49:58 +03:00
Ivan Savenko 7a54273b7c Merge pull request #2160 from SoundSSGood/grail_dig-fix
Fixed grail digging
2023-05-17 17:10:30 +03:00
Ivan Savenko 872b68c59a Implemented zoom reset shortcut (backspace) 2023-05-17 14:54:19 +03:00
Ivan Savenko 7504ceb256 Fixed map view centering during scaling change 2023-05-17 14:36:12 +03:00
Ivan Savenko 9e3bc87a6b Allow zooming with mouse wheel 2023-05-17 00:49:24 +03:00
Ivan Savenko 3e9da333cf Basic version of zoomable adventure map 2023-05-16 23:42:51 +03:00
Ivan Savenko 805721f8d7 Add missing check for file presence 2023-05-16 21:58:09 +03:00
Ivan Savenko ad3e54e6c0 Reduced usage of topWindow() method 2023-05-16 21:57:45 +03:00
Ivan Savenko e2ef136003 Renamed "Int" -> "Window" in WindowHandler API 2023-05-16 19:10:22 +03:00
Ivan Savenko 051a4a3c17 Encapsulation of WindowHandler state 2023-05-16 19:10:22 +03:00
Ivan Savenko 7838190ef4 Moved window stack management from GuiHandler to new class 2023-05-16 19:10:21 +03:00
Ivan Savenko ddf22a757d Merge pull request #2153 from IvanSavenko/better_time_management
Separate updates from rendering actions
2023-05-16 19:05:40 +03:00
Ivan Savenko 4f739d426d Added check for validness of native terrain 2023-05-15 22:22:54 +03:00
Ivan Savenko c45d4f8d22 Few more fixes to building ordering 2023-05-15 22:22:54 +03:00
Ivan Savenko 9eac3eaafa Merged "music" resource type into "sound", enables ogg's use as sounds 2023-05-15 22:22:54 +03:00
Ivan Savenko ca19fc7fcc Backported minor z-ordering fixes from hota mod 2023-05-15 22:22:54 +03:00
Ivan Savenko 5e3a0a1a75 Fixed json validation 2023-05-15 22:22:54 +03:00
Ivan Savenko d6d679a38c Fix missing broken shadows on hota map objects 2023-05-15 22:22:54 +03:00
Ivan Savenko f84c2c3bb5 Removed getFrameDeltaMilliseconds from gui handler 2023-05-14 22:30:59 +03:00
Ivan Savenko 8a31aeb94b Battle animations use tick() for updates 2023-05-14 22:23:00 +03:00
Ivan Savenko fa496628f2 Separated timer updates from rendering in adventure map and town screen 2023-05-14 22:22:37 +03:00
Ivan Savenko 3ecdff2a21 FramerateManager now uses chrono instead of SDL_Ticks 2023-05-14 22:22:37 +03:00
Ivan Savenko 03df274450 Framerate manager is now in a separate file and private member of GH 2023-05-14 22:22:37 +03:00
Ivan Savenko 0a874cd89e Merge pull request #2152 from IvanSavenko/fix_console
Fix console activation via mouse click / touch
2023-05-14 13:02:53 +03:00
Ivan Savenko 64cc246358 Fix positioning of console log overlay 2023-05-13 18:00:14 +03:00
Ivan Savenko 5e90d40e8b Fix typo 2023-05-13 17:59:59 +03:00
Ivan Savenko bfa6fc13f2 Merge pull request #2151 from IvanSavenko/fix_advmap
Fix regressions from adventure map PR
2023-05-13 00:56:16 +03:00
Ivan Savenko b9f18288f9 Fix duplicated widget name in settings window 2023-05-12 22:58:36 +03:00
Ivan Savenko 062311d24a Fix callbacks of toggle buttons. Fixes game options window 2023-05-12 22:58:21 +03:00
Ivan Savenko 7927470d46 Merge pull request #2076 from IvanSavenko/configurable_adventure_map
Implement scalable adventure map window
2023-05-12 17:39:45 +03:00
Ivan Savenko 4ca0bef79c Merge pull request #2144 from vcmi/fix-stacks-try-to-attack-turret
BattleAI: stacks should not measure damage against turret
2023-05-12 17:38:09 +03:00
Ivan Savenko b0c3e767d9 Merge pull request #2143 from SoundSSGood/commander-art-transfer-fix
Artifact transfer to the commander fix
2023-05-12 17:37:37 +03:00
Ivan Savenko 2a7278f45c Merge pull request #2142 from IvanSavenko/fix_artifact_bonuses
Fix broken bonuses of new artifacts
2023-05-10 01:32:47 +03:00
Ivan Savenko 79982c4ad4 Fix broken bonuses due to calling PutArtifact before NewArtifact 2023-05-09 16:48:52 +03:00
Ivan Savenko c5a48a01ce Remove no longer used code 2023-05-09 13:10:33 +03:00
Ivan Savenko edd5d11734 Fix issues discovered by self-review 2023-05-09 13:10:33 +03:00
Ivan Savenko 8504b891a8 Added more checks for SDL return status 2023-05-09 13:10:33 +03:00
Ivan Savenko b2233b8ced Attempt to improve coloring of resource bar texture-fill 2023-05-09 13:10:33 +03:00
Ivan Savenko c01b74434c Fix cancelling spellcast with escape 2023-05-09 13:10:33 +03:00
Ivan Savenko 243773b6ef Renamed some adventure map files & classes 2023-05-09 13:10:33 +03:00
Ivan Savenko e26b18c139 Rename & cleanup of WindowHandler -> ScreenHandler 2023-05-09 13:10:33 +03:00
Ivan Savenko 29b10f0436 Try to enable window resize 2023-05-09 13:10:33 +03:00
Ivan Savenko b1bd49ecd8 Fix main menu resize on resolution change 2023-05-09 13:10:33 +03:00
Ivan Savenko bffec0068b Fix screen updates after window resize 2023-05-09 13:10:33 +03:00
Ivan Savenko dbc4330fc5 Fixed positioning of resource bar and town list in other windows 2023-05-09 13:10:33 +03:00
Ivan Savenko f403766fbb Attempt to fix DPI scaling on Windows 2023-05-09 13:10:33 +03:00
Ivan Savenko cc68ce9d8b Implemented resolutions selector in Launcher using SDL 2023-05-09 13:10:33 +03:00
Ivan Savenko ca15bf5698 Added autoselection of in-game console log width 2023-05-09 13:10:33 +03:00
Ivan Savenko ecff5f3d12 Do not trigger multiple hotkeys when battle window wait for any key 2023-05-09 13:10:33 +03:00
Ivan Savenko 61181d63bd Fixed missing hotkeys for game saving 2023-05-09 13:10:33 +03:00
Ivan Savenko 97d266ea2d Remove duplicated resolutions, e.g. different frequency 2023-05-09 13:10:33 +03:00
Ivan Savenko 8b27780c11 Fixed scrolling blocking with Ctrl 2023-05-09 13:10:33 +03:00
Ivan Savenko a6fda031ed Fixed widget disabling during enemy turn & spellcasting 2023-05-09 13:10:33 +03:00
Ivan Savenko 7228b08d1d Implemeted runtime generation of player-colored background texture 2023-05-09 13:10:33 +03:00
Ivan Savenko 342ea138f9 Fix remaining graphical artifacts on switching from world view 2023-05-09 13:10:33 +03:00
Ivan Savenko c24ccf663b Fixed auto-enabling of status bar on windows activations 2023-05-09 13:10:33 +03:00
Ivan Savenko 8e320d8454 Fixed world view mode 2023-05-09 13:10:33 +03:00
Ivan Savenko 5ae507505a Fixed toggleable buttons (sleep/wake & subterra/surface) 2023-05-09 13:10:33 +03:00
Ivan Savenko 77beca50e2 Hide resolution selector on mobile devices 2023-05-09 13:10:33 +03:00
Ivan Savenko a0f1bf3928 Implemented user-selectable UI scaling mode 2023-05-09 13:10:33 +03:00
Ivan Savenko fd3933e589 Support for changing resolution without game restart 2023-05-09 13:10:33 +03:00
Ivan Savenko 97426a3f7c Implemented disabling of buttons based on condition 2023-05-09 13:10:33 +03:00
Ivan Savenko d4098059b8 Proper support for player-colored buttons in UI 2023-05-09 13:10:33 +03:00
Ivan Savenko 7aacba6e55 Fix adventure map left-clicking 2023-05-09 13:10:33 +03:00
Ivan Savenko 019d7b6811 Integrated shortcuts into adventure window configuration 2023-05-09 13:10:33 +03:00