AlexVinS 150fcc9422 Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

2016-02-15 13:39:00 +03:00

..

battle

Merge pull request #181 from vcmi/feature/drawbridgeMechanics

2016-02-14 16:32:24 +03:00

gui

alignment & makefile fix

2016-01-29 16:08:44 +01:00

icons

…

widgets

Fix 2139 captured spell scroll descriptions

2016-01-25 08:49:26 +03:00

windows

Try to fix http://bugs.vcmi.eu/view.php?id=2362

2016-02-02 11:46:33 +03:00

CBitmapHandler.cpp

Replaced CFileInfo with more correct and efficient alternative

2016-01-26 14:51:38 +01: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

Fixed typo.

2016-02-09 15:15:45 +01:00

Client.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CMakeLists.txt

support for music streaming

2016-01-30 22:34:46 +01:00

CMessage.cpp

Add "override" to virtual overriden methods

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

CMessage.h

…

CMT.cpp

Merge branch 'Zyx-develop' into develop

2016-01-27 18:53:41 +03:00

CMT.h

Merge branch 'SDL1Wipe' into develop

2015-06-22 14:24:00 +03:00

CMusicHandler.cpp

support for music streaming

2016-01-30 22:34:46 +01:00

CMusicHandler.h

support for music streaming

2016-01-30 22:34:46 +01:00

CPlayerInterface.cpp

Battles: change naming from drawbridge to gate for everything

2016-02-13 17:40:31 +03:00

CPlayerInterface.h

Battles: change naming from drawbridge to gate for everything

2016-02-13 17:40:31 +03:00

CPreGame.cpp

Start integration of map format into engine

2016-02-09 20:20:03 +03:00

CPreGame.h

Start integration of map format into engine

2016-02-09 20:20:03 +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

Merge pull request #181 from vcmi/feature/drawbridgeMechanics

2016-02-14 16:32:24 +03:00

OSX.mm

…

resource.h

…

SDLMain.h

…

SDLMain.m

…

SDLRWwrapper.cpp

copyright stuff

2016-01-31 11:13:56 +01:00

SDLRWwrapper.h

copyright stuff

2016-01-31 11:13:56 +01:00

StdInc.cpp

…

StdInc.h

…

VCMI_client.cbp

Merge pull request #180 from Zyx-2000/FileInfo

2016-02-08 04:55:39 +03:00

VCMI_client.rc

…

VCMI_client.vcxproj

Compile fixes for MSVS.

2016-02-09 11:08:20 +01:00

VCMI_client.vcxproj.filters

…

vcmi.icns

…

vcmi.ico

…