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 |
|
Michael
|
077ec65bf6
|
simplify
|
2023-08-17 18:15:42 +02:00 |
|
Michael
|
e61dc2ec23
|
constants
|
2023-08-17 17:54:53 +02:00 |
|
Michael
|
e1e16018d1
|
code review first batch
|
2023-08-17 17:29:31 +02:00 |
|
Michael
|
edc11fd451
|
Map preview initial draft
|
2023-08-17 09:56:50 +02:00 |
|
Nordsoft91
|
96e820ddac
|
Merge pull request #2517 from Laserlicht/folders
|
2023-08-17 10:09:37 +04:00 |
|
Michael
|
71bcc611f5
|
review
|
2023-08-15 20:19:13 +02:00 |
|
Michael
|
0452dbd80d
|
remove copy of cropped asset
|
2023-08-14 23:08:20 +02:00 |
|
Michael
|
b2c8cab9f1
|
use playerColored
|
2023-08-14 22:22:43 +02:00 |
|
Michael
|
079e8ba1ba
|
naming
|
2023-08-14 00:40:12 +02:00 |
|
Michael
|
7bfbfeb48f
|
missing
|
2023-08-14 00:16:53 +02:00 |
|
nordsoft
|
3c9c302fd2
|
TurnTimerInfo
|
2023-08-14 02:16:25 +04:00 |
|
Michael
|
ae63088564
|
outline; squared
|
2023-08-13 22:58:49 +02:00 |
|
Michael
|
9a63161866
|
added random; added names
|
2023-08-13 20:21:09 +02:00 |
|
Michael
|
e66a41e90b
|
simplify
|
2023-08-13 19:23:27 +02:00 |
|
Michael
|
c14448ee32
|
change design
|
2023-08-13 15:09:48 +02:00 |
|
Michael
|
daa8bc547f
|
icon fix
|
2023-08-12 23:28:53 +02:00 |
|
Michael
|
f71f4a874b
|
Grid and Activaed
|
2023-08-12 22:59:45 +02:00 |
|
Michael
|
b73f9d6e30
|
calculate size
|
2023-08-12 21:50:40 +02:00 |
|
Michael
|
18b963f376
|
fix
|
2023-08-12 20:31:00 +02:00 |
|
Michael
|
3d08ecf024
|
rename
|
2023-08-12 20:02:36 +02:00 |
|
Michael
|
92159e57ef
|
Update SelectionTab.cpp
fix possible -1
|
2023-08-12 19:51:18 +02:00 |
|
Michael
|
8bb7fd31cd
|
basically running...
|
2023-08-12 19:33:25 +02:00 |
|
Michael
|
481cd89dc8
|
drawing
|
2023-08-12 18:20:44 +02:00 |
|
Michael
|
c40c747ccf
|
saving states
|
2023-08-12 17:46:35 +02:00 |
|
Michael
|
876dc28e48
|
rework
|
2023-08-12 16:49:42 +02:00 |
|
Ivan Savenko
|
f13a53c1d9
|
Merge remote-tracking branch 'vcmi/beta' into develop
|
2023-08-12 17:28:47 +03:00 |
|
Ivan Savenko
|
92ce97bbc7
|
Merge remote-tracking branch 'vcmi/master' into beta
|
2023-08-12 16:20:06 +03:00 |
|
Michael
|
bc4d331888
|
Title
|
2023-08-12 15:19:40 +02:00 |
|
Michael
|
0c4f4daf70
|
base rendering
|
2023-08-12 15:05:26 +02:00 |
|
Michael
|
b4f6c7abab
|
big images; basic heroes support
|
2023-08-12 13:19:58 +02:00 |
|
Michael
|
d0522b0fee
|
initial window
|
2023-08-12 02:41:48 +02:00 |
|
Michael
|
f0b60cf166
|
suggestions; use internally uppercase; fix; fullname
|
2023-08-11 23:56:20 +02:00 |
|