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

Changes related to Debian packaging, based on josch patch

2014-03-20 18:17:40 +00:00

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

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

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

- Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui

2013-04-07 11:52:07 +00:00

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

Fixed issue with Windows 7 DPI upscaling.

2009-12-12 03:26:09 +00:00

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

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

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

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

* Final commit

2011-12-13 21:35:28 +00:00

StdInc.h

Implemented SDL2 unicode input. Hotkeys are sill broken.

2014-06-13 07:55:42 +04:00

VCMI_client.cbp

Merge pull request #180 from Zyx-2000/FileInfo

2016-02-08 04:55:39 +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

Compile fixes for MSVS.

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

…