games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
11,353 Commits 30 Branches 75 Tags
f2dfd6de42f589101632dc345144a9086c57d10b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Ivan Savenko 0000541291 Fixed map rendering 2023-05-09 13:10:33 +03:00
Ivan Savenko 63a1efbdc2 Fixed system options window 2023-05-09 13:10:33 +03:00
Ivan Savenko a4b102e46f Implemented UI scaling (non-selectable option for now) 2023-05-09 13:10:33 +03:00
Ivan Savenko 8d28f96619 Resolutions selector now shows all available resolutions 2023-05-09 13:10:33 +03:00
Ivan Savenko b4e7093c01 Added IWindowHandler interface for OS screen/window utilities 2023-05-09 13:10:33 +03:00
Ivan Savenko 28f41bb472 Moved remaining render-related code from CMT 2023-05-09 13:10:33 +03:00
Ivan Savenko c688411bab Extracted window management from CMT to new class 2023-05-09 13:10:33 +03:00
Ivan Savenko 18a66a4376 Rename method to better name 2023-05-09 13:10:33 +03:00
Ivan Savenko d96edd9f56 Added larger town list for higher resolutions 2023-05-09 13:10:33 +03:00
Ivan Savenko 4958190e82 Fixed visibility of corner gems 2023-05-09 13:10:33 +03:00
Ivan Savenko a015bf6507 Initial part of dynamically-sized adventure map: 
- removed no longer used CConfigHandler
- remove no longer use resolutions.json
- moved widget management from adventure map to a separate class
- adventure map layout is now loaded from config
 2023-05-09 13:10:33 +03:00
Ivan Savenko cb8201876b Merge pull request #1822 from rilian-la-te/spell-mechanics-v3 
Bonus refactoring, part3 (save-incompatible)
 2023-05-09 13:10:04 +03:00
Ivan Savenko c21d31289e Merge pull request #2135 from SoundSSGood/assert-failure-fix 
CWindowWithArtifacts assert fix
 2023-05-08 23:44:47 +03:00
Ivan Savenko 095064d288 Merge pull request #2118 from IvanSavenko/mod_repo_url 
Use separate json for vcmi-1.3
 2023-05-05 12:06:44 +03:00
Ivan Savenko 4c93b8f3f2 Use separate json for vcmi-1.3 2023-05-04 19:38:36 +03:00
Ivan Savenko 9373239c03 Merge pull request #2108 from rilian-la-te/bonuses-refactor-p2 
Split HeroBonus.h to pieces, part2
 2023-05-04 19:14:39 +03:00
Ivan Savenko b0a11ac9d6 Merge pull request #2097 from vcmi/fix_3SM3d 
Add some non-zero value treasures to fix empty zones
 2023-05-01 21:54:46 +03:00
Ivan Savenko 916b41d9a7 Merge pull request #2078 from IvanSavenko/shortcuts 
Basic shortcuts system
 2023-05-01 21:45:52 +03:00
Ivan Savenko e9e5355af0 Added commented-out wog campaigns set 2023-05-01 18:00:35 +03:00
Ivan Savenko 0662ad49dd Fix build 2023-05-01 17:59:21 +03:00
Ivan Savenko 6c637dd8e6 Integrated hotkeys with InterfaceObjectConfigurable 2023-05-01 17:59:21 +03:00
Ivan Savenko dea10e6091 Use more descriptive names for hotkeys 2023-05-01 17:59:20 +03:00
Ivan Savenko a654cc2391 Removed vstd::advance. Added vstd::next to handle similar cases. 2023-05-01 17:58:18 +03:00
Ivan Savenko 832e56e005 Implementation of (very basic) shortcuts system 
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
 2023-05-01 17:58:17 +03:00
Ivan Savenko ac09f78c67 Merge pull request #2109 from IvanSavenko/server_fix 
Fix potential nullptr-to-reference conversion
 2023-05-01 16:36:51 +03:00
Ivan Savenko c7bee037d2 Fix potential nullptr-to-reference conversion 2023-05-01 14:44:52 +03:00
Ivan Savenko 4aa232a60a Merge pull request #2055 from SoundSSGood/cartifactholder-rework 
Artifact related code refactoring part2 (client CArtifactHolder)
 2023-05-01 02:33:08 +03:00
Ivan Savenko 3378a3c740 Merge pull request #1991 from rilian-la-te/modernization-rule-ver1 
vcmi: rule-based modernization part1
 2023-04-30 15:06:14 +03:00
Ivan Savenko bd1105e2b7 Merge pull request #2098 from tytannial/Chinese_locale_update 
Launcher zhCN translation
 2023-04-29 15:57:57 +03:00
Ivan Savenko 57399b5b32 Merge pull request #2094 from tytannial/Chinese_locale_update 
Chinese locale update
 2023-04-29 12:50:24 +03:00
Ivan Savenko 318ac4f23b Merge pull request #2091 from vcmi/DjWarmonger-patch-2 
Add download counter for 1.2.1
 2023-04-29 00:29:48 +03:00
Ivan Savenko d985ac90d3 Merge master -> develop 2023-04-28 22:57:25 +03:00
Ivan Savenko f26ff594b8 Merge pull request #2090 from IvanSavenko/android_fix 
Fix Android build?
 2023-04-28 22:51:59 +03:00