Ivan Savenko
63a2ed7cf8
Replace vector[] with range-checking vector.at()
2024-01-04 23:52:57 +02:00
Laserlicht
cb9c4bbaf0
unlimited replay option
2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e
extra option tab
2023-12-28 19:41:01 +01:00
Laserlicht
c471b626a2
code review
2023-12-27 15:26:08 +01:00
Laserlicht
fc4827c89c
option for allowing cheats
2023-12-27 14:39:35 +01:00
Ivan Savenko
50536e28da
Fixed invalid text ID in description of "start with hero" campaign bonus
2023-12-23 18:13:31 +02:00
Ivan Savenko
ec1aee68d5
Fix invisible chat in pregame. Fixed positioning of chat box
2023-12-23 18:12:55 +02:00
Ivan Savenko
37a8c8db8d
Workaround for vcmi-extras bug
2023-12-22 18:40:29 +02:00
Ivan Savenko
fe5918ebf5
Clients will now switch to turn options when host does so
2023-12-22 18:40:28 +02:00
Ivan Savenko
76cb5387c5
Access CHero in a way that will throw exception on invalid access
...
instead of crash
2023-12-13 16:50:56 +02:00
Ivan Savenko
edbe25b33a
Updated layout and localizations
2023-12-07 16:36:44 +02:00
Ivan Savenko
861c53059e
Added callbacks for preset dropdowns
2023-12-07 13:57:16 +02:00
Ivan Savenko
653304b004
Implemented accumulating timers, rename creature timer to unit timer
2023-12-07 13:57:16 +02:00
Ivan Savenko
02f7193260
Fix regression from map translation - properly translate custom main
...
hero name
2023-11-27 20:27:10 +02:00
Ivan Savenko
e5e01ab35d
Disable spectator mode in single player to avoid confusing players
2023-11-20 14:38:57 +02:00
Ivan Savenko
13763cad8e
Remove few more implicit conversions
2023-11-15 15:55:19 +02:00
Ivan Savenko
0842f5afee
Removed remaining usages of std::vector<bool>
2023-11-15 15:55:18 +02:00
Ivan Savenko
f65f4b1285
Disable new UI if enhancements are off
2023-11-13 19:49:41 +02:00
Ivan Savenko
d1ae5bbee5
Implement AI simturns checkbox
2023-11-13 19:06:56 +02:00
Ivan Savenko
c5eeaa6526
Added non-linear slider for better simturn duration selection
2023-11-13 19:06:56 +02:00
Ivan Savenko
7d54f6a9c0
Implemented basic support for plural forms in translations
2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b
Implement min/max simturns callbacks
2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52
Initial version of Turn Options tab screen
2023-11-13 19:06:56 +02:00
Ivan Savenko
3268ebe27c
Moved some code from OptionTab to separate class, OptionTabBase
2023-11-13 19:06:56 +02:00
Ivan Savenko
59806bf112
Fix right-click tooltips for starting hero/towns
2023-11-12 17:17:07 +02:00
Ivan Savenko
86a3806bec
MetaString refactor to eliminate integer usage for identifiers
...
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
2023-11-07 22:47:10 +02:00
Tomasz Zieliński
c909bd766e
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# lib/rmg/CMapGenOptions.cpp
# lib/rmg/CMapGenOptions.h
2023-11-07 20:54:04 +01:00
Andrii Danylchenko
0927d3e3e8
Merge pull request #3145 from vcmi/fix-3142
...
#3142 - fi custom campaign selection screen
2023-11-05 11:12:58 +02:00
Andrii Danylchenko
d50ebd7d58
#3142 - fi custom campaign selection screen
2023-11-04 14:34:18 +02:00
Ivan Savenko
8d5fa41a19
Minor fixes
2023-11-03 16:03:29 +02:00
Ivan Savenko
10e50548e7
Converted Component class to use VariantIdentifier instead of int
2023-11-02 12:00:04 +02:00
Tomasz Zieliński
6e7b68d0e6
Unused variable, unused code
2023-10-30 21:33:49 +01:00
Tomasz Zieliński
e105b23a37
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
# Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
# client/lobby/RandomMapTab.cpp
2023-10-30 20:08:13 +01:00
Tomasz Zieliński
f39edf9413
Update ally and enemy flags when selecting new template
2023-10-30 07:48:51 +01:00
Tomasz Zieliński
4f2cde018c
Fixed most of reported issues, removed unused code.
2023-10-29 21:25:39 +01:00
Ivan Savenko
0169c65937
Merge pull request #3100 from IvanSavenko/split_net_packs
...
Split netpacks.h into multiple files
2023-10-29 13:46:40 +02:00
Tomasz Zieliński
368a185008
Cleaning up the code
2023-10-29 10:05:24 +01:00
Tomasz Zieliński
07dac8b6d4
Works more or less
2023-10-28 20:30:38 +02:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment
...
fix team alignments
2023-10-26 23:19:18 +02:00
Tomasz Zieliński
a817e481d0
Merge fix
2023-10-26 10:46:04 +02:00
Tomasz Zieliński
36911d1e0a
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# client/lobby/RandomMapTab.cpp
2023-10-26 10:31:41 +02:00
Laserlicht
e28d14d16d
not needed anymore
2023-10-24 18:56:30 +02:00
Laserlicht
abb279f5b4
use config
2023-10-24 18:51:58 +02:00
Ivan Savenko
5523f05284
Moved ArtifactLocation to a separate file
2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8
Split off some netpack structures into separate files
2023-10-23 13:59:15 +03:00
Ivan Savenko
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared
...
Minimap keep aspect ratio (Letterboxing)
2023-10-22 16:55:58 +03:00
Laserlicht
b67548e7cf
format
2023-10-22 15:06:12 +02:00
Laserlicht
7b370d1967
fix team alignments
2023-10-22 15:00:04 +02:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random
...
show random maps
2023-10-22 12:29:31 +03:00
Laserlicht
a042cc46c2
no town selection on loadscreen
2023-10-21 19:10:02 +02:00
Laserlicht
d215ffa011
optics
2023-10-21 18:45:45 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps
2023-10-21 16:49:50 +02:00
Laserlicht
86e6f7d156
fix
2023-10-21 02:26:03 +02:00
Laserlicht
ceb70af528
fix
2023-10-21 02:22:22 +02:00
Laserlicht
9a116f9b20
small optimisation
2023-10-21 02:16:42 +02:00
Laserlicht
0eba0ee686
show random maps
2023-10-21 02:12:34 +02:00
Laserlicht
ecd093cae4
fix
2023-10-16 21:28:44 +02:00
Laserlicht
0a1578b797
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 21:24:59 +02:00
Laserlicht
b2396a61fa
code review
2023-10-14 13:34:39 +02:00
Laserlicht
7217992898
code review
2023-10-14 12:08:38 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name
2023-10-13 23:04:35 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
56d5c74a61
Merge pull request #2996 from Nordsoft91/fix-2992
...
Capture key event in chat box
2023-10-04 19:59:06 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
nordsoft
213d0c3553
Capture events in chat box
2023-10-01 16:40:26 +02:00
Laserlicht
79e66c38df
layout
2023-09-30 17:14:22 +02:00
Laserlicht
718bafc8af
map overview rework
2023-09-30 15:05:12 +02:00
nordsoft
6da605ff83
Campaign meta strings
2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3
Rename hero strings to text id
2023-09-28 00:04:05 +02:00
nordsoft
03c099d4fd
First steps
2023-09-27 22:53:13 +02:00
Ivan Savenko
94dbde05a0
Merge pull request #2868 from IvanSavenko/simultaneous_turns
...
Simultaneous turns
2023-09-27 15:45:02 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
...
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
Ivan Savenko
54adeef29f
Added temporary UI for simturns testing
2023-09-26 13:42:20 +03:00
Ivan Savenko
5b21a5ffbc
Simturn duration is now part of StartInfo
2023-09-26 13:42:20 +03:00
nordsoft
dce1ac1538
Redesign mod incompatibility message
2023-09-23 00:32:48 +02:00
Ivan Savenko
00db2e245f
Merge pull request #2872 from Laserlicht/bonus_selection
...
fix bonus selection
2023-09-20 13:19:54 +03:00
Laserlicht
babf858112
format
2023-09-19 01:50:42 +02:00
Laserlicht
4ac3e3c2e5
fix bonus selection
2023-09-19 01:48:26 +02:00
Laserlicht
ff96b1af0a
initial hero overview
2023-09-17 00:32:10 +02:00
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
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
Tomasz Zieliński
c59014ce18
Merge remote-tracking branch 'origin/beta' into fix_rmg_teams
2023-08-14 18:59:45 +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
Michael
6ca5518ff1
Buxfix
2023-08-11 20:09:41 +02:00
Ivan Savenko
9d7f46f985
Fix crash on right-clicking player flags in RMG UI
2023-08-11 18:50:39 +03:00
Michael
2d9bb34825
format
2023-08-11 01:49:10 +02:00
Michael
2b093b8850
case handling
2023-08-11 01:46:22 +02:00
Michael
092a0d72a1
whitespace format
2023-08-11 00:19:24 +02:00
Michael
c260ce5814
current folder in first line
2023-08-10 23:52:16 +02:00
Michael
48747eea9d
bigger line for folder
2023-08-10 23:37:19 +02:00
Michael
f24c636d17
code review suggestions
2023-08-10 22:15:32 +02:00
Michael
92fd317a84
erase -> pop_back
2023-08-09 20:27:24 +02:00
nordsoft
f4869cbfb0
Tutorial load game mode
2023-08-09 15:29:48 +04:00
nordsoft
1def98a862
Tutorial implemented
2023-08-09 03:54:09 +04:00
Michael
6013549ef8
no old selection
2023-08-09 00:41:13 +02:00
Michael
8693dab9ec
fix filter
2023-08-09 00:13:02 +02:00
Michael
bbe04c747d
Folder Icon, Save, Folder on top...
2023-08-08 23:46:30 +02:00
Michael
855b94b316
fix
2023-08-08 02:30:28 +02:00
Michael
8b8006c0e0
bring it to work...
2023-08-08 02:04:06 +02:00
Michael
5e1f1294e5
rework
2023-08-08 00:38:13 +02:00
Michael
e5627b4bb7
tests
2023-08-07 00:10:06 +02:00
Ivan Savenko
9bd27c50a0
Allowed loading saves from inside mods
2023-08-06 19:39:55 +03:00
Ivan Savenko
723c674d81
Merge pull request #2447 from IvanSavenko/modding_handler_refactoring
...
(develop) Modding handler refactoring
2023-08-02 21:26:05 +03:00
Ivan Savenko
43795c39a5
Replaced all usage of SDL_Color outside of render with ColorRGBA
2023-07-31 21:07:30 +03:00
Ivan Savenko
62fddca21e
Split massive CModHandler class/file into multiple parts:
...
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Ivan Savenko
823080be86
Fix error on opening map list with hota maps
2023-07-24 23:27:26 +03:00
Tomasz Zieliński
d26e46ddfe
Remove old id, replace with randomTemplate
2023-07-24 17:39:32 +02:00
Tomasz Zieliński
6522cec969
Just the notes
2023-07-24 08:44:37 +02:00
Tomasz Zieliński
e8855e20c4
Merge remote-tracking branch 'origin/beta' into fix_rmg_teams
2023-07-22 12:16:14 +02:00
Michael
0f16cec3b9
whitespace
2023-07-20 22:05:09 +02:00
Michael
f313597968
Use boost::format
2023-07-20 22:02:39 +02:00
Michael
36e870ae45
Descriptions
2023-07-20 21:37:23 +02:00
Tomasz Zieliński
57bb011468
- Do not allow 0 or 1 teams
...
- Do not allow player to set only 1 team in GUI
2023-07-20 20:34:00 +02:00
Michael
a86406d090
check list length
2023-07-20 02:20:54 +02:00
Michael
3484059a40
fix indentation
2023-07-20 02:01:00 +02:00
Michael
c28c0d2a13
Popup - Mapselection
2023-07-20 01:53:33 +02:00
Ivan Savenko
280085b95d
Merge pull request #2308 from IvanSavenko/remove_client_savegame
...
Remove client savegames
2023-07-19 14:46:46 +03:00
Ivan Savenko
9ef959a7f8
Merge pull request #2310 from IvanSavenko/left_click_refactor
...
Left click input refactor
2023-07-13 13:03:06 +03:00
Mike
3c707d8e31
Cleanup
2023-07-11 23:12:59 -07:00