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

296 Commits

Author SHA1 Message Date
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Laserlicht
9cf274362e
small folder optimation 2023-09-12 20:28:54 +02:00
Ivan Savenko
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
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Michael
287c0daaff add also savegame 2023-09-06 12:34:31 +03:00
Michael
36ab973dc8 fix difficulty widget 2023-09-06 12:34:23 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
e2b5ff13f1
Merge pull request #2746 from wb180/teamsPopup
Show only non-empty teams in teams popup
2023-09-03 22:23:32 +03:00
Nordsoft91
2eaed0c983
Merge pull request #2743 from Laserlicht/fix_difficulty_widget
[fix] difficulty widget
2023-09-03 17:57:43 +04:00
Evgeniy Meshcheryakov
b6e2c454c0 Show only non-empty teams in teams popup 2023-09-03 08:05:02 +03:00
Michael
53277306cd
add also savegame 2023-09-02 20:39:16 +02:00
Michael
3d08518dac
fix difficulty widget 2023-09-02 19:37:56 +02:00
Michael
e0460a0dec
up should be first 2023-09-02 19:04:06 +02:00
Michael
b6000841f1
code review 2023-08-29 21:08:18 +02:00
Michael
196cd41e35
fix multiplayer 2023-08-29 02:04:32 +02:00
Michael
44ece25042
disable unavailable heroes 2023-08-29 00:14:49 +02:00
nordsoft
49a76ac14c Code review tweaks 2023-08-28 17:21:38 +04:00
nordsoft
de8bd48398 Added right click pop-up for text inputs 2023-08-28 17:21:38 +04:00
nordsoft
fdaf05514a Correct network data exchange and time parsing 2023-08-28 17:10:52 +04:00
nordsoft
1e527a6942 Minor changes 2023-08-28 17:10:52 +04:00
nordsoft
86e0ea15fb Fix turn timer settings 2023-08-28 17:10:52 +04:00
nordsoft
d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
nordsoft
c064b805c2 Refactor combo box 2023-08-28 17:10:52 +04:00
Ivan Savenko
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Ivan Savenko
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
Ivan Savenko
0240ee886d Converted (almost) all namespace enum's to enum classes 2023-08-25 13:38:02 +03:00
Ivan Savenko
ec8d31bbfc First step at unifying game identifiers code 2023-08-25 13:38:01 +03:00
nordsoft
b8ab64f448 Make options tab configurable 2023-08-23 19:29:50 +04:00
Nordsoft91
e09b13c00a
Merge pull request #2576 from Nordsoft91/turn-timer
Implement turn timer feature
2023-08-23 01:48:12 +04:00
nordsoft
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
Michael
0dab3b83a0
date alignment 2023-08-21 20:45:00 +02:00
Nordsoft91
4edee00a97
Merge pull request #2605 from Laserlicht/map_preview
Map preview
2023-08-21 14:56:21 +04:00
Michael
05a88bd8ac
another try... 2023-08-20 23:34:09 +02:00
Michael
080630b39f
try to fix 2023-08-20 22:22:46 +02:00
Michael
5c5576313b
handle long texts better; big window also for only one layer 2023-08-20 16:58:13 +02:00
Nordsoft91
ef4fddd0c4
Merge pull request #2570 from Laserlicht/town_selection_window
Town selection window
2023-08-20 17:37:45 +04:00
Michael
952ce3061b
avoid crash if any error in map 2023-08-20 14:28:10 +02:00
Michael
e3a4c65100
code review 2023-08-20 14:14:47 +02:00
Michael
1d94536299
code review 2023-08-20 13:16:39 +02:00
Michael
52ed824100
add sound; possibility to click outside to close 2023-08-20 13:05:25 +02:00
Nordsoft91
4a6deedd5e
Merge pull request #2530 from Nordsoft91/tutorial
Support tutorial
2023-08-19 18:06:15 +04:00
Michael
8635c24166
fix 2023-08-18 00:15:47 +02:00
Michael
f9fa27b180
fix 2023-08-17 23:40:19 +02:00
Michael
e44f713f01
side by side map; player colors 2023-08-17 23:09:20 +02:00
Michael
af347242b4
fix compile error 2023-08-17 20:34:31 +02:00
Michael
ac64b9f2b5
fix 2023-08-17 18:52:00 +02:00