1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-12 10:03:53 +02:00
vcmi/client
nordsoft 0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
..
adventureMap Merge remote-tracking branch 'upstream/develop' into boats 2023-04-19 02:22:19 +04:00
battle vcmi: use std::optional 2023-04-17 00:43:13 +03:00
gui Merge beta into develop 2023-04-11 19:37:35 +03:00
icons Update generate_icns.py 2023-04-16 12:33:35 +02:00
ios Add different sizes 2023-04-15 13:13:44 +02:00
lobby Fix duplicated maps in scenario selection screen 2023-04-15 17:20:38 +03:00
mainmenu vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
mapView Animations from config 2023-04-19 00:14:15 +04:00
render Removed ARRAY_COUNT in favor of std::size 2023-04-12 01:04:26 +03:00
renderSDL Merge beta into develop 2023-04-11 19:37:35 +03:00
widgets vcmi: use std::optional 2023-04-17 00:43:13 +03:00
windows Merge remote-tracking branch 'upstream/develop' into boats 2023-04-19 02:22:19 +04:00
CFocusableHelper.cpp remove focus from active text input after keyboard is closed 2022-09-24 15:55:19 +03:00
CFocusableHelper.h remove focus from active text input after keyboard is closed 2022-09-24 15:55:19 +03:00
CGameInfo.cpp Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
CGameInfo.h Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
Client.cpp vcmi: use std::optional 2023-04-17 00:43:13 +03:00
Client.h vcmi: use std::optional 2023-04-17 00:43:13 +03:00
ClientCommandManager.cpp Fix for merge. 2023-04-17 00:53:25 +03:00
ClientCommandManager.h Split Process console commands code into individual functions 2023-04-16 23:45:37 +03:00
ClientNetPackVisitors.h vcmi: allow showing more than one components in infobar 2023-03-11 21:41:57 +03:00
CMakeLists.txt Add different sizes 2023-04-15 13:13:44 +02:00
CMT.cpp Refactoring of H3M loader to make HotA format support easier 2023-04-15 17:20:38 +03:00
CMT.h Refactoring of SDL API usage: 2023-01-20 16:11:43 +02:00
CMusicHandler.cpp Fix crash on missing music file 2023-04-08 19:47:16 +03:00
CMusicHandler.h Fixed volume of ambient sounds 2023-03-28 18:56:44 +03:00
CPlayerInterface.cpp Merge remote-tracking branch 'upstream/develop' into boats 2023-04-19 02:22:19 +04:00
CPlayerInterface.h Merge pull request #1108 from Nordsoft91/battle-dialog 2023-04-11 21:18:04 +04:00
CServerHandler.cpp Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
CServerHandler.h Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" 2023-04-13 12:45:10 +04:00
CVideoHandler.cpp vcmi: fix build and run with ffmpeg 6.0 2023-03-11 00:12:05 +03:00
CVideoHandler.h Video playback is now time-based, using video file timings 2023-01-28 13:19:35 +02:00
DPIaware.manifest
LobbyClientNetPackVisitors.h Removed magical initialization of registry via static variables 2023-04-08 21:29:04 +03:00
NetPacksClient.cpp vcmi: use std::optional 2023-04-17 00:43:13 +03:00
NetPacksLobbyClient.cpp rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
resource.h
StdInc.cpp
StdInc.h Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
VCMI_client.cbp Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
VCMI_client.rc
VCMI_client.vcxproj Update VS files to 2019, partially fix test project 2019-06-09 17:28:55 +02:00
VCMI_client.vcxproj.filters Update project files to match vcmi code changes 2018-07-06 18:52:51 +02:00
vcmi.ico new icons 2023-04-15 12:52:11 +02:00