1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Commit Graph

281 Commits

Author SHA1 Message Date
c803b57c33 Merge pull request #2889 from Nordsoft91/mod-compatibility-check
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
056cba55a8 Show loading screen immediately on restart 2023-09-26 15:45:46 +02:00
5b21a5ffbc Simturn duration is now part of StartInfo 2023-09-26 13:42:20 +03:00
c3373ea34c code review 2023-09-25 18:06:40 +02:00
6f8b62d77d codereview 2023-09-23 20:41:30 +02:00
e3edcb6cd8 rmb; bugfix; tabs 2023-09-23 14:51:39 +02:00
d2398b804a implement adding 2023-09-23 13:14:45 +02:00
e18a4a09a9 forward declaration 2023-09-23 02:14:45 +02:00
d3f007453d win screen ready 2023-09-23 01:36:01 +02:00
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
1a0f5cf159 calc preperation 2023-09-23 00:21:36 +02:00
30c6cf3b98 video & audio correction; win/lose 2023-09-22 21:45:12 +02:00
a4cb74f0dc highscore input window 2023-09-22 20:39:20 +02:00
9e78f9c69c CodeReview 2023-09-21 23:41:00 +02:00
4691907f9c Show root mods only 2023-09-21 22:28:29 +02:00
5fd2eee3e8 code review 2023-09-21 21:27:06 +02:00
a05f8339ae Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
48231f5f4f save results only if from set 2023-09-20 22:28:45 +02:00
dfb5ccbeaf add persistent storage & completed campaign support 2023-09-20 22:18:53 +02:00
52b86eb9c1 get back to campaignmenu 2023-09-20 21:18:13 +02:00
34182069f5 campaignset 2023-09-20 03:13:54 +02:00
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
538665fe42 Fix "Start game" blocking status:
- Start game is now initially blocked
- Receiving valid startInfo from server will unlock button
2023-09-12 21:15:15 +03:00
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
a44c08a847 Slightly better thread names 2023-08-23 16:32:29 +03:00
0613756abc Remove unused code 2023-08-23 16:32:29 +03:00
44d16b32fe Use API identical to std classes where possible 2023-08-23 16:32:29 +03:00
142889e3a5 Give all threads created by client human-readable name for debug 2023-08-23 16:32:29 +03:00
d50edc28ab Merge remote-tracking branch 'upstream/develop' into turn-timer
# Conflicts:
#	server/CGameHandler.cpp
#	server/CGameHandler.h
2023-08-22 00:54:38 +04:00
ef4fddd0c4 Merge pull request #2570 from Laserlicht/town_selection_window
Town selection window
2023-08-20 17:37:45 +04:00
4a6deedd5e Merge pull request #2530 from Nordsoft91/tutorial
Support tutorial
2023-08-19 18:06:15 +04:00
d0b3319f6a Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-18 15:08:23 +03:00
e1e16018d1 code review first batch 2023-08-17 17:29:31 +02:00
074fd42d84 Added missing includes 2023-08-17 10:26:01 +03:00
3c9c302fd2 TurnTimerInfo 2023-08-14 02:16:25 +04:00
bb5ada3bb3 not from this PR 2023-08-14 00:10:06 +02:00
1d76f456ad change servercode to make it more robust 2023-08-14 00:08:48 +02:00
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
626664b8f6 Fix possible thread race on accessing GuiHandler from server handler
thread without acquiring lock
2023-08-12 14:16:47 +03:00
70d04ad957 Replace thread approach with callback based 2023-08-11 20:04:14 +04:00
f4869cbfb0 Tutorial load game mode 2023-08-09 15:29:48 +04:00
c524caee5c Fixed possible uncaught exception on starting map 2023-08-06 17:46:49 +03:00
7f72f7a82c Cleanup server connection code a bit 2023-07-30 20:15:32 +03:00
593b82d178 Removed all references to boost::interprocess library 2023-07-30 20:14:57 +03:00
21e794268b Attempt to fix & improve error detection:
- use std::fstream instead of boost::iostreams for properly working flush
- removed some catch-all blocks
- reduce catch scope of some try/catch blocks to clearly indicate intent
2023-07-24 18:48:56 +03:00
cefbe5152e Merge pull request #2359 from IvanSavenko/crashfixing
Fix crashes from 1.2.1 statistics on Google Play
2023-07-21 15:44:37 +03:00
9168a1150f Remove catch-all that only blocks debugging (and Google Play reports) 2023-07-18 17:31:21 +03:00
8750aa2c5b Merged server savegame and (broken and unused) client savegame files 2023-07-09 15:30:47 +03:00
88566cb1ef Fix another unprotected UI access 2023-06-26 22:14:21 +03:00