1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
vcmi/client
AlexVinS 0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306
s reverts commit fa8a282696.

Conflicts:
	AI/VCAI/VCAI.cpp

Conflicts:
	AI/VCAI/VCAI.cpp
	client/windows/CAdvmapInterface.cpp
	lib/CPathfinder.cpp
	lib/CPathfinder.h
2015-12-05 12:56:12 +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 Changes related to Debian packaging, based on josch patch 2014-03-20 18:17:40 +00:00
widgets Add "override" to virtual overriden methods 2015-10-13 21:05:36 +03:00
windows Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 2015-12-05 12:56:12 +03:00
CBitmapHandler.cpp Get rid of CSDL_Ext::colorSetAlpha 2015-09-02 18:49:29 +03:00
CBitmapHandler.h Made speed of most of battle animations time-based 2013-07-06 16:10:20 +00:00
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 Finalization of object type handler interface 2014-05-16 23:50:02 +03:00
CGameInfo.h Object class handler is now a proper "handler" 2014-05-24 01:56:51 +03:00
Client.cpp Fix the second crash (dynamic_cast failure) 2015-10-27 09:09:42 +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 - Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui 2013-04-07 11:52:07 +00:00
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 Merge pull request #144 from vcmi/fix/teleportMultiExitPoints 2015-12-05 03:12:17 +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 [Spells] Added basic support for icons and sounds 2014-03-10 16:00:58 +00:00
Info.plist Attempt to apply patch from stopiccot. 2013-03-01 21:32:26 +00:00
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 Attempt to apply patch from stopiccot. 2013-03-01 21:32:26 +00:00
resource.h
SDLMain.h Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
SDLMain.m Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
StdInc.cpp
StdInc.h Implemented SDL2 unicode input. Hotkeys are sill broken. 2014-06-13 07:55:42 +04:00
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 Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
vcmi.ico