DjWarmonger a842068d54 Merge pull request #30 from vcmi/RMG ...

Since there are no objections, I finally merge this branch.

2014-07-23 08:06:51 +01:00

..

battle

centralize key color management

2014-07-02 22:20:54 +04:00

gui

Fix usage of fillRect.

2014-07-05 01:52:11 +04:00

icons

…

AdventureMapClasses.cpp

Merge branch 'develop' into SDL2

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

AdventureMapClasses.h

…

CAdvmapInterface.cpp

Fix threaded handlers initialization, cleanup

2014-07-03 12:26:15 +04:00

CAdvmapInterface.h

Fixed #1820, better detection of object below cursor that uses same logic as renderer

2014-07-01 17:19:08 +03:00

CAnimation.cpp

centralize key color management

2014-07-02 22:20:54 +04:00

CAnimation.h

…

CBitmapHandler.cpp

More ColorKey cleanup

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

CBitmapHandler.h

…

CCastleInterface.cpp

Finally shattered CObjectHandler.cpp into tiny bits

2014-06-05 19:52:14 +03:00

CCastleInterface.h

Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day

2014-04-24 23:36:18 +04:00

CCreatureWindow.cpp

…

CCreatureWindow.h

…

CDefHandler.cpp

Refactoring towards backward compatibility (WiP)

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

CDefHandler.h

…

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

CHeroWindow.cpp

Finally shattered CObjectHandler.cpp into tiny bits

2014-06-05 19:52:14 +03:00

CHeroWindow.h

Cleanup:

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

CKingdomInterface.cpp

Refactoring of hoverText from objects:

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

CKingdomInterface.h

…

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

CMake/WIN32 : add icon to client and launcher

2014-07-14 01:02:00 +03:00

CMessage.cpp

More ColorKey cleanup

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

CMessage.h

…

CMT.cpp

Cleanup

2014-07-03 19:57:21 +04: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

More cleanup:

2014-06-05 23:51:24 +03:00

CPlayerInterface.cpp

Run all rendering with pim lock if possible

2014-07-03 22:05:59 +04:00

CPlayerInterface.h

More safe way of update locking

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

CPreGame.cpp

RMG will now actually use all the settings from pregame. Till now it did not.

2014-07-15 16:44:07 +02:00

CPreGame.h

More safe way of update locking

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

CQuestLog.cpp

Refactoring of hoverText from objects:

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

CQuestLog.h

…

CSpellWindow.cpp

Cleanup:

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

CSpellWindow.h

…

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

Fix threaded handlers initialization, cleanup

2014-07-03 12:26:15 +04:00

Graphics.h

…

GUIClasses.cpp

Fix puzzle map fade.

2014-07-03 23:06:11 +04:00

GUIClasses.h

Implement Unicode support for ingame console

2014-07-02 19:16:05 +04:00

Info.plist

…

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

Merge branch 'develop' into SDL2

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

OSX.mm

…

resource.h

…

SDLMain.h

…

SDLMain.m

…

StdInc.cpp

…

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.mingw.rc

CMake/WIN32 : add icon to client and launcher

2014-07-14 01:02:00 +03:00

VCMI_client.rc

…

VCMI_client.vcxproj

Updated Visual projects for SDL2.

2014-07-15 12:26:18 +02:00

VCMI_client.vcxproj.filters

Updated Visual projects for SDL2.

2014-07-15 12:26:18 +02:00

vcmi.icns

…

vcmi.ico

…