1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

5747 Commits

Author SHA1 Message Date
Ivan Savenko
114709e0b1
Merge pull request #3781 from Laserlicht/save_name
set save name by default
2024-04-18 21:34:25 +03:00
Ivan Savenko
0824f50367
Merge pull request #3779 from SoundSSGood/backpackWindow-art-transfer-fix
Backpack window cursor fix
2024-04-18 15:18:36 +03:00
Ivan Savenko
3724742247
Merge pull request #3774 from Laserlicht/fix_city_gate
fix city gate
2024-04-18 15:09:53 +03:00
Ivan Savenko
9023af4426
Merge pull request #3772 from dydzio0614/resources-bonus
Add some utility bonuses for player resources boosting
2024-04-18 15:09:34 +03:00
SoundSSGood
e8eb638bf1 backpack window cursor fix 2024-04-17 16:11:33 +03:00
Laserlicht
b74c1818c4
set save name by default 2024-04-16 21:21:20 +02:00
Ivan Savenko
2861ebb515 Capture members by copy instead of capturing this due to short lifetime 2024-04-16 18:55:21 +03:00
Laserlicht
f847068e92
fix city gate 2024-04-16 00:54:04 +02:00
Dydzio
b351946afd Add some utility bonuses for player resources boosting 2024-04-15 21:18:45 +02:00
Ivan Savenko
9390825ee7
Merge pull request #3763 from IvanSavenko/fix_tp
Fix regressions
2024-04-14 14:14:23 +03:00
Ivan Savenko
8003d0d7ca Restore handling of double-clicks in message boxes 2024-04-14 13:09:39 +03:00
Ivan Savenko
ae8779779b Fix typo in file names 2024-04-14 13:09:11 +03:00
DjWarmonger
0808a8b36f
Merge pull request #3714 from vcmi/biome_system
Biome system implementation
2024-04-13 21:32:13 +02:00
Ivan Savenko
2f1f68f89d Do not attempt to move if there are active dialogs 2024-04-13 16:57:21 +03:00
Ivan Savenko
95c0551de5
Merge pull request #3751 from IvanSavenko/fix_dnd_cursor
Fix assertion failure with drag-and-drop cursor
2024-04-13 14:39:19 +03:00
Ivan Savenko
d4594baa05
Merge pull request #3749 from IvanSavenko/configurable_shortcuts
Configurable keyboard shortcuts
2024-04-13 12:47:30 +03:00
Ivan Savenko
0bd1c3c95d
Merge pull request #3746 from IvanSavenko/fix_undefined_behavior
Fix discovered undefined behavior cases
2024-04-12 11:51:13 +03:00
Ivan Savenko
a7d47cd3d2
Merge pull request #3742 from IvanSavenko/adventure_map_spellcast_fixes
Adventure map spellcasting fixes
2024-04-12 11:17:19 +03:00
Ivan Savenko
de5bd5f94c Reset picked artifact on window deactivation 2024-04-11 23:52:37 +03:00
Ivan Savenko
fa9e0669f2 Remove excessive call - will be reset on window push anyway 2024-04-11 23:51:58 +03:00
Ivan Savenko
ac1c36b7e2 Fixed not working shortcuts on some buttons in main menu 2024-04-11 22:00:54 +03:00
Ivan Savenko
611249d11d Added workaround for weird SDL behavior that causes SDL to report text
input as active when app starts until first actual text input
2024-04-11 22:00:20 +03:00
Ivan Savenko
16c56cf6c5 Keyboard shortcuts are now loaded from config file 2024-04-11 21:21:46 +03:00
Ivan Savenko
cbd5f57069 Added workaround for potential access to CIntObject after destruction 2024-04-11 13:25:54 +03:00
Ivan Savenko
c99d4b959e Fix potentially uninintialized variables 2024-04-11 13:25:54 +03:00
Ivan Savenko
9188280d02 Fix access to CPrologEpilogVideo after destruction from sound callback 2024-04-11 13:25:54 +03:00
SoundSSGood
6a0e8b0cab Junkyard crash fixed 2024-04-11 01:44:15 +03:00
SoundSSGood
ca0f7aee7d artifactMoved assertion fix 2024-04-10 23:30:31 +03:00
Ivan Savenko
320469d773 Cleanup 2024-04-10 20:04:08 +03:00
Ivan Savenko
8353bca34f Small refactoring of adventure map spell casting:
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
Ivan Savenko
bcd4a8c961
Merge pull request #3736 from IvanSavenko/fix_server_translations
Do not translate strings on server side
2024-04-10 19:12:34 +03:00
Ivan Savenko
5b43720dda
Merge pull request #3686 from dydzio0614/dimension-door-changes
Dimension door changes
2024-04-10 11:47:36 +03:00
Ivan Savenko
510e1023da
Merge pull request #3730 from IvanSavenko/localization_export
Better export command for translations
2024-04-09 19:11:10 +03:00
Ivan Savenko
18ece6dcf6 Remove some usages of server-side translations 2024-04-09 16:13:30 +03:00
Ivan Savenko
b0334b381e
Merge pull request #3724 from IvanSavenko/fix_server_shutdown
Simplified and fixed server restart procedure
2024-04-09 16:13:19 +03:00
Ivan Savenko
576939f105
Merge pull request #3713 from Laserlicht/scalingMode
scalingMode to config
2024-04-09 12:48:35 +03:00
Ivan Savenko
f73243eb1c
Merge pull request #3669 from SoundSSGood/market-window-unified
Market window and widgets
2024-04-09 12:48:25 +03:00
Tomasz Zieliński
d9a598ad9c Merge remote-tracking branch 'origin/develop' into biome_system 2024-04-08 15:01:17 +02:00
SoundSSGood
39a0e56169 suggested changes 2024-04-08 14:57:58 +03:00
Tomasz Zieliński
3e3959d360 Move all OH3 objects and obstacle sets to a mod 2024-04-08 12:50:41 +02:00
Ivan Savenko
8582bd7d66 Replaced 'convert txt' command with more convenient 'translate' and
'translate maps' commands.
2024-04-08 13:16:23 +03:00
Ivan Savenko
e89e5d2127 Rename for clarity 2024-04-07 21:22:33 +03:00
Ivan Savenko
0a296add0c apply SonarCloud suggestions 2024-04-07 21:21:48 +03:00
Ivan Savenko
80acd7e77c Simplified and fixed server restart procedure:
- Replaced several assertions with runtime_error's to detect them in
release builds
- Removed multiple dispatchMainThread calls in server shutdown code to
simplify debugging and code flow
- Moved handling of gameplay shutdown and score calculation from
PlayerInterface to ServerHandler (not perfect, but better than before)
2024-04-07 14:19:57 +03:00
Ivan Savenko
0a80c6c27b
Merge pull request #3722 from IvanSavenko/stabilization
Fixes for recently reported crashes
2024-04-07 14:07:56 +03:00
Ivan Savenko
4bef4d9277
Merge pull request #3718 from IvanSavenko/lobby_tweaks_3
Few more tweaks for new lobby
2024-04-07 14:07:49 +03:00
Ivan Savenko
2d9e42b623 Do not attempt to show extra options in campaign scenario information
screen
2024-04-06 15:59:08 +03:00
Andrii Danylchenko
c7b5d254d7 Fix castel interface closing by turn timer 2024-04-06 11:42:39 +03:00
Ivan Savenko
7c18c8b1da Add comment 2024-04-05 18:50:06 +03:00
Ivan Savenko
ee1aa4ed05 Fix overlaying UI elements when player has no account created 2024-04-05 18:50:06 +03:00