1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

15213 Commits

Author SHA1 Message Date
Ivan Savenko
f14aec5876 Trim cheats so 'vcmiartifacts ' will be recognized as single-word cheat 2024-04-09 17:08:24 +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
738fe0b04e
Merge pull request #3733 from altiereslima/develop
VCMI Portuguese Brazilian
2024-04-09 14:58:40 +03:00
Ivan Savenko
ede69ca58b
Merge pull request #3726 from IvanSavenko/fix_summon
Block spellcasting if 0 creatures will be raised
2024-04-09 13:44:51 +03:00
Ivan Savenko
eddd854951
Merge pull request #3715 from Alexander-Wilms/deprecated-boost-header
Disable warnings about boost including deprecated headers internally
2024-04-09 12:48:47 +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
altiereslima
2c29c15d18 Update portuguese.json 2024-04-08 21:46:47 -03:00
SoundSSGood
39a0e56169 suggested changes 2024-04-08 14:57:58 +03:00
altiereslima
85f7d64e01 Update portuguese.json 2024-04-07 15:44:16 -03:00
altiereslima
0321867e94 Create portuguese.ts 2024-04-07 15:44:10 -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
altiereslima
2d4be97b6a Update portuguese.json 2024-04-07 14:55:31 -03:00
altiereslima
d29b2f098f Update portuguese.ts 2024-04-07 14:55:25 -03:00
altiereslima
a4bbdb2b4d Update portuguese.ts 2024-04-07 14:36:24 -03:00
altiereslima
b960a992fd Update mod.json 2024-04-07 14:17:30 -03:00
altiereslima
b5f86caefc Create portuguese.json 2024-04-07 14:17:24 -03:00
altiereslima
437ff290e2 Update CMakeLists.txt 2024-04-07 14:17:19 -03:00
altiereslima
5b012c009b Update CMakeLists.txt 2024-04-07 14:17:14 -03:00
Ivan Savenko
5dcef193a3 Block spellcasting if 0 creatures will be raised 2024-04-07 18:50:37 +03:00
altiereslima
5f3bd2963e VCMI Portuguese Brazilian 2024-04-07 11:55:56 -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
8a98de8275
Merge pull request #3723 from thiscris/develop
Small wiki update
2024-04-07 10:46:45 +03:00
Alexander Wilms
ef417a0db0 Disable warnings about boost 1.7.4 including deprecated headers internally 2024-04-06 14:59:24 +00:00
thiscris
9bbcb4cf5c Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2024-04-06 15:44:47 +02:00
thiscris
94dd38539b updated minimal mod.json example 2024-04-06 15:44:31 +02:00
Ivan Savenko
03786fb63b VCAI will now check whether it actually has enough gold to buy a hero 2024-04-06 15:59:08 +03:00
Ivan Savenko
907438c6f5 Fix crash on attempt to compute movement range for siege tower 2024-04-06 15:59:08 +03:00
Ivan Savenko
2685721bf2 Erdamon now increases both min and max damage, as in H3 2024-04-06 15:59:08 +03:00
Ivan Savenko
1a6aae9363 Fix crash on selecting scenario with "start with strongest hero from
scenario X" starting bonus
2024-04-06 15:59:08 +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
1d453a0c9d
Merge pull request #3719 from vcmi/fix-castle-int-closing-by-turntimer
Fix castel interface closing by turn timer
2024-04-06 15:58:54 +03:00
Andrii Danylchenko
59b756b10c
Merge pull request #3720 from vcmi/fix-3691
#3691 - boat attached to hero should not block tiles on its own
2024-04-06 15:58:30 +03:00
Andrii Danylchenko
8efceb110b #3691 - boat attached to hero should not block tiles on its own 2024-04-06 12:30:19 +03:00
Andrii Danylchenko
c7b5d254d7 Fix castel interface closing by turn timer 2024-04-06 11:42:39 +03:00
DjWarmonger
5c40aa8612
Merge pull request #3711 from vcmi/reindex_objects
Reindex objects to show interactive objects on top
2024-04-05 19:43:40 +02:00
Ivan Savenko
2c5e6974dc Do not allow creation of accounts with same name and different case 2024-04-05 18:50:06 +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
Ivan Savenko
651908d7aa Do not attempt to translate usernames 2024-04-05 18:50:06 +03:00
Ivan Savenko
fa31e9f69b Do not mark channel as unread when receiving chat history 2024-04-05 18:50:06 +03:00
Laserlicht
ff866bdfce
scalingMode to config 2024-04-04 21:10:49 +02:00
Tomasz Zieliński
8ed940d538 cleanup 2024-04-03 22:24:19 +02:00
Tomasz Zieliński
9f048888dd Restore previous removeObject 2024-04-03 22:17:36 +02:00
Tomasz Zieliński
12da0196a0 Restrict reindexing to random maps 2024-04-03 20:05:35 +02:00
Tomasz Zieliński
2a213f2276 Reindex objects to show interactive objects on top 2024-04-03 14:48:04 +02:00
DjWarmonger
c2f160326c
Merge pull request #3708 from vcmi/dydzio0614-patch-1
Update year
2024-04-02 20:35:49 +02:00