1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Commit Graph

11461 Commits

Author SHA1 Message Date
ae97912b1e Fix warning 2023-05-20 13:23:27 +02:00
91baa65c8c Remove no longer needed synchronization that also fails to compile. 2023-05-20 13:15:46 +02:00
956ff22e64 Merge pull request #2163 from IvanSavenko/adventure_map_zoom
Adventure map zoom
2023-05-20 13:35:53 +03:00
867c5355da Fix tower shooters animation updates 2023-05-20 13:11:52 +03:00
219e897db0 Added missing files. 2023-05-20 12:02:30 +02:00
67c0fbc240 Merge remote-tracking branch 'origin/develop' into parellel_rmg
# Conflicts:
#	lib/rmg/modificators/WaterProxy.cpp
2023-05-20 11:59:39 +02:00
15b254fded Give every Zone its own RNG 2023-05-20 11:46:32 +02:00
5da8c96214 Fix include paths 2023-05-20 11:45:08 +02:00
ccaece9d71 Refactor mapController to use precalculated obstacle set. 2023-05-20 10:57:05 +02:00
cf0515dcd3 Moved Modificators to separate folder 2023-05-20 10:17:37 +02:00
5f99facd8f Optimization - don't add multiple copies of Modificators which only need one instance. 2023-05-20 09:58:08 +02:00
71f882d5ba Refactored Functions.cpp, removed unused function. 2023-05-20 07:55:28 +02:00
c27b8383e7 Cleanup 2023-05-20 07:23:00 +02:00
02586214a1 Synchronize ConnectionPlacers 2023-05-20 07:06:27 +02:00
70bdec41a3 case-insensitive cheats 2023-05-20 01:14:06 +02:00
6981848288 Better documentation & cleanup 2023-05-20 01:51:49 +03:00
a4000f2fc8 Removed isActive(int) method since its usages were redundant or wrong 2023-05-20 01:51:49 +03:00
c77f8482e3 Replaced event handling break system with key capturing 2023-05-20 01:51:49 +03:00
f4d67fe675 Restore SDL_main in CMT.cpp 2023-05-20 01:51:49 +03:00
e23dfec6c5 Fix SDL_Hints location 2023-05-20 01:51:49 +03:00
bb36336aed Changed event queue to vector 2023-05-20 01:51:49 +03:00
0e70f2998f SDL event handling is now done exclusively in input handler 2023-05-20 01:51:49 +03:00
5e86b00dda Moved input handling from GuiHandler to set of classes in eventsSDL dir 2023-05-20 01:51:49 +03:00
5bd044521a Added method descriptions 2023-05-20 01:51:49 +03:00
6012e0cb45 Minor code reorganization 2023-05-20 01:51:49 +03:00
ff1c94541f Fix button interaction with hotkey & mouse 2023-05-20 01:51:49 +03:00
d5d0ca96a8 Minor fixes and cleanup 2023-05-20 01:51:49 +03:00
1f513fd280 Extracted event management from GuiHandler and CIntObject 2023-05-20 01:51:49 +03:00
008a1ebec4 split massive handleCurrentEvent method into per-event parts 2023-05-20 01:51:49 +03:00
06b6f59107 Resolution selector will now correctly update in borderless window mode 2023-05-19 23:54:43 +03:00
20ec747440 Do not show desktop-only options on mobile systems 2023-05-19 23:19:43 +03:00
d18b240d6d Added separate borderless & exclusive fullscreen options 2023-05-19 22:43:52 +03:00
f2dfd6de42 Updated settings window to use new layouts & library 2023-05-19 22:43:52 +03:00
7cbfd8117e Implemented simple layout to simplify widget json definitions 2023-05-19 22:43:52 +03:00
7cd898a87a Implemented "customTypes" in UI json to reduce duplicated definitions 2023-05-19 22:43:52 +03:00
72f8facc82 Fixed deadlock in WaterAdopter 2023-05-19 20:49:01 +02:00
73d9f5bd0a Parallel RMG works fine for maps without water. 2023-05-19 20:30:15 +02:00
krs
289a6da3d7 Merge fix for battlefield 2023-05-19 21:23:08 +03:00
krs
105dcf5a9f Fixed white spaces 2023-05-19 21:14:01 +03:00
krs
2e6cae80a9 Schemas rearranged
Artifact Schema rearranged


Battlefield schema rearanged


Bonus schema rearranged


Faction Schema rearanged


Hero Schema rearranged


HeroClass schema rearranged


MapHeader schema updated, something fishy in events


Mod schema updated. Settings not complete


Object schema rearranged


Object schema rearranged


object type schema rearranged


obstacles schema rearranged


Rivers schema updated


roads schema updated


script schema updated


skill schema updated


spell schema updated


template schema update


terrain schemas updated


town buildings schema update


town siege schema updated


town structure schema updated
2023-05-19 21:04:47 +03:00
1c82a10fdd Fix graphical artifacts on map scaling 2023-05-19 17:09:46 +03:00
cb4cf224a9 Merge pull request #2169 from IvanSavenko/fix_timer
Fix map freeze on enemy turn
2023-05-19 14:44:52 +03:00
be2e101c8c Fix map freeze on enemy turn 2023-05-19 13:22:18 +03:00
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
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
7a54273b7c Merge pull request #2160 from SoundSSGood/grail_dig-fix
Fixed grail digging
2023-05-17 17:10:30 +03:00
872b68c59a Implemented zoom reset shortcut (backspace) 2023-05-17 14:54:19 +03:00
7504ceb256 Fixed map view centering during scaling change 2023-05-17 14:36:12 +03:00
9e3bc87a6b Allow zooming with mouse wheel 2023-05-17 00:49:24 +03:00
3e9da333cf Basic version of zoomable adventure map 2023-05-16 23:42:51 +03:00