1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-27 12:22:45 +02:00

12386 Commits

Author SHA1 Message Date
Michael
ac64b9f2b5
fix 2023-08-17 18:52:00 +02:00
Michael
077ec65bf6
simplify 2023-08-17 18:15:42 +02:00
Michael
e61dc2ec23
constants 2023-08-17 17:54:53 +02:00
Michael
e1e16018d1
code review first batch 2023-08-17 17:29:31 +02:00
Ivan Savenko
daa8a494fc Merge branch 'release_131' into master 1.3.1 2023-08-17 16:19:20 +03:00
Ivan Savenko
ec0a51bd5c Fixed border scrolling when game window is maximized 2023-08-17 12:25:02 +03:00
Michael
edc11fd451
Map preview initial draft 2023-08-17 09:56:50 +02:00
Ivan Savenko
8b8d2b8810 Updated changelog 2023-08-17 10:26:01 +03:00
Ivan Savenko
6e7b7932a0 Fixed recruitment of hero from towns located on map border 2023-08-17 10:26:01 +03:00
Ivan Savenko
bfa12080ac Added downloads counter for 1.3.1 2023-08-17 10:26:01 +03:00
Ivan Savenko
074fd42d84 Added missing includes 2023-08-17 10:26:01 +03:00
Ivan Savenko
9509974a5d Updated changelog 2023-08-17 10:26:01 +03:00
Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders 2023-08-17 10:09:37 +04:00
Michael
71bcc611f5
review 2023-08-15 20:19:13 +02:00
Ivan Savenko
198556409c
Merge pull request #2593 from IvanSavenko/hotfix
Final crashfixes for 1.3.1
2023-08-15 16:17:50 +03:00
Ivan Savenko
3aead5f32f Android build ID bump 2023-08-15 15:06:33 +03:00
Ivan Savenko
8b628221ec Fix possible thread race on accessing GuiHandler from server handler
thread without acquiring lock
2023-08-15 00:38:03 +03:00
Ivan Savenko
00ac8eb306 Attempt to fix crash on quitApplication on Android 2023-08-15 00:17:59 +03:00
Michael
0452dbd80d
remove copy of cropped asset 2023-08-14 23:08:20 +02:00
Ivan Savenko
ef0cd0ba6e Fixed mod dependencies check on save loading to prevent crashes:
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
Michael
b2c8cab9f1
use playerColored 2023-08-14 22:22:43 +02:00
Andrii Danylchenko
6c025fd768
Merge pull request #2572 from vcmi/nkai-fix-heroes-not-recruiting
Nkai fix heroes not recruiting
2023-08-14 21:40:53 +03:00
krs
5207ba7e00 Removed WoG artifacts from core. Replaced with unused to avoid crashes. 2023-08-14 15:06:48 +03:00
Michael
079e8ba1ba
naming 2023-08-14 00:40:12 +02:00
Michael
7bfbfeb48f
missing 2023-08-14 00:16:53 +02:00
Michael
bb5ada3bb3
not from this PR 2023-08-14 00:10:06 +02:00
Michael
1d76f456ad
change servercode to make it more robust 2023-08-14 00:08:48 +02:00
Michael
ae63088564
outline; squared 2023-08-13 22:58:49 +02:00
Michael
9a63161866
added random; added names 2023-08-13 20:21:09 +02:00
Michael
e66a41e90b
simplify 2023-08-13 19:23:27 +02:00
Michael
c14448ee32
change design 2023-08-13 15:09:48 +02:00
Andrii Danylchenko
a7859dae39 Battle AI: archangels cast again 2023-08-13 09:08:30 +03:00
Andrii Danylchenko
1eabb738dc NKAI: fix heroes not recruited 2023-08-13 09:08:30 +03:00
Ivan Savenko
abf7c48593
Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race
Fix crash on video playback (and who knows how many more)
2023-08-13 00:45:24 +03:00
Michael
daa8bc547f
icon fix 2023-08-12 23:28:53 +02:00
Michael
f71f4a874b
Grid and Activaed 2023-08-12 22:59:45 +02:00
Michael
b73f9d6e30
calculate size 2023-08-12 21:50:40 +02:00
Michael
18b963f376
fix 2023-08-12 20:31:00 +02:00
Michael
3d08ecf024
rename 2023-08-12 20:02:36 +02:00
Michael
92159e57ef
Update SelectionTab.cpp
fix possible -1
2023-08-12 19:51:18 +02:00
Michael
8bb7fd31cd
basically running... 2023-08-12 19:33:25 +02:00
Michael
481cd89dc8
drawing 2023-08-12 18:20:44 +02:00
Michael
c40c747ccf
saving states 2023-08-12 17:46:35 +02:00
Michael
876dc28e48
rework 2023-08-12 16:49:42 +02:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
Ivan Savenko
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +03:00
Michael
bc4d331888
Title 2023-08-12 15:19:40 +02:00
Michael
0c4f4daf70
base rendering 2023-08-12 15:05:26 +02:00
Michael
b4f6c7abab
big images; basic heroes support 2023-08-12 13:19:58 +02:00
Ivan Savenko
626664b8f6 Fix possible thread race on accessing GuiHandler from server handler
thread without acquiring lock
2023-08-12 14:16:47 +03:00