1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

13106 Commits

Author SHA1 Message Date
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
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
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
Andrii Danylchenko
952c740c73
Merge pull request #2920 from Nordsoft91/nkai-fixes
Fix mistake in NKAI
2023-09-23 08:58:23 +03:00
An Vu
59e1ec3ae7 add vietnamese 2023-09-23 10:59:38 +07:00
nordsoft
5f2023c8d5 Fix typo 2023-09-23 04:33:08 +02:00
Nordsoft91
a36450e2d1
Merge pull request #2882 from Nordsoft91/ai-cheating
Add basic system to give more advantages for ai player
2023-09-23 03:21:19 +02:00
nordsoft
a5492b30c3 Add pre-battle message 2023-09-23 02:35:21 +02:00
nordsoft
61141a0406 Fix gcc compiling 2023-09-23 01:10:45 +02:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Ivan Savenko
455c13164e
Merge pull request #2886 from IvanSavenko/h3m_parser_fixes
H3m parser fixes
2023-09-22 18:53:51 +03:00
nordsoft
5b24fe289b Assembling difficulty json instead of overriding 2023-09-22 14:46:43 +02:00
nordsoft
2a2f0a657e Fix battle bonuses serialization 2023-09-22 13:34:00 +02:00
nordsoft
16b147d588 Fix negative spell cost 2023-09-22 01:12:10 +02:00
Nordsoft91
ec582328b4
Merge pull request #2887 from Laserlicht/campaign_improvement
campaign improvements
2023-09-22 01:01:59 +02:00
nordsoft
099109b7d2 Minor fixes 2023-09-22 00:52:19 +02:00
Laserlicht
9e78f9c69c
CodeReview 2023-09-21 23:41:00 +02:00
nordsoft
60eef59bc9 Show root mods for maps 2023-09-21 22:38:01 +02:00
nordsoft
4691907f9c Show root mods only 2023-09-21 22:28:29 +02:00
Laserlicht
530e4533ce
Update mainwindow_moc.cpp 2023-09-21 22:05:15 +02:00
Laserlicht
5fd2eee3e8
code review 2023-09-21 21:27:06 +02:00
nordsoft
a05f8339ae Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
Laserlicht
4d8414bd3d
unlock functionality 2023-09-20 23:06:32 +02:00
Laserlicht
48231f5f4f
save results only if from set 2023-09-20 22:28:45 +02:00
Nordsoft91
dc6144bffe
Merge pull request #2880 from Nordsoft91/fix-1787 2023-09-20 22:19:20 +02:00
Laserlicht
dfb5ccbeaf
add persistent storage & completed campaign support 2023-09-20 22:18:53 +02:00
Laserlicht
52b86eb9c1
get back to campaignmenu 2023-09-20 21:18:13 +02:00
Ivan Savenko
a9abd294da
Merge pull request #2876 from IvanSavenko/revisit_object_button_block
Block revisit object shortcut if no visit is possible
2023-09-20 22:09:36 +03:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
Ivan Savenko
3f35ed000c Fixed parsing of some user-made H3M maps 2023-09-20 22:00:03 +03:00
Ivan Savenko
02dfecd38b Fixed hota maps templates loading 2023-09-20 21:59:16 +03:00
Ivan Savenko
921569e02e Fixed "Long Live the King", 1st scenario victory condition 2023-09-20 21:58:47 +03:00
nordsoft
f8b8ab0965 Add documentation for difficulty.json 2023-09-20 16:35:28 +02:00
nordsoft
cb3bbc6680 Restructured difficulty config 2023-09-20 16:12:26 +02:00
Nordsoft91
5a8c3b5ae2
Merge pull request #2869 from Laserlicht/audio
disable audio on lost focus
2023-09-20 13:20:47 +02:00