1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
vcmi/client
ArseniyShestakov c83f15e413 Merge branch 'develop' into feature/tavernRumors
Conflicts:
	lib/CGameState.h
2015-12-05 01:01:26 +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 branch 'develop' into feature/tavernRumors 2015-12-05 01:01:26 +03: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 Merge pull request #122 from vmarkovtsev/feature/warnings 2015-10-14 07:28:47 +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 Fix issue 2239. Pillarbox when restored after alt-tab in fullscreen 2015-11-29 01:56:18 +03:00
CMT.h Merge branch 'SDL1Wipe' into develop 2015-06-22 14:24:00 +03:00
CMusicHandler.cpp SDL1 wipe, part 1. Untested. 2015-06-21 01:59:30 +03:00
CMusicHandler.h Add "override" to virtual overriden methods 2015-10-13 21:05:36 +03:00
CPlayerInterface.cpp Removed includes of CGameState from headers 2015-12-02 21:39:53 +02:00
CPlayerInterface.h Removed includes of CGameState from headers 2015-12-02 21:39:53 +02: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 Digging: implement digging status on right click. Fix issue 401 2015-11-29 12:34:23 +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 don't use separate .rc files for MSVC and MinGW 2014-10-12 16:32:02 +03:00
VCMI_client.vcxproj Migrated to SDL2. It also fixes animation speed in combat. 2015-03-10 08:57:45 +01:00
VCMI_client.vcxproj.filters Compile fixes for Visual. 2014-09-05 20:13:58 +02:00
vcmi.icns
vcmi.ico