1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Commit Graph

13179 Commits

Author SHA1 Message Date
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
Laserlicht
06895e6733 fine tuning 2023-09-23 15:11:48 +02:00
Laserlicht
e3edcb6cd8 rmb; bugfix; tabs 2023-09-23 14:51:39 +02:00
Laserlicht
d2398b804a implement adding 2023-09-23 13:14:45 +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
Laserlicht
e18a4a09a9 forward declaration 2023-09-23 02:14:45 +02:00
Laserlicht
049f90159d highlight preparation 2023-09-23 01:53:45 +02:00
Laserlicht
d3f007453d win screen ready 2023-09-23 01:36:01 +02:00
nordsoft
61141a0406 Fix gcc compiling 2023-09-23 01:10:45 +02:00
Laserlicht
901a33bf1d calculation 2023-09-23 01:03:15 +02:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Laserlicht
1a0f5cf159 calc preperation 2023-09-23 00:21:36 +02:00
Laserlicht
b0e5a11e62 fix win build 2023-09-22 22:09:01 +02:00
Laserlicht
30c6cf3b98 video & audio correction; win/lose 2023-09-22 21:45:12 +02:00
Laserlicht
a4cb74f0dc highscore input window 2023-09-22 20:39:20 +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
Laserlicht
fe0adfa4bd fix 2023-09-22 02:21:23 +02:00
Laserlicht
909b06f7c1 draw images 2023-09-22 02:19:31 +02:00
Laserlicht
92b0e2b400 initial highscore support 2023-09-22 01:39:35 +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