ArseniyShestakov c83f15e413 Merge branch 'develop' into feature/tavernRumors ...

Conflicts:
	lib/CGameState.h

2015-12-05 01:01:26 +03:00

..

CAdvmapInterface.cpp

CTerrainRect::mouseMoved: don't pass curHoveredTile by reference

2015-11-18 03:14:58 +03:00

CAdvmapInterface.h

Add "override" to virtual overriden methods

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

CCastleInterface.cpp

Castle gate: only allow teleport to own Inferno towns

2015-10-15 05:28:28 +03:00

CCastleInterface.h

Add "override" to virtual overriden methods

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

CCreatureWindow.cpp

Fix mantiss 1965

2015-08-25 12:16:47 +03:00

CCreatureWindow.h

Large refactoring of button classes:

2014-08-03 14:16:19 +03:00

CHeroWindow.cpp

CHeroWindow: block dismiss button if there no other heroes and no towns

2015-03-12 23:47:46 +03:00

CHeroWindow.h

Add "override" to virtual overriden methods

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

CKingdomInterface.cpp

fix #2080. No more articaft exchange between heroes in kingdom overview.

2015-02-14 20:24:18 +03:00

CKingdomInterface.h

Add "override" to virtual overriden methods

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

CQuestLog.cpp

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

CQuestLog.h

Add "override" to virtual overriden methods

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

CSpellWindow.cpp

SDL1 wipe, part 4. Codebase cleanup finished. Untested.

2015-06-21 01:59:32 +03:00

CSpellWindow.h

TOWN_PORTAL callback is too specific to ba part on spellwindow class

2015-02-26 08:39:46 +03:00

CTradeWindow.cpp

Merge pull request #72 from ArseniyShestakov/fixTradeWindow

2014-12-26 09:57:40 +01:00

CTradeWindow.h

Add "override" to virtual overriden methods

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

CWindowObject.cpp

Split CIntObjectClasses into multiple smaller files. This should be the last change in files

2014-07-15 10:14:49 +03:00

CWindowObject.h

Add "override" to virtual overriden methods

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

GUIClasses.cpp

Thieves Guild: fix tavern map object, lvl 0 when no taverns owned

2015-12-04 18:38:57 +03:00

GUIClasses.h

Add "override" to virtual overriden methods

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

InfoWindows.cpp

implemented VISIONS spell (partially)

2015-02-26 08:39:56 +03:00

InfoWindows.h

Add "override" to virtual overriden methods

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