1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Commit Graph

15049 Commits

Author SHA1 Message Date
MnHebi
8b24b0e9a7 Add Marketplace, Blacksmith into extra buildings category to ensure they get built. Misc changes. 2024-01-26 00:56:36 +02:00
Laserlicht
7f58333ef9
quick combat vs ai 2024-01-25 23:44:41 +01:00
Laserlicht
c2c86ec278
fix 2024-01-25 21:11:42 +01:00
Laserlicht
3b9372c51c
Code review 2024-01-25 20:49:59 +01:00
Laserlicht
e434d5c0b7
Apply suggestions from code review
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-25 20:35:30 +01:00
MnHebi
4318b25399
Merge branch 'vcmi:develop' into develop 2024-01-25 21:27:06 +02:00
Ivan Savenko
891d25a634
Merge pull request #3552 from Laserlicht/video_button
video button
2024-01-25 16:31:24 +02:00
Ivan Savenko
2a193effcc Merge branch 'master' into 'develop' 2024-01-25 16:23:13 +02:00
MnHebi
a668dc2721 Try to improve VCAI building build order. Testing reveals extra structures still get done before intended build order(seen Market being built when Dwellings were expected). 2024-01-25 03:26:42 +02:00
Laserlicht
e3acb92863
codestyle 2024-01-24 20:32:39 +01:00
Ivan Savenko
3d2f69199a
Merge pull request #3558 from IvanSavenko/release_145
Release 1.4.5
2024-01-24 16:26:01 +02:00
Ivan Savenko
d69e0b23e8 Update changelog 2024-01-24 14:47:49 +02:00
Ivan Savenko
88e54685b3
Merge pull request #3547 from Alexander-Wilms/macos-cpack-workaround
Add second workaround for CPack issue on macOS
2024-01-24 13:48:49 +02:00
Tomasz Zieliński
a2e0742ffb Fix invalid logic which made AI not attack guards 2024-01-24 13:45:05 +02:00
Ivan Savenko
2f5bf64340 Do not crash on attempt to load campaign with unsupported maps 2024-01-24 13:44:22 +02:00
Ivan Savenko
702fc8077d Fix possible crash on invalid spell 2024-01-24 13:43:35 +02:00
Ivan Savenko
b7662c5ec6 Android build ID bump 2024-01-24 13:43:16 +02:00
Ivan Savenko
0287d8d51f
Merge pull request #3554 from vcmi/fix_ignore_guards
Fix invalid logic which made AI not attack guards
2024-01-24 13:43:02 +02:00
Tomasz Zieliński
dbf53d78ba Fix invalid logic which made AI not attack guards 2024-01-24 06:20:46 +01:00
Laserlicht
8870547d02
simplyfied 2024-01-24 01:23:35 +01:00
Laserlicht
e59078320c
format fix 2024-01-24 01:22:34 +01:00
Laserlicht
134eaa1583
sync subtitle 2024-01-24 01:17:23 +01:00
Laserlicht
56db0e06cf
fix render artefacts remaining after video playback 2024-01-24 00:04:56 +01:00
Laserlicht
0df4f9bda5
video button 2024-01-23 23:45:31 +01:00
Alexander Wilms
1975a08a3c Retry cpack until it succeeds 2024-01-23 14:13:35 +00:00
Ivan Savenko
46c4f39eb8
Merge pull request #3546 from IvanSavenko/fix_freeze_on_start
Fix freeze on map start
2024-01-23 15:07:20 +02:00
Alexander Wilms
d937d26b80 CPack isn't used for iOS builds, so only kill XProtect if we're building for macOS
Also wait at most 10 s for XProtect to be killed
2024-01-23 12:45:49 +00:00
Ivan Savenko
aff9fddd03 Version bump to 1.4.5 2024-01-23 13:56:28 +02:00
Asirome
183612d32b Updated spanish.ts translation 2024-01-23 13:48:51 +02:00
godric3
ccc8d28043 Fix inspector using wrong editor for some values 2024-01-23 13:45:47 +02:00
Tomasz Zieliński
5836e390f1 Do not place zone guards adjacent to 3rd zone 2024-01-23 13:45:35 +02:00
Ivan Savenko
634b90169d
Merge pull request #3549 from macomarivas/develop
Updated Spanish translation
2024-01-23 13:39:45 +02:00
Ivan Savenko
a1126c2c68
Merge pull request #3541 from godric3/map-editor-inspector-edit-fix
Fix inspector randomly using wrong editor(delegate) for some fields
2024-01-23 13:39:23 +02:00
Ivan Savenko
b51e58cddc
Merge pull request #3544 from vcmi/fix_leaky_connections
Do not place zone guards adjacent to 3rd zone
2024-01-23 13:39:11 +02:00
Ivan Savenko
be47c66c57 Ignore hidden mods when checking mod dependencies 2024-01-23 12:57:38 +02:00
Asirome
e9c84e5b1e
Merge pull request #3 from macomarivas/updated-spanish-translation
Updated spanish.ts translation
2024-01-23 11:12:33 +01:00
Asirome
334020b077
Updated spanish.ts translation 2024-01-23 11:11:35 +01:00
Alexander Wilms
81c3339199 Add second workaround for CPack issue on macOS 2024-01-22 23:25:23 +00:00
Ivan Savenko
f83a004b54 Added workaround to prevent multithreaded access to bonus system in RMG 2024-01-23 00:49:18 +02:00
Ivan Savenko
ea439ad175 Dispatch text input SDL calls in main thread on all platforms 2024-01-22 22:19:52 +02:00
Laserlicht
7d1553bc29
fix build 2024-01-22 20:56:35 +01:00
Ivan Savenko
6a42494b12 Merge CKeyboardFocusListener and IFocusListener into CFocusable 2024-01-22 21:48:03 +02:00
Laserlicht
7857673ca9
missing bracket 2024-01-22 20:22:15 +01:00
Laserlicht
9b2908d464
Apply suggestions from code review
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-22 20:19:49 +01:00
Ivan Savenko
284273379e
Merge pull request #3536 from IvanSavenko/serialization_refactor
Refactoring of serialization versioning handling
2024-01-22 19:49:24 +02:00
Tomasz Zieliński
b3adb9e554 Do not place zone guards adjacent to 3rd zone 2024-01-22 09:27:30 +01:00
godric3
dd004f0f6e Fix inspector using wrong editor for some values 2024-01-21 21:07:06 +01:00
Laserlicht
0a4b5dbe10
code review 2024-01-21 18:12:46 +01:00
Andrii Danylchenko
bf54a6a7d3
Merge pull request #3537 from vcmi/nkai-fix-pathfinder-commited-tiles
NKAI: avoid writing to commited tiles when calculating hero chain
2024-01-21 14:51:33 +02:00
Andrii Danylchenko
33f8f6dc53
Merge pull request #3409 from vcmi/fix-headless
Fix headless
2024-01-21 14:51:10 +02:00