nordsoft ece8a2a41f Merge branch 'battle-dialog' into battle-dialog2 ...

# Conflicts:
#	AI/BattleAI/BattleAI.h
#	AI/StupidAI/StupidAI.h
#	client/CPlayerInterface.cpp
#	client/CPlayerInterface.h
#	client/Client.cpp
#	client/NetPacksClient.cpp
#	client/battle/CBattleInterface.cpp
#	client/battle/CBattleInterface.h
#	client/battle/CBattleInterfaceClasses.cpp
#	client/battle/CBattleInterfaceClasses.h
#	config/schemas/settings.json
#	lib/CGameInterface.h
#	lib/IGameEventsReceiver.h
#	lib/NetPacks.h
#	lib/NetPacksLib.cpp
#	lib/battle/BattleInfo.cpp
#	server/CGameHandler.cpp
#	server/CQuery.h

2023-04-06 19:53:52 +04:00

..

CGameHandler.cpp

Merge branch 'battle-dialog' into battle-dialog2

2023-04-06 19:53:52 +04:00

CGameHandler.h

Intermediate commit

2023-04-06 19:34:07 +04:00

CMakeLists.txt

Haiku patch

2023-03-27 10:10:09 +02:00

CQuery.cpp

Merge branch 'battle-dialog' into battle-dialog2

2023-04-06 19:53:52 +04:00

CQuery.h

Intermediate commit

2023-04-06 19:34:07 +04:00

CVCMIServer.cpp

Removed largely unused signal handling, fixes build with musl c library

2023-03-30 14:56:13 +03:00

CVCMIServer.h

fix using JNI from server in single process build

2023-03-02 12:09:48 +03:00

LobbyNetPackVisitors.h

rework netpacks to avoid double typeinfo

2023-02-13 20:26:39 +02:00

NetPacksLobbyServer.cpp

rework netpacks to avoid double typeinfo

2023-02-13 20:26:39 +02:00

NetPacksServer.cpp

Use own resources when buying boat in allied shipyard

2023-03-31 23:18:45 +03:00

ServerNetPackVisitors.h

rework netpacks to avoid double typeinfo

2023-02-13 20:26:39 +02:00

StdInc.cpp

Rename radious -> radius

2016-01-31 18:01:58 +03:00

StdInc.h

wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined

2022-09-24 15:55:21 +03:00

VCMI_server.cbp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

VCMI_server.vcxproj

Update VS files to 2019, partially fix test project

2019-06-09 17:28:55 +02:00