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

15662 Commits

Author SHA1 Message Date
Dydzio
f20ef4f1b3 Fix hero order for giving bonuses in town to match H3. 2024-05-11 20:21:02 +02:00
Ivan Savenko
fc4196e71c
Merge pull request #3943 from vcmi/master
Merge master -> beta
2024-05-11 18:48:42 +03:00
Ivan Savenko
2f4da1f124
Merge pull request #3929 from IvanSavenko/stabilization
[1.5.1] Stabilization
2024-05-11 17:31:23 +03:00
Ivan Savenko
147db10a28 Avoid crash if configs file is missing, e.g. broken version of mod 2024-05-11 13:19:07 +00:00
Ivan Savenko
87e4756f6d Fix crash on hiding empty map/save list 2024-05-11 13:19:07 +00:00
Ivan Savenko
1bc7c29111 Add workaround for visiting Altar of Sacrifice on 1.4 saves 2024-05-11 13:19:07 +00:00
Ivan Savenko
16f43254b5 Use async_resolve to avoid crash on resolve error 2024-05-11 13:19:07 +00:00
Ivan Savenko
a74d9791a1 Remove indirect calls to CSH from server handler itself 2024-05-11 13:19:07 +00:00
Ivan Savenko
46f2b8b2d7 Attempt to fix weird crash on game start 2024-05-11 13:19:07 +00:00
Ivan Savenko
31401e219f Fix possible crash on nullptr dereference 2024-05-11 13:19:07 +00:00
Ivan Savenko
26b76db6e7
Merge pull request #3922 from IvanSavenko/version_bump_151
Version bump to 1.5.1
2024-05-11 16:17:48 +03:00
Ivan Savenko
2a648ab63b Version bump to 1.5.1 2024-05-10 11:14:36 +00:00
Ivan Savenko
d72afb1acc
Merge pull request #3916 from vcmi/beta
Merge beta -> master
2024-05-09 11:25:27 +03:00
Ivan Savenko
119c9a8fb4
Merge pull request #3915 from IvanSavenko/translation_cherrypick
Translation cherrypick
2024-05-09 10:35:16 +03:00
altiereslima
b35b493b56 Update portuguese.ts 2024-05-09 07:32:07 +00:00
altiereslima
1486b0f9e6 Update Portuguese translation 2024-05-09 07:31:58 +00:00
Ivan Savenko
d4c953e012
Merge pull request #3883 from IvanSavenko/release_150
Preparation for 1.5.0 release
2024-05-09 10:29:38 +03:00
DjWarmonger
8e04608dd2
Merge pull request #3913 from dydzio0614/polish-qt-translations
Update polish translations
2024-05-09 07:49:56 +02:00
Dydzio
9ba4667821 Update polish translations 2024-05-09 00:01:29 +02:00
Ivan Savenko
eab4cf946d
Merge pull request #3912 from IvanSavenko/fix_template_selection
[1.5.0] Slightly better randomization of map template
2024-05-08 22:43:39 +03:00
Ivan Savenko
b4af84a3ce
Merge pull request #3911 from vcmi/penrose_cleanup
Clean up excessive operations and logs
2024-05-08 22:43:28 +03:00
Ivan Savenko
880f692762 Slightly better randomization of map template 2024-05-08 17:11:14 +00:00
Tomasz Zieliński
2297e09fcb Clean up excessive operations and logs 2024-05-08 15:51:42 +02:00
Ivan Savenko
718d42f0d6
Merge pull request #3910 from vcmi/center_penrose
Shift center of tiling to center of the map
2024-05-08 16:40:00 +03:00
Ivan Savenko
72703f89fe
Merge pull request #3909 from IvanSavenko/clean_rmg_crash
Disable 'catch everything' block in RMG in favor of clean crash
2024-05-08 16:39:52 +03:00
kdmcser
c96216ec68 update Chinese translation 2024-05-08 13:38:13 +00:00
Ivan Savenko
a7b34d90de Added Ukrainian translation to metainfo 2024-05-08 13:38:13 +00:00
Łukasz Zając
9b79f40871 Added pvp options 2024-05-08 13:38:13 +00:00
Łukasz Zając
ba2f23a67e Update polish.json 2024-05-08 13:38:13 +00:00
Łukasz Zając
e297ae891b Updated polish.json
Added new stuff + minor changes to old ones.
2024-05-08 13:38:13 +00:00
Ivan Savenko
dac27102fd Update changelog to account for recent changes 2024-05-08 13:38:04 +00:00
Ivan Savenko
c9bdd71398 Update release docs 2024-05-08 13:37:24 +00:00
Ivan Savenko
413669ae42 Set 1.5 release date to May, 10th 2024-05-08 13:37:24 +00:00
Ivan Savenko
5fdbcaa801 Bump mod repo on Android to 1.5. Hopefully last time. 2024-05-08 13:37:24 +00:00
Tomasz Zieliński
37d062f1eb Fix incorrect comparison operator 2024-05-08 15:09:11 +02:00
Tomasz Zieliński
eece03d24f Fix for centering the tiles, extra logs 2024-05-08 13:16:26 +02:00
Ivan Savenko
bfcb766d87
Merge pull request #3908 from IvanSavenko/fix_monolith_visit
Do not check for guards when teleporting using means other than DD
2024-05-08 13:51:11 +03:00
Tomasz Zieliński
ec20e9e907 Shift center of tiling to center of the map 2024-05-08 12:16:42 +02:00
Ivan Savenko
f5824ccea4 Re-throw exception on RMG failure to prevent weird crashes later 2024-05-08 09:55:34 +00:00
Ivan Savenko
8b861fc58f Do not check for guards when teleporting using means other than DD 2024-05-07 20:05:23 +00:00
Ivan Savenko
6a1477838d
Merge pull request #3905 from IvanSavenko/fix_shortcuts
[1.5.0] Fix keyboard shortcuts
2024-05-07 16:42:41 +03:00
Ivan Savenko
4769c86c82
Merge pull request #3902 from vcmi/underground_biomes
Option to define surface or underground level for obstacle set
2024-05-07 16:42:33 +03:00
Ivan Savenko
3e5e120c85
Merge pull request #3904 from IvanSavenko/fix_freeze
[1.5.0] Fix freeze
2024-05-07 12:20:25 +03:00
Ivan Savenko
ffc207888b Added option to configure key modifiers (Alt, Shift, Ctrl). Fixes lobby
hotkey activation.
2024-05-07 08:58:45 +00:00
Ivan Savenko
66e2e13ba1 Add few more safety checks to network connection logic 2024-05-07 08:34:47 +00:00
Ivan Savenko
ede92c1a9c Revert "Simple implementation of heartbeat package"
This reverts commit 5f344e410a.
2024-05-07 08:31:08 +00:00
Tomasz Zieliński
9763ea2ecb Style 2024-05-07 09:14:16 +02:00
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
Let's try this
2024-05-07 09:05:14 +02:00
Tomasz Zieliński
dd55188b77 Option to define surface or underground level for obstacle set 2024-05-07 07:15:00 +02:00
Ivan Savenko
66f1f48d4c
Merge pull request #3867 from IvanSavenko/heartbeat
Simple implementation of heartbeat package
2024-05-06 22:35:58 +03:00