1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

13259 Commits

Author SHA1 Message Date
Ivan Savenko
c8a96647c3 Add turn limit option to pathfinder 2023-09-26 13:42:20 +03:00
Ivan Savenko
56074e18a9 Block turn end button after player ends turn 2023-09-26 13:42:20 +03:00
Ivan Savenko
64c43c91dc Added hardcoded min/max simturns duration 2023-09-26 13:42:20 +03:00
Ivan Savenko
64c82c9133 Fixed UI locking in simturns 2023-09-26 13:42:20 +03:00
Ivan Savenko
b2f30f78fa Allow one AI and human to act simultaneously 2023-09-26 13:42:20 +03:00
Laserlicht
02c82cb35b
order 2023-09-26 12:01:16 +02:00
Laserlicht
ab55615359
remove double code 2023-09-26 10:28:10 +02:00
Laserlicht
6b5f6030e2
header 2023-09-25 23:02:16 +02:00
Laserlicht
096036dc9f
spell icon 2023-09-25 22:58:59 +02:00
Andreas Grois
6225d8585d Make ERM compile again.
This is not a proper clean up. It does not bring the code up to the
current state of the rest of the codebase. However, the module now
compiles again.
2023-09-25 21:26:23 +02:00
Laserlicht
c3373ea34c
code review 2023-09-25 18:06:40 +02:00
Laserlicht
7cf654992f
code review 2023-09-25 16:34:36 +02:00
Laserlicht
5061792cce
enableUiEnhancements button 2023-09-25 13:11:08 +02:00
Ivan Savenko
b89fa254fc
Merge pull request #2921 from vdhan/develop
add Vietnamese
2023-09-25 12:34:00 +03:00
Ivan Savenko
e8fdf46a29
Merge pull request #2939 from utzuro/develop
fix some ukrainian strings in the android launcher
2023-09-25 11:40:31 +03:00
Laserlicht
28f4046937
ready 2023-09-25 01:04:06 +02:00
Laserlicht
3e4a5b7d80
border and variable 2023-09-25 00:31:32 +02:00
Laserlicht
a6b68be2df
offsets 2023-09-24 23:50:50 +02:00
Nordsoft91
9042778bcb
Merge pull request #2937 from Nordsoft91/lobby
[!] Fix issue with impossible room ready status
2023-09-24 23:37:39 +02:00
nordsoft
2a3e371caf Remove any modification of enabled mods during game loading 2023-09-24 23:34:46 +02:00
Laserlicht
8b5c9db21b
basic offset 2023-09-24 23:15:09 +02:00
Laserlicht
240d291de9
big spellbook 2023-09-24 22:24:51 +02:00
An Vu
b8eba01b7d add Launcher and Map Editor 2023-09-24 21:09:09 +07:00
utzuro
240151374d fix word in the translation 2023-09-24 22:44:35 +09:00
utzuro
96907590ba fix translation word 2023-09-24 22:41:43 +09:00
utzuro
9e71a0c495 add small translation fixes 2023-09-24 22:39:40 +09:00
utzuro
7764dac386 fix some ukrainian strings in the android launcher 2023-09-24 22:22:14 +09:00
Laserlicht
e93a04409e Revert "another approach"
This reverts commit 2f64457a9a.
2023-09-24 15:02:59 +02:00
Nordsoft91
ed2e5c6fd2
Merge pull request #2934 from Laserlicht/hotseat_hide 2023-09-24 14:12:19 +02:00
Laserlicht
2f64457a9a
another approach 2023-09-24 12:54:35 +02:00
Laserlicht
72e4941982
dimlevel as class variable 2023-09-24 12:08:27 +02:00
Ivan Savenko
ad4c92b6e1
Merge pull request #2936 from Laserlicht/json_fix
[fix] no invalid json
2023-09-24 11:30:49 +03:00
nordsoft
c73c9d773c Fix issue with impossible room ready status 2023-09-24 03:15:10 +02:00
Laserlicht
68e536c290
code review 2023-09-24 02:00:42 +02:00
Laserlicht
fccecf023b
no invalid json 2023-09-24 01:30:03 +02:00
Laserlicht
b143c2786f
use dimming to hide screen 2023-09-24 00:58:48 +02:00
Laserlicht
e69b91fbdd
fix layer problem 2023-09-23 23:44:12 +02:00
Laserlicht
41b03e7c5b
fixed some edge cases 2023-09-23 23:11:17 +02:00
Laserlicht
96df11a6f2
always show actual entry 2023-09-23 22:45:38 +02:00
Laserlicht
8a0565eb9b
use vector 2023-09-23 22:15:05 +02:00
Laserlicht
f3e1943aaf
Merge branch 'develop' into highscore_menu 2023-09-23 21:38:17 +02:00
Laserlicht
c49d38b855
cheats + grail in town 2023-09-23 21:37:40 +02:00
Laserlicht
6f8b62d77d
codereview 2023-09-23 20:41:30 +02:00
Laserlicht
a4769782c5
correct format 2023-09-23 19:01:18 +02:00
Laserlicht
09cf8376db
date is already with time 2023-09-23 18:58:32 +02:00
Nordsoft91
1f2ca138dd
Merge pull request #2919 from Nordsoft91/fix-2893 2023-09-23 18:02:33 +02:00
Laserlicht
006431c898
fix 2023-09-23 17:50:42 +02:00
Laserlicht
63b91f7b87
imports 2023-09-23 17:41:36 +02:00
Laserlicht
455ead7b4a
fix datetime format (android) 2023-09-23 17:27:00 +02:00
Laserlicht
ca96749c45
workaround for missing video 2023-09-23 16:28:28 +02:00