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

15245 Commits

Author SHA1 Message Date
Ivan Savenko
9188280d02 Fix access to CPrologEpilogVideo after destruction from sound callback 2024-04-11 13:25:54 +03:00
Ivan Savenko
c7fda0dc32 Add more debug checks for gcc 2024-04-11 13:25:48 +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
8cf3477b82
Merge pull request #3737 from IvanSavenko/trim_cheats
Trim cheats so 'vcmiartifacts ' will be recognized as single-word cheat
2024-04-10 11:11:32 +03:00
Dydzio
637270ee36 Minor fixes 2024-04-09 19:59:27 +02: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
8aaa9e63dd Fix build 2024-04-09 18:56:28 +03:00
Ivan Savenko
f14aec5876 Trim cheats so 'vcmiartifacts ' will be recognized as single-word cheat 2024-04-09 17:08:24 +03:00
Ivan Savenko
50e8d1fd82 Add save compatibility check 2024-04-09 16:42:20 +03:00
Ivan Savenko
42616cf4e8 Fix text formatting, fix todo's 2024-04-09 16:13:30 +03:00
Ivan Savenko
18ece6dcf6 Remove some usages of server-side translations 2024-04-09 16:13:30 +03:00
Ivan Savenko
7a42e21e4d Fix formatting of luck/morale bonuses 2024-04-09 16:13:30 +03:00
Ivan Savenko
9e49587749 Replace bonus string description with metastring that can properly
handle 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
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
Ivan Savenko
719b61bb9f Updated docs 2024-04-08 14:05:49 +03:00
Ivan Savenko
050157db9d Register vcmi-only strings as part of 'vcmi' mod instead of 'core' 2024-04-08 13:16:54 +03:00
Ivan Savenko
4947baebee Fix crash on loading vmap's 2024-04-08 13:16:34 +03:00
Ivan Savenko
8582bd7d66 Replaced 'convert txt' command with more convenient 'translate' and
'translate maps' commands.
2024-04-08 13:16:23 +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