games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-01 12:57:51 +02:00
Code Issues Releases Activity
9,193 Commits 22 Branches 66 Tags
Commit Graph

394 Commits

Author SHA1 Message Date
Arseniy Shestakov
6f5c52a229 Refactoring: use cleaner CCreatureSet::stacksCount everywhere 2015-12-24 21:30:57 +03:00
Ivan Savenko
a051a08a46 Merge remote-tracking branch 'origin/issue/2306' into develop 2015-12-18 22:21:11 +02:00
ArseniyShestakov
ab92123da3 CPathfinder: improve support for visits and battles in teleports 
Related movement code for client and AI is plumbed as well. Though at moment code still not finished because it's not teleport hero to the exit tile if he won battle.
 2015-12-11 09:42:30 +03:00
ArseniyShestakov
07807fb044 Client: slience visibility error on shipyard in non-coastal town 2015-12-08 07:33:13 +03:00
ArseniyShestakov
03e9dd3bab Add hero gold cost to GameConstants 2015-12-07 00:13:58 +03:00
ArseniyShestakov
807fd6391b CAdvMapInt: block spellbook button when no hero selected 2015-12-06 03:12:39 +03:00
AlexVinS
0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 
s reverts commit fa8a2826963b3089a758beea6e61af0a660bdbf6.

Conflicts:
	AI/VCAI/VCAI.cpp

Conflicts:
	AI/VCAI/VCAI.cpp
	client/windows/CAdvmapInterface.cpp
	lib/CPathfinder.cpp
	lib/CPathfinder.h
 2015-12-05 12:56:12 +03:00
ArseniyShestakov
c83f15e413 Merge branch 'develop' into feature/tavernRumors 
Conflicts:
	lib/CGameState.h
 2015-12-05 01:01:26 +03:00
ArseniyShestakov
2a63ba148a Thieves Guild: fix tavern map object, lvl 0 when no taverns owned 
We also now check not number of towns, but only towns that has tavern built. Also according to original mechanics all taverns always display information based on your number of taverns and not number of taverns of object owner.
 2015-12-04 18:38:57 +03:00
Ivan Savenko
c3ce4b25df Removed all #include's of CMap.h from headers. 
To all - please, avoid #include's in headers as much as possible
This kills incremental build compile times
 2015-12-02 21:05:10 +02:00
ArseniyShestakov
6704ea0cff Rumors: rename getTavernGossip to getTavernRumor for consistency 
Original game used "Rumors" and not "Gossips" and we already using rumor in CMap.
 2015-11-30 17:51:28 +03:00
ArseniyShestakov
def0f0ef0a CTerrainRect::mouseMoved: don't pass curHoveredTile by reference 
This does cause problems because curHoveredTile can change while reference still being used by CAdvMapInt::tileHovered.
 2015-11-18 03:14:58 +03:00
ArseniyShestakov
ab9680a7d9 CPathfinder: handle event object properly everywhere 
Also add forgoted check for AdvmapInterface to avoid possible crash.
 2015-11-17 07:09:01 +03:00
ArseniyShestakov
5106738160 Merge branch 'develop' into feature/pathfinderLayers 2015-11-09 19:20:13 +03:00
ArseniyShestakov
a49950e958 Fix 2292. Fix chat on adventure map, increase maxOutputPerLine 2015-11-08 22:16:58 +03:00
ArseniyShestakov
4973a1ec90 CGPathNode: get rid of land member as it's now obsolete 
CTerrainRect::showPath behaviour changed so it's will only add cross path graphics on embark/disembark and path ending.
We want continuous paths for flying and water walking even when land<-> water transition occur.
 2015-11-08 04:01:58 +03:00
ArseniyShestakov
842da69a3e CAdvMapInt::tileHovered cleanup function a bit more 2015-11-08 03:33:01 +03:00
ArseniyShestakov
160fa38254 Client: change cursor using node action information of pathfinder 2015-11-08 03:10:48 +03:00
ArseniyShestakov
2b6e1498d2 Pathfinding: change argument order for getPath and AUTO layer as default 
This still need investigation, but likely most of external code shouldn't be aware of layers in order to work properly because only LAND and SAIL can be targeted and single tile can't have both of these layers.
 2015-11-02 11:14:32 +03:00
Vadim Markovtsev
e6e975e9ef Fix adventure map movement segfault in some scenarios 2015-10-31 20:23:13 +03:00
ArseniyShestakov
c3c31e90ff Castle gate: only allow teleport to own Inferno towns 
This is how that works in H3. And on server side it's checked already anyway.
Though it's must be possible to teleport from ally Inferno to your own if both have Castle Gate.
 2015-10-15 05:28:28 +03:00
Vadim Markovtsev
e4b1ef1405 Add "override" to virtual overriden methods 2015-10-13 21:05:36 +03:00
AlexVinS
1510f1f14c CQuestLog: boost::bind->std::bind 2015-09-02 20:00:56 +03:00
Sandy Carter
219ce45866 CastleInterface: Fix tooltip saying Empty after swapping armies 2015-08-25 09:22:25 -04:00
AlexVinS
68e3948242 Fix mantiss 1965 2015-08-25 12:16:47 +03:00
Sandy Carter
ae6d3c9138 CCastleInterface: Enable right click on Hero Info 2015-08-24 13:31:03 -04:00
Sandy Carter
bf353a4f5b windows: Replace CToggleGroup volume widget with CVolumeSlider 2015-08-22 12:40:14 -04:00
Sandy Carter
bdee647525 CastleInterface: Exclude previous building upgrade in reqs 
Hide CityHall from Capitol prerequisites in Capitol build window
 2015-08-19 12:05:43 -04:00
AlexVinS
a8c45df732 Merge branch 'SDL1Wipe' into develop 2015-06-22 14:24:00 +03:00
AlexVinS
f81116e04d Fix mantiss #2208 2015-06-21 20:30:19 +03:00
AlexVinS
ed281a3cc6 SDL1 wipe, part 4. Codebase cleanup finished. Untested. 2015-06-21 01:59:32 +03:00
AlexVinS
b6a2323e01 SDL1 wipe, part 2. Untested. 2015-06-21 01:59:31 +03:00
AlexVinS
dca1e28bc1 SDL1 wipe, part 1. Untested. 2015-06-21 01:59:30 +03:00
AlexVinS
2cb6cb7baa Remove useless durationType selector 
* duration is a mask, equality comparison is not enough
 2015-06-02 07:12:02 +03:00
AlexVinS
3c9e4916b6 Fix printing stack stats in battle 2015-04-11 14:05:00 +03:00
AlexVinS
a061e3c2f7 Fix use-after-free in spell window 2015-04-11 10:18:40 +03:00
AlexVinS
6c334174d9 Use and check movement points in town portal. 
* fixes mantiss 0002031
 2015-04-01 04:48:50 +03:00
AlexVinS
d564520f04 Allow town portal to ally town. 
fixes mantiss 0002064
 2015-04-01 04:04:02 +03:00
ArseniyShestakov
4f3eb919e5 CHeroWindow: block dismiss button if there no other heroes and no towns 
This one resolve mantis issue 530.
 2015-03-12 23:47:46 +03:00
AlexVinS
f4c683cd5e Move VievXXX logic to server side (except expert ViewEarth) 2015-02-26 17:15:17 +03:00
AlexVinS
b846b717a1 implemented VISIONS spell (partially) 
(-) todo: agressivnes
 2015-02-26 08:39:56 +03:00
AlexVinS
36cdb2968b Refactoring 2015-02-26 08:39:54 +03:00
AlexVinS
f6e83685e7 Initial implementation of VIEW_AIR & VIEW_EARTH 2015-02-26 08:39:52 +03:00
AlexVinS
685deddac1 Start spell-relatet files reorganisation 
* moved existing files to separate directory
-> todo: split mechanics
 2015-02-26 08:39:48 +03:00
AlexVinS
c7c235c0ca Rename afterCast to applyBattle 
* afterXXX will be used in future event-driven mechanics
 2015-02-26 08:39:47 +03:00
AlexVinS
66ca4bc0c2 TOWN_PORTAL callback is too specific to ba part on spellwindow class 2015-02-26 08:39:46 +03:00
AlexVinS
33f22bf2fc More flixible way of spell cast on client side 
(+) more support for custom adventure spells
 2015-02-26 08:39:45 +03:00
AlexVinS
a3f2667376 Remove some deprecated fields from CSpell 
* now only new SpellScholl API is used
(!) untested
 2015-02-26 08:39:43 +03:00
ArseniyShestakov
00de870f17 Check input destination position when moving using arrow keys 
This one fix crash I reported in 2085
 2015-02-22 10:05:24 +03:00
ArseniyShestakov
a6ce45e867 Cursor: show battle cursor for garrison if there creature behind 
This one fixed issue 1563
 2015-02-22 09:34:02 +03:00