1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

531 Commits

Author SHA1 Message Date
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 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 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 from IvanSavenko/simultaneous_turns
Simultaneous turns
2023-09-27 15:45:02 +03:00
Nordsoft91
c803b57c33
Merge pull request 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 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 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 from wb180/teamsPopup
Show only non-empty teams in teams popup
2023-09-03 22:23:32 +03:00
Nordsoft91
2eaed0c983
Merge pull request 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 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 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 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 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 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 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 from IvanSavenko/remove_client_savegame
Remove client savegames
2023-07-19 14:46:46 +03:00
Ivan Savenko
9ef959a7f8
Merge pull request 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
Mike
5134583111 Added missing redraw after selection update 2023-07-11 23:10:02 -07:00
Mike
90397a9604 Merge remote-tracking branch 'upstream/develop' into develop 2023-07-11 19:06:21 -07:00
DjWarmonger
f6cc61e0be
Merge pull request from vcmi/rmg_roads
Rmg roads
2023-07-11 09:25:24 +02:00
Ivan Savenko
0deeff30b9 replaced clickPressed with clickReleased where applicable to H3 2023-07-09 17:55:39 +03:00
Ivan Savenko
9449899098 Fix regressions 2023-07-09 17:08:37 +03:00
Ivan Savenko
8750aa2c5b Merged server savegame and (broken and unused) client savegame files 2023-07-09 15:30:47 +03:00
Mike
b327f890f2 Partially fixed initial loading of save file
Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.
2023-07-08 23:00:48 -07:00
Ivan Savenko
ca889a5c2a Replaced clickLeft with clickPressed clickReleased methods 2023-07-08 14:33:04 +03:00
Tomasz Zieliński
730b36612c Respect GUI settings for roads. By default, all road types are enabled. 2023-07-08 08:44:10 +02:00
Ivan Savenko
b775385179 Fix usage of left/right button to select amounts, e.g. in recruit screen 2023-07-04 21:35:26 +03:00
Ivan Savenko
4fd5a2b3ea Fixed sorting maps breaking after multiple clicks in succession 2023-07-04 20:28:00 +03:00
Ivan Savenko
900b1c1763 Simplified text input handling, fixes hotkeys on windows with text input 2023-07-04 18:42:52 +03:00
Ivan Savenko
8b61c0d59b Replaced CIntObject::type bitfield with bool's. Added input blocking. 2023-07-03 19:24:12 +03:00
Ivan Savenko
cdc27d1fcf Play correct music file in campaign menu 2023-06-27 20:09:11 +03:00
Ivan Savenko
0fdbf54937 Use HeroTypeID instead of int 2023-06-27 19:32:27 +03:00
Ivan Savenko
96eab03b16 Fix UI updates 2023-06-27 14:09:04 +03:00
Ivan Savenko
0f8d53e978 Replaced SDL user events list with dispatching of arbitrary functors 2023-06-26 21:51:10 +03:00
Ivan Savenko
e2bd98e21e CampaignRegions class encapsulation 2023-06-26 17:15:59 +03:00
Ivan Savenko
f6b2f58da9 Use inheritance instead of composition for campaign header 2023-06-26 17:15:59 +03:00
Ivan Savenko
a08fe09517 Added encapsulation for CampaignState class 2023-06-26 17:15:59 +03:00
Ivan Savenko
8420a90aa4 Reorganization of campaigns code 2023-06-26 17:15:59 +03:00
Ivan Savenko
d1e5a347ff Refactoring of campaign handler: rename types and use strong typing 2023-06-26 17:15:59 +03:00
Ivan Savenko
a84ccb37c2
Merge pull request from IvanSavenko/event_handling_fixes
Slider input event fix
2023-06-25 17:39:55 +03:00
Ivan Savenko
69dc95c3c8
Merge pull request from IvanSavenko/hota_h3m_support
Hota h3m support
2023-06-23 13:32:10 +03:00
Ivan Savenko
a505cc464e Fixed slider's behavior, especially for mobile systems 2023-06-22 23:49:38 +03:00
Ivan Savenko
7c5dcfd47b Fix closing dropdown box via clicking outside bounds 2023-06-22 22:34:05 +03:00
Ivan Savenko
563d7dd41f Renamed RCLICK -> SHOW_POPUP 2023-06-20 19:58:05 +03:00
Ivan Savenko
8ad577255f Replaced isMouseButtonPressed with isMouseLeftButtonPressed 2023-06-20 19:58:05 +03:00
Ivan Savenko
d4aa778547 Replaced clickRight event with showPopupWindow/closePopupWindow 2023-06-20 19:58:05 +03:00
Ivan Savenko
d51fe62804 Win/loss condition texts use MetaString 2023-06-20 19:37:27 +03:00
Ivan Savenko
0e36a3ab5a Use Scrollable class for all appropriate locations 2023-06-05 19:18:33 +03:00
Ivan Savenko
052d0d314a Implemented Scrollable class, to server as common base for such classes 2023-06-05 19:17:04 +03:00
Ivan Savenko
6fe00ad55c Moved slider class to a separate file 2023-06-05 19:16:01 +03:00
Ivan Savenko
57df1c3e0d Implemented gesture for town/hero lists and town/hero selection 2023-06-05 19:12:24 +03:00
Ivan Savenko
360bf48031 Implemented panning/swiping gesture for sliders 2023-06-05 19:09:56 +03:00
Ivan Savenko
2a30eccb2d Allow mouse wheel for astart options setup (town/hero/bonus) 2023-06-05 19:00:57 +03:00
Ivan Savenko
48859e186e Added panning gesture, activated by mouse wheel press 2023-06-05 19:00:56 +03:00
Ivan Savenko
503bd1dd66 Fix double-clicking to start scenario 2023-06-05 19:00:56 +03:00
Ivan Savenko
8ea0ecaec1 show/showAll methods now use Canvas instead of SDL_Surface
- added compatibility method to Canvas to allow SDL_Surface access
- added drawBorder method to Canvas to replace CSDL_Ext method
- added drawColor method to Canvas to replace CSDL_Ext method
- minor changes to Tavern and Trade windows to adapt to new API
2023-06-02 16:42:18 +03:00
Ivan Savenko
acac42291e Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
Ivan Savenko
62595cb039 Split massive CMap.h a bit 2023-05-31 23:01:57 +03:00
Ivan Savenko
de769a04d6 Remove unnecessary includes from headers 2023-05-31 23:01:57 +03:00
Ivan Savenko
daaaf84392 Icon index for map format is now defined in config 2023-05-31 23:01:57 +03:00
Ivan Savenko
fb55719671 Map format support status can now be loaded from gameSettings 2023-05-31 23:01:57 +03:00
Ivan Savenko
e23dfec6c5 Fix SDL_Hints location 2023-05-20 01:51:49 +03:00
Ivan Savenko
0e70f2998f SDL event handling is now done exclusively in input handler 2023-05-20 01:51:49 +03:00
Ivan Savenko
1f513fd280 Extracted event management from GuiHandler and CIntObject 2023-05-20 01:51:49 +03:00
Ivan Savenko
ad3e54e6c0 Reduced usage of topWindow() method 2023-05-16 21:57:45 +03:00
Ivan Savenko
e2ef136003 Renamed "Int" -> "Window" in WindowHandler API 2023-05-16 19:10:22 +03:00
Ivan Savenko
7838190ef4 Moved window stack management from GuiHandler to new class 2023-05-16 19:10:21 +03:00
Ivan Savenko
c5a48a01ce Remove no longer used code 2023-05-09 13:10:33 +03:00
Ivan Savenko
edd5d11734 Fix issues discovered by self-review 2023-05-09 13:10:33 +03:00
Ivan Savenko
c688411bab Extracted window management from CMT to new class 2023-05-09 13:10:33 +03:00
Ivan Savenko
dea10e6091 Use more descriptive names for hotkeys 2023-05-01 17:59:20 +03:00
Ivan Savenko
832e56e005 Implementation of (very basic) shortcuts system
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
2023-05-01 17:58:17 +03:00
Ivan Savenko
fb739e7186 Merge beta -> develop 2023-04-26 22:48:08 +03:00
Ivan Savenko
3ac713d6a8 Fix crash on dereferencing nullptr 2023-04-24 17:17:12 +03:00
nordsoft
753b72f96d Revert "Hidden maps"
This reverts commit e669d31d33.
2023-04-20 19:50:00 +04:00
Ivan Savenko
b3207f3465 RMG tab will now show all templates but will block invalid map sizes 2023-04-19 23:14:23 +03:00
Ivan Savenko
b517adfb25 Fixed crash on empty save game list after filtering 2023-04-19 23:12:30 +03:00
Ivan Savenko
3d30e04184 Fixed centering of scenario information window 2023-04-19 23:11:44 +03:00
nordsoft
80220fda5b Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
# Conflicts:
#	lib/mapping/CMap.h
2023-04-17 04:54:57 +04:00
nordsoft
70f4cc5e0f Refactor campaign regions 2023-04-17 04:26:35 +04:00
nordsoft
954a2abb71 Verifying mods before starting map 2023-04-16 15:38:13 +04:00
Ivan Savenko
cc8c1c769a Fix duplicated maps in scenario selection screen 2023-04-15 17:20:38 +03:00
Ivan Savenko
3738171b21 Refactoring of H3M loader to make HotA format support easier
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
nordsoft
e28dd128e0 Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
This reverts commit 46d35541b453b6c026c457bf0c788f79311968b3.
2023-04-13 12:45:10 +04:00
nordsoft
fb4db41891 Single player spectator 2023-04-13 02:01:13 +04:00
nordsoft
e669d31d33 Hidden maps 2023-04-12 02:44:17 +04:00
nordsoft
30281d5991 Merge remote-tracking branch 'upstream/develop' into vcmi-campaign 2023-04-11 21:44:31 +04:00
Ivan Savenko
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
nordsoft
08809f1cdc String building id 2023-04-09 04:53:06 +04:00
nordsoft
307fb071a2 VCMI campaign format support prototype 2023-04-09 03:24:40 +04:00
nordsoft
9e5e1aebbc Remove hardcoded campaign screens 2023-04-09 00:16:11 +04:00
Adriankhl
57409a0d94 fix: close dropbox with left mouse click outside of the dropbox 2023-04-06 18:32:21 +02:00
Konstantin
11b237a23c vcmi: massive refactoring v1 2023-04-05 22:33:12 +03:00
Ivan Savenko
383387ef29 Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
Adriankhl
eba4e4dd2c No longer save/load common game state to/from client file 2023-03-13 10:10:44 +01:00
Konstantin
5366f9190e vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
Ivan Savenko
4260726e4b Provide encoding information to maps & campaigns loaders 2023-03-05 17:39:27 +02:00
Ivan Savenko
cfcaf5cbb6 renamed keyDown -> keyPressed 2023-02-03 11:39:40 +02:00
Ivan Savenko
e1bd0d2a04 API for custom events no longer requires SDL access 2023-02-03 11:39:40 +02:00
Ivan Savenko
d4fba3787c Removed usage of SDL_KeyboardEvent from UI code 2023-02-03 11:39:40 +02:00
Ivan Savenko
108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
Ivan Savenko
9c3030603d Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
Ivan Savenko
87218c63c4 CPicture now uses IImage internally 2023-01-30 17:18:59 +02:00
Ivan Savenko
e35a669eeb Refactoring of CPicture class to improve encapsulation 2023-01-30 13:58:13 +02:00
Ivan Savenko
50a0fc4fb2 Removed pointer to current SDL_Event from GuiHandler 2023-01-27 23:17:40 +02:00
Konstantin
cf56f7ccce vcmi: remove unused-but-set-variables 2023-01-26 23:49:00 +03:00
Ivan Savenko
a19c9eccc4 Fix ios compile 2023-01-20 16:11:43 +02:00
Ivan Savenko
05a1d7c6e3 All text for factions/towns/building are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
388ed88b5d All artifact strings now pass through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
d2b837b116 All creature-related texts go through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
fa6f7513e8 All heroes-related strings are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
e22f6283c2 Secondary skills strings are now passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
5da407e822 All spell texts are now passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
Ivan Savenko
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
Ivan Savenko
f51b3bca57 use JsonKey or NameTranslated instead of ambiguos Name 2023-01-10 00:01:35 +02:00
Ivan Savenko
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00