Tomasz Zieliński
|
67c0fbc240
|
Merge remote-tracking branch 'origin/develop' into parellel_rmg
# Conflicts:
# lib/rmg/modificators/WaterProxy.cpp
|
2023-05-20 11:59:39 +02:00 |
|
Tomasz Zieliński
|
15b254fded
|
Give every Zone its own RNG
|
2023-05-20 11:46:32 +02:00 |
|
Tomasz Zieliński
|
5da8c96214
|
Fix include paths
|
2023-05-20 11:45:08 +02:00 |
|
Tomasz Zieliński
|
ccaece9d71
|
Refactor mapController to use precalculated obstacle set.
|
2023-05-20 10:57:05 +02:00 |
|
Tomasz Zieliński
|
cf0515dcd3
|
Moved Modificators to separate folder
|
2023-05-20 10:17:37 +02:00 |
|
Tomasz Zieliński
|
5f99facd8f
|
Optimization - don't add multiple copies of Modificators which only need one instance.
|
2023-05-20 09:58:08 +02:00 |
|
Tomasz Zieliński
|
71f882d5ba
|
Refactored Functions.cpp, removed unused function.
|
2023-05-20 07:55:28 +02:00 |
|
Tomasz Zieliński
|
c27b8383e7
|
Cleanup
|
2023-05-20 07:23:00 +02:00 |
|
Tomasz Zieliński
|
02586214a1
|
Synchronize ConnectionPlacers
|
2023-05-20 07:06:27 +02:00 |
|
Tomasz Zieliński
|
72f8facc82
|
Fixed deadlock in WaterAdopter
|
2023-05-19 20:49:01 +02:00 |
|
Tomasz Zieliński
|
73d9f5bd0a
|
Parallel RMG works fine for maps without water.
|
2023-05-19 20:30:15 +02: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 |
|
SoundSSGood
|
a10279e1cc
|
Grail fix
|
2023-05-16 16:51:45 +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 |
|
Andrii Danylchenko
|
fe65edd55d
|
BattleAI: stacks should not measure damage against turret
|
2023-05-10 09:22:13 +03:00 |
|
SoundSSGood
|
f3ae47b10e
|
art transfer fix
|
2023-05-10 03:01:13 +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 |
|