ArseniyShestakov 87eaa78ffd Restore testing option changes overriten by merge

2015-12-19 12:12:35 +03:00

..

battle

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

gui

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

icons

…

widgets

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

windows

Merge remote-tracking branch 'origin/issue/2306' into develop

2015-12-18 22:21:11 +02:00

CBitmapHandler.cpp

Get rid of CSDL_Ext::colorSetAlpha

2015-09-02 18:49:29 +03:00

CBitmapHandler.h

…

CDefHandler.cpp

More correct usage of SDL_Palette

2015-09-05 15:03:37 +03:00

CDefHandler.h

Cleanup CDefHandler

2015-09-02 18:27:56 +03:00

CGameInfo.cpp

…

CGameInfo.h

…

Client.cpp

Restore testing option changes overriten by merge

2015-12-19 12:12:35 +03:00

Client.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CMakeLists.txt

Fix vcmiclient CMakeLists.txt

2015-10-17 09:23:40 +03:00

CMessage.cpp

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CMessage.h

…

CMT.cpp

Client: add command line options to simplify multi-instance testing

2015-12-13 22:14:37 +03:00

CMT.h

…

CMusicHandler.cpp

…

CMusicHandler.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CPlayerInterface.cpp

Client: add command line options to simplify multi-instance testing

2015-12-13 22:14:37 +03:00

CPlayerInterface.h

Merge pull request #144 from vcmi/fix/teleportMultiExitPoints

2015-12-05 03:12:17 +03:00

CPreGame.cpp

One more fix for options

2015-11-25 07:40:35 +03:00

CPreGame.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CVideoHandler.cpp

try to fix travis build.

2015-11-11 15:44:17 +03:00

CVideoHandler.h

Another ffmpeg api fix

2015-11-14 03:59:16 +03:00

DPIaware.manifest

…

Graphics.cpp

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

Graphics.h

…

Info.plist

…

mapHandler.cpp

Use "Favorable" instead of "Favourable" everywhere for consistency

2015-12-06 02:23:41 +03:00

mapHandler.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

NetPacksClient.cpp

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

OSX.mm

…

resource.h

…

SDLMain.h

…

SDLMain.m

…

StdInc.cpp

…

StdInc.h

…

VCMI_client.cbp

Changed windows minimum version back to winxp due to mingw bug

2015-08-20 04:22:54 +03:00

VCMI_client.rc

…

VCMI_client.vcxproj

…

VCMI_client.vcxproj.filters

…

vcmi.icns

…

vcmi.ico

…