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
..
adventureMap	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
battle	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
eventsSDL	Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock	2023-09-27 18:33:52 +03:00
gui	FramerateManager.cpp: Merge this "if" statement with the enclosing one.	2023-10-27 14:30:04 +00:00
icons	client/icons/generate_icns.py: Replace print statement by built-in function.	2023-10-27 23:34:11 +00:00
ios	Fix iOS build with ENABLE_PCH=OFF	2023-10-01 18:16:41 +02:00
lobby	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams	2023-10-30 20:08:13 +01:00
mainmenu	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
mapView	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
render	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
renderSDL	Use the "nullptr" literal.	2023-10-27 18:18:59 +00:00
widgets	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
windows	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
CFocusableHelper.cpp	Fix iOS build with ENABLE_PCH=OFF	2023-10-01 18:16:41 +02:00
CFocusableHelper.h	remove focus from active text input after keyboard is closed	2022-09-24 15:55:19 +03:00
CGameInfo.cpp	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
CGameInfo.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
Client.cpp	CClient::removeGUI(): This function should be declared 'const'	2023-10-28 23:05:05 +00:00
Client.h	CClient::removeGUI(): This function should be declared 'const'	2023-10-28 23:05:05 +00:00
ClientCommandManager.cpp	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
ClientCommandManager.h	Removed remaining references to 'pim' name	2023-09-27 18:50:01 +03:00
ClientNetPackVisitors.h	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
CMakeLists.txt	map overview rework	2023-09-30 15:05:12 +02:00
CMT.cpp	Use the "nullptr" literal.	2023-10-27 18:18:59 +00:00
CMT.h	Show message box when H3 data is missing	2023-08-06 18:16:32 +03:00
CMusicHandler.cpp	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
CMusicHandler.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
CPlayerInterface.cpp	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
CPlayerInterface.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
CServerHandler.cpp	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
CServerHandler.h	Merge pull request #3051 from Laserlicht/name_change	2023-10-16 22:28:31 +02:00
CVideoHandler.cpp	Use the "nullptr" literal.	2023-10-27 18:18:59 +00:00
CVideoHandler.h	Use the "nullptr" literal.	2023-10-27 18:18:59 +00:00
HeroMovementController.cpp	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
HeroMovementController.h	Changes according to review	2023-09-18 18:17:26 +03:00
LobbyClientNetPackVisitors.h	Moved ArtifactLocation to a separate file	2023-10-23 19:02:28 +03:00
NetPacksClient.cpp	client/NetPacksClient.cpp: Combine null pointer checks	2023-10-27 23:43:39 +00:00
NetPacksLobbyClient.cpp	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
PlayerLocalState.cpp	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
PlayerLocalState.h	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
resource.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
StdInc.cpp	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
StdInc.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
VCMI_client.cbp	fix	2023-09-30 20:18:12 +02:00
VCMI_client.rc	don't use separate .rc files for MSVC and MinGW	2014-10-12 16:32:02 +03:00
VCMI_client.vcxproj	fix	2023-09-30 20:18:12 +02:00
VCMI_client.vcxproj.filters	fix	2023-09-30 20:18:12 +02:00
vcmi.ico	Update VCMI icon (#2672)	2023-09-05 23:57:19 +03:00