Ivan Savenko a69fcdd435 Fixed compilation issues caused by merge

2014-07-14 17:44:15 +03:00

..

battle

Merge branch 'feature/creatureWindow' into refactoring/guiClasses

2014-07-14 17:23:24 +03:00

gui

Merge branch 'feature/creatureWindow' into refactoring/guiClasses

2014-07-14 17:23:24 +03:00

icons

Changes related to Debian packaging, based on josch patch

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

widgets

Fixed compilation issues caused by merge

2014-07-14 17:44:15 +03:00

windows

Fixed compilation issues caused by merge

2014-07-14 17:44:15 +03:00

CBitmapHandler.cpp

More ColorKey cleanup

2014-07-02 22:41:11 +04:00

CBitmapHandler.h

Made speed of most of battle animations time-based

2013-07-06 16:10:20 +00:00

CDefHandler.cpp

Refactoring towards backward compatibility (WiP)

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

CDefHandler.h

Made speed of most of battle animations time-based

2013-07-06 16:10:20 +00: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

Cleanup:

2014-06-05 20:26:50 +03:00

Client.h

Refactoring of hoverText from objects:

2014-06-24 20:39:47 +03:00

CMakeLists.txt

Reorganized client source tree:

2014-07-13 20:53:37 +03:00

CMessage.cpp

Reorganized client source tree:

2014-07-13 20:53:37 +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

Reorganized client source tree:

2014-07-13 20:53:37 +03:00

CMT.h

restore some SDL1 code in CMT.XXX

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

CMusicHandler.cpp

Merge branch 'develop' into SDL2

2014-06-24 14:09:44 +04:00

CMusicHandler.h

Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree

2014-07-13 18:39:45 +03:00

CPlayerInterface.cpp

Merge branch 'feature/creatureWindow' into refactoring/guiClasses

2014-07-14 17:23:24 +03:00

CPlayerInterface.h

More safe way of update locking

2014-07-03 22:30:56 +04:00

CPreGame.cpp

Merge branch 'feature/creatureWindow' into refactoring/guiClasses

2014-07-14 17:23:24 +03:00

CPreGame.h

Reorganized client source tree:

2014-07-13 20:53:37 +03:00

CVideoHandler.cpp

fix CVideoHandler compilation

2014-07-09 18:01:12 +03:00

CVideoHandler.h

- Hotfix: overlay was a pointer

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

DPIaware.manifest

…

Graphics.cpp

Reorganized client source tree:

2014-07-13 20:53:37 +03: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

Do not render fully hidden tiles

2014-07-03 20:41:42 +04:00

mapHandler.h

Refactoring of hoverText from objects:

2014-06-24 20:39:47 +03:00

NetPacksClient.cpp

Reorganized client source tree:

2014-07-13 20:53:37 +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

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 branch 'develop' into SDL2

2014-07-02 17:15:12 +04:00

VCMI_client.rc

…

VCMI_client.vcxproj

Trying to sort out project changes and compile issues.

2014-06-23 19:58:19 +02:00

VCMI_client.vcxproj.filters

Trying to sort out project changes and compile issues.

2014-06-23 19:58:19 +02:00

vcmi.icns

Mac OS patch from stopiccot

2012-12-01 06:30:52 +00:00

vcmi.ico

…