games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
5,563 Commits 19 Branches 63 Tags 113 MiB
3a1a8e3d47
Commit Graph

2220 Commits

Author SHA1 Message Date
Zyx-2000
3a1a8e3d47 further refactoring-related changes 2016-01-29 15:16:14 +01:00
Zyx-2000
c3e8c8bc1c Merge branch 'develop' into FileInfo 2016-01-27 19:21:43 +01:00
ArseniyShestakov
4e8486da7b Merge pull request #160 from vmarkovtsev/issue/2388 
Fix 2388 obelisks puzzle revealing
 2016-01-27 20:49:03 +03:00
AlexVinS
d7c0c3759a Merge branch 'Zyx-develop' into develop 
Conflicts:
	lib/filesystem/AdapterLoaders.h
 2016-01-27 18:53:41 +03:00
Vadim Markovtsev
9f3313524e Fix 2160 dismissing a VIP hero 2016-01-27 17:10:19 +03:00
AlexVinS
bffdc2813d revert some project changes 2016-01-27 15:21:29 +03:00
Zyx-2000
70e3c81b9f Replaced CFileInfo with more correct and efficient alternative 2016-01-26 14:51:38 +01:00
Vadim Markovtsev
40cb48d65e Replace std::remove_if with vstd::erase_if 2016-01-26 10:19:58 +03:00
Vadim Markovtsev
afa95312ba Fix 2139 captured spell scroll descriptions 2016-01-25 08:49:26 +03:00
Vadim Markovtsev
9ffd0155e6 Fix 1810 suggest artifact assembly 2016-01-23 16:24:43 +03:00
Alexander Shishkin
17d0e9c66e Merge pull request #169 from vmarkovtsev/issue/2014 
Fix 2014 cursor must disappear during movement and Magi's Eye
 2016-01-23 01:54:15 +03:00
Vadim Markovtsev
a266154b26 Fix 2014 cursor must disappear during movement and Magi's Eye 2016-01-23 00:35:41 +03:00
Vadim Markovtsev
f2376485e3 Fix 1799 not updated hero info box on artifact pickup 2016-01-22 23:30:24 +03:00
DjWarmonger
b02bd61c83 Merge pull request #164 from vmarkovtsev/issue/1821 
Fix 1821 artifact assembly statusbar text
 2016-01-21 09:37:43 +01:00
Vadim Markovtsev
b1f3480c68 Fix 1821 artifact assembly statusbar text 2016-01-21 10:50:53 +03:00
Vadim Markovtsev
419bde8997 Fix 2358 swapped garrison <-> visiting status text 2016-01-21 09:59:39 +03:00
Vadim Markovtsev
e8db456beb Reset obelisks upon game end 
Otherwise, the static variables are preserved and lead to wrong values in next new game.
 2016-01-20 13:02:52 +03:00
Vadim Markovtsev
10f888a483 Fix obelisks puzzle revealing 
Teams and players were messed up in lib; hardcoded constants were refactored.
 2016-01-20 10:44:13 +03:00
Vadim Markovtsev
74111b7689 Return missing building name instead of crashing in CComponent::getSubtitleInternal 2016-01-19 10:35:10 +03:00
Zyx-2000
a50a702073 switched to -std=gnu++11 2016-01-18 17:49:07 +01:00
Vadim Markovtsev
7c7bb39904 Enable right mouse button click emulation on MacOSX 2016-01-18 16:07:17 +03:00
Arseniy Shestakov
cacc811ed8 CAdvMapInt: keep old path if non-accessible tile clicked. Fix issue 2380 2016-01-17 07:48:21 +03:00
Zyx-2000
43b364bcd4 compilation fixes... 2016-01-16 19:00:53 +01:00
Zyx-2000
cf61837ced replaced std::string with boost::filesystem::path in several places 2016-01-16 16:36:16 +01:00
Arseniy Shestakov
530fe04c75 CAdvMapInt::updateMoveHero: proper indeterminate check. Fix issue 2074 2016-01-15 19:30:43 +03:00
Zyx-2000
f9b255c896 Cleaner code & MSVC compatibility 2016-01-12 22:40:05 +01:00
Zyx-2000
1f4bc0f2e4 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2016-01-11 22:38:47 +01:00
Arseniy Shestakov
a39e61373c Deactivate CAdvMapInt while quick combat is going. Fix issue 2354 
If quick combat calculation take a while it's possible to give hero movement command before battle is finished. This will lead to client freeze or crash. To avoid this we must lock adventure interface until battle calculation is finished.
 2016-01-10 18:00:24 +03:00
Zyx-2000
203b2dccc3 hopefully fixed things 2016-01-09 21:23:55 +01:00
Arseniy Shestakov
46e3d849af Avoid crashes caused by mouse events. Fix issue 1955 
Mouse handling code need refactoring, but for now we at least shouldn't crash.
 2016-01-09 15:32:42 +03:00
Arseniy Shestakov
9fd1cff090 Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared 
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
 2015-12-29 05:43:33 +03:00
Arseniy Shestakov
29a7934a99 Refactoring: avoid using namespace when it's not absolutely needed 2015-12-29 02:14:08 +03:00
Arseniy Shestakov
8eb4f14ff0 MoraleLuckBox: handle BLOCK_LUCK bonus. Fix issue 2130 2015-12-24 22:35:32 +03:00
Arseniy Shestakov
6f5c52a229 Refactoring: use cleaner CCreatureSet::stacksCount everywhere 2015-12-24 21:30:57 +03:00
ArseniyShestakov
87eaa78ffd Restore testing option changes overriten by merge 2015-12-19 12:12:35 +03:00
Ivan Savenko
a051a08a46 Merge remote-tracking branch 'origin/issue/2306' into develop 2015-12-18 22:21:11 +02:00
ArseniyShestakov
1ec7d14637 Client: add command line options to simplify multi-instance testing 
Use these when you need to run multiple instances of VCMI simultaneously.
--testingport is port used to start server. Override port number from configuration files.
--testingfileprefix is prefix for auto save filenames.
Both options has to be set in order to work.
 2015-12-13 22:14:37 +03:00
ArseniyShestakov
8792c23372 CPlayerInterface: if autoskip enabled dont center view on town / hero 2015-12-11 11:21:35 +03: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
ArseniyShestakov
05a34fb417 Use "Favorable" instead of "Favourable" everywhere for consistency 
Original game of course used american english version so we stick to it.
 2015-12-06 02:23:41 +03:00
AlexVinS
0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 
s reverts commit fa8a282696.

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
360ebcce7e Merge pull request #145 from vcmi/feature/tavernRumors 
Tavern rumors and Thieves Guild fixes
 2015-12-05 03:13:25 +03:00
ArseniyShestakov
0a5e9c0fbe Merge pull request #144 from vcmi/fix/teleportMultiExitPoints 
Support for exit selection between multiple teleport exit points
 2015-12-05 03:12:17 +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
ArseniyShestakov
3800bd45b7 Movement: initialize destinationTeleportPos with invalid int3 position 2015-12-04 01:54:25 +03:00
Ivan Savenko
7b5a7f43ad Removed includes of CGameState from headers 2015-12-02 21:39:53 +02:00