2911 Commits

Author	SHA1	Message	Date
Arseniy Shestakov	5a387cdaf1	Town: update appearance in applyGs to avoid desyncs. Fix issue 2464 ... Netpacks NewStructures and RazeStructures	2016-08-24 05:15:04 +03:00
AlexVinS	439aeecc8b	[c::b] re-enabled PCH, tested with GCC 5.3. (Older versions may not work)	2016-08-18 13:40:35 +03:00
Arseniy Shestakov	948cca02cc	Fixes to some crashes on exit and to have cleaner valgrind output	2016-08-18 06:52:10 +03:00
AlexVinS	e4091c05ec	fixed unitialized value field	2016-08-17 09:49:43 +03:00
AlexVinS	36c44c2ce7	projects update	2016-08-13 16:57:11 +03:00
AlexVinS	72f79a3ad7	Draft boost::format based log proxy.	2016-08-13 16:57:09 +03:00
Arseniy Shestakov	3a1a6cf338	CBattleInterface: fix crash on defeat in tactics phase. Fix issue 2440 ... It's possible to lose all mobile stacks if you move them on moat so tactics phase must end in that case.	2016-08-09 18:15:58 +03:00
AlexVinS	6e24d1e929	Applied patch by rumianom from http://bugs.vcmi.eu/view.php?id=2442	2016-08-01 18:28:14 +03:00
Arseniy Shestakov	4240ecad01	One more small fix for possible issues with gate surface	2016-03-14 13:11:04 +03:00
Arseniy Shestakov	af05b025e7	CBattleInterface: avoid crashes on gate state changes. Fix issue 2415	2016-03-14 10:37:43 +03:00
Arseniy Shestakov	10dbbead2d	Fix indentation of logging code and around it ... That wouldn't be as big issue if problem affected few files, but it everywhere in codebase. Fixed it everywhere since in most files that is the only code with wrong indentation.	2016-03-12 04:46:21 +03:00
Arseniy Shestakov	faae305ec0	CTradeWindow: avoid crash when right click on artifact ... Fix suggested by @argarak in PR #199	2016-03-12 03:19:38 +03:00
ArseniyShestakov	7886e8986e	Merge pull request #197 from vcmi/issue/2304_2418 ... Issues/2304/2418/2293	2016-03-01 15:20:59 +03:00
AlexVinS	3873e5047e	Attempt to fix 2293	2016-03-01 13:24:46 +03:00
DjWarmonger	8f1fba9551	Merge pull request #146 from vcmi/feature/VCMIMapFormat1 ... Ok let's try it.	2016-03-01 07:49:54 +01:00
AlexVinS	42af83f0dd	Added todo note about ghost stack fadeout	2016-03-01 05:39:04 +03:00
AlexVinS	5c716f6581	Fix hackfix for ghost stack drawing	2016-03-01 04:41:51 +03:00
AlexVinS	94770e7598	Cleanup	2016-03-01 03:09:50 +03:00
AlexVinS	ace52cfdb1	Hackfix for ghost stack draw.	2016-02-29 05:09:13 +03:00
AlexVinS	f890037008	Fixes	2016-02-29 04:42:15 +03:00
AlexVinS	9036d39241	Do not remove battle stacks, make them ghosts instead. ... * exclude ghost stacks from (hopefully all) get* results for now	2016-02-28 01:08:56 +03:00
Arseniy Shestakov	4f7664926e	New console commands for AI debugging: gosolo and controlai ... gosolo: make AI to take over every human player in game. Second command would give control back to CPlayerInterface. controlai: give control of one or all AI players to CPlayerInterface. Command "controlai orange" turn orange to human player while "controlai" without color specified make all AIs human controlled players.	2016-02-25 00:38:10 +03:00
AlexVinS	150fcc9422	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1	2016-02-15 13:39:00 +03:00
ArseniyShestakov	c550484613	Merge pull request #181 from vcmi/feature/drawbridgeMechanics ... Feature/drawbridge mechanics	2016-02-14 16:32:24 +03:00
Arseniy Shestakov	f453172d53	CBattleInterface: cleaner implementation of optional drawbridge blit ... Checking against nullptr isn't clean solution so we only blit in case gate opened or destroyed.	2016-02-14 15:38:58 +03:00
Arseniy Shestakov	2cfdfca7e5	Battles: fix more cases where invalid wall hex position present	2016-02-14 14:38:24 +03:00
AlexVinS	fb322b41bc	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1	2016-02-14 12:14:57 +03:00
Arseniy Shestakov	c5cfc8467f	Battles: change naming from drawbridge to gate for everything ... This way code is shorter and cleaner while in future we may support towns with gate only.	2016-02-13 17:40:31 +03:00
Arseniy Shestakov	b946c52242	CBattleInterface: introduce EWallVisual instead of ids with comments	2016-02-13 17:10:14 +03:00
Arseniy Shestakov	422d5cabdf	CBattleInterface: first pass on client drawbridge visualization	2016-02-10 07:10:32 +03:00
AlexVinS	0c21efb202	Start integration of map format into engine	2016-02-09 20:20:03 +03:00
DjWarmonger	d775e40eba	Fixed typo.	2016-02-09 15:15:45 +01:00
DjWarmonger	4de0f0f973	Compile fixes for MSVS.	2016-02-09 11:08:20 +01:00
ArseniyShestakov	890ae43f55	Merge pull request #180 from Zyx-2000/FileInfo ... Refactored CFileInfo & ResourceID	2016-02-08 04:55:39 +03:00
ArseniyShestakov	5f23091770	Merge pull request #184 from Zyx-2000/musicstreaming ... support for music streaming	2016-02-08 03:07:32 +03:00
Vadim Markovtsev	bdd87be10d	Try to fix http://bugs.vcmi.eu/view.php?id=2362	2016-02-02 11:46:33 +03:00
Zyx-2000	b0bb7f1f25	copyright stuff	2016-01-31 11:13:56 +01:00
Zyx-2000	33d0738859	support for music streaming	2016-01-30 22:34:46 +01:00
AlexVinS	ba017c443d	Start from diff of pull request #124 from vcmi/issue/1372	2016-01-29 21:05:17 +03:00
Zyx-2000	7fbd5479e2	alignment & makefile fix	2016-01-29 16:08:44 +01:00
Zyx-2000	3a1a8e3d47	further refactoring-related changes	2016-01-29 15:16:14 +01:00
Vadim Markovtsev	32ece9513d	Fix 2331 save menu keyboard event leak ... The control flows the following way: - we receive SDL_KEYDOWN with letter 's' in the adventure map interface - save dialog opens - text input receives focus - text input enables receiving SDL_KeyboardEvent-s which go between DOWN and UP - the button on keyboard becomes UP (the menu opens very fast) - text input receives SDL_KeyboardEvent and inserts 's' - text input receives SDL_KEYUP So the apparent fix is to open the save dialog on SDL_KEYUP event	2016-01-28 10:26:40 +03: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
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	b5100bee94	Teleport: rework code to support exit point selection for whirlpools	2015-12-02 17:56:26 +03: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	f55bfe41d6	Digging: implement digging status on right click. Fix issue 401 ... This is also fix possibility to dig on some non-blockable objects like event.	2015-11-29 12:34:23 +03:00
ArseniyShestakov	f940e3ed42	Fix issue 2239. Pillarbox when restored after alt-tab in fullscreen ... This isn't best solution and all SDL-related code need refactoring, but it's works.	2015-11-29 01:56:18 +03:00
ArseniyShestakov	745ab7c7df	One more fix for options	2015-11-25 07:40:35 +03:00
ArseniyShestakov	2276af70dc	PreGame: avoid crashing on random map options ... Options is still broken, but at least we shouldn't crash there.	2015-11-25 07:25:44 +03:00
ArseniyShestakov	a851062891	Merge pull request #133 from vcmi/feature/pathfinderLayers ... Pathfinder layers and related changes: fly and water walking implemented	2015-11-24 13:09:06 +03:00
ArseniyShestakov	fc06db4c4f	Move STRONG_INLINE define into Global.h	2015-11-22 07:14:52 +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	511bb54644	doMoveHero: only allow to stop at accessible or land/sail nodes	2015-11-17 17:46:26 +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
AlexVinS	d6bb599bc8	Another ffmpeg api fix	2015-11-14 03:59:16 +03:00
AlexVinS	c9ad7167d1	another try to fix travis build.	2015-11-11 16:27:04 +03:00
AlexVinS	e20f861727	try to fix travis build. ... What an ancient version of ffmpeg does it have?	2015-11-11 15:44:17 +03:00
AlexVinS	f9dfa8d0c2	try to fix libav 9.18	2015-11-11 15:18:05 +03:00
AlexVinS	33c933c208	All "old" APIs are deprecated in ffmgeg 2.2.3 - remove them entirely	2015-11-11 13:07:56 +03:00
AlexVinS	4b94efe6b5	Hopefully proper fix for ffmpeg on MSVS	2015-11-11 12:41:28 +03:00
DjWarmonger	5fadb239f2	Merge pull request #134 from edeksumo/Fix-Defence-Ani ... Let's try this.	2015-11-11 09:43:51 +01:00
DjWarmonger	d95a999e23	Fixed ffmpeg compilation on Visual Studio.	2015-11-11 09:41:28 +01: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
edeksumo	ba1062ed3c	Formating2 ... Change ani to anim	2015-11-07 23:30:01 +01:00
Ivan Savenko	3aa5360ac6	Merge pull request #135 from josch/develop ... Replace deprecated FFmpeg API for compatibility with ffmpeg 2.9	2015-11-07 11:23:30 +02:00
AlexVinS	e645b46aed	Revert "Merge pull request #124 from vcmi/issue/1372" ... This reverts commit da01af319b, reversing changes made to 8b6b4e2e0b.	2015-11-07 11:35:02 +03:00
Andreas Cadhalpun	f80c1410b3	Replace deprecated FFmpeg API for compatibility with ffmpeg 2.9	2015-11-05 12:38:04 +01:00
ArseniyShestakov	c188ff0a92	doMoveHero: dont stop movement on guarded tiles when transit used	2015-11-05 10:37:22 +03:00
ArseniyShestakov	ac12a0735e	Plumbing on client and server to make flying actually work	2015-11-05 10:02:13 +03:00
edeksumo	dd525da153	Formatting	2015-11-04 23:37:53 +01:00
edeksumo	75a76c0bf0	FixDefenceAni	2015-11-04 00:19:40 +01:00
AlexVinS	4b5cb3599a	Do not try to rise demons from war machines	2015-11-03 02:20:26 +03:00
AlexVinS	6a9dc78dcd	[WiP]Added some checks for RISE_DEMONS action.	2015-11-03 02:18:36 +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
AlexVinS	d46364c4c3	Merge branch 'develop' into issue/2306 ... Need to reapply changes to pathfiner Conflicts: AI/VCAI/VCAI.cpp lib/CGameState.cpp lib/CGameStateFwd.h	2015-11-01 01:49:57 +03:00
Vadim Markovtsev	e6e975e9ef	Fix adventure map movement segfault in some scenarios	2015-10-31 20:23:13 +03:00
Vadim Markovtsev	c5ebec0d1f	Fix the second crash (dynamic_cast failure)	2015-10-27 09:09:42 +03:00
DjWarmonger	63ca9202e4	Reverted old MapHandler::hideObject to avoid weird crash.	2015-10-24 19:03:11 +02:00
DjWarmonger	a6ea0981b6	Merge branch 'develop' into mutexRelax	2015-10-24 18:30:43 +02:00
Vadim Markovtsev	0e14abd609	Fix vcmiclient CMakeLists.txt ... In my case, Frameworks was pointed to root/../Frameworks, which is wrong; WoG mod is not checked out by default, so we should give a hint from where to download it; besides, WoG is optional to run vcmi.	2015-10-17 09:23:40 +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
Alexander Shishkin	fca4deaad2	Merge pull request #122 from vmarkovtsev/feature/warnings ... Fix warnings produced by recent Clang build	2015-10-14 07:28:47 +03:00
Vadim Markovtsev	d24fd10e21	Fix std::abs warning ... Recent clang wants std::abs instead of plain abs	2015-10-13 21:05:46 +03:00
Vadim Markovtsev	e4b1ef1405	Add "override" to virtual overriden methods	2015-10-13 21:05:36 +03:00
AlexVinS	2677d4a677	Fixed action cancel on active stack remove	2015-10-08 08:15:29 +03:00
AlexVinS	f99bf099ca	Made player interface tolerant to active stack removal.	2015-10-06 03:46:35 +03:00
AlexVinS	a06e34cf61	Cleanup	2015-09-29 19:14:24 +03:00
AlexVinS	70d9be8447	Use ISpellCaster in battle callback	2015-09-29 17:26:52 +03:00
AlexVinS	d9cbe487c7	remove useless function CSpell::getTargetInfo	2015-09-29 17:26:47 +03:00
AlexVinS	2b434111bf	More hero|creature casting unification	2015-09-29 17:26:40 +03:00
AlexVinS	92990c887c	Fix creatures can always cast on self	2015-09-29 17:26:37 +03:00
ArseniyShestakov	ffb8e6a696	Garrison: fix more issues introduced in pull #115 ... After 8cad23956c there was several issues remaining: * Last creature would remain even for town garrisons. * Impossibility to move last stack even within same garrison. * Impossibility of partially merge of last stack into other hero stack. All fixed. However last stack merge to other hero will now make split window appear instead of auto merge.	2015-09-23 08:12:43 +03:00
DjWarmonger	2851832f0c	Fixed logs.	2015-09-20 14:02:52 +02:00
DjWarmonger	57637dd71a	Added some checks & logs for empty def names, but it only delays the crash.	2015-09-20 13:02:13 +02:00
DjWarmonger	e14faea181	Merge branch 'develop' of https://github.com/vcmi/vcmi into mutexRelax	2015-09-20 09:46:52 +02:00
AlexVinS	8cad23956c	Fix 2258	2015-09-19 17:16:09 +03:00
AlexVinS	d181d764bb	fix 2215	2015-09-15 10:02:27 +03:00
AlexVinS	caf8ae62cc	Allow custom effect animation on any stack during spell cast.	2015-09-14 06:21:49 +03:00
AlexVinS	0f0e67dbe3	Do not include resisted stacks in affected	2015-09-14 05:45:05 +03:00
AlexVinS	9d0a1f0eef	Added logging for CDummyAnimation creation (like other types)	2015-09-13 00:01:36 +03:00
AlexVinS	cbd8900c0b	Added CBattleConsole tracing	2015-09-12 23:03:45 +03:00
AlexVinS	075b65b31b	Use dummy animations	2015-09-12 21:09:53 +03:00
AlexVinS	832d69ec11	Hide battle log algorithm in spell classes. ... * not finished, to be moved to json of splitted between mechanics classes	2015-09-12 21:09:51 +03:00
AlexVinS	5d0ecd9cdf	More battle log refactoring	2015-09-12 21:09:50 +03:00
AlexVinS	7cf9bd36b7	Display AGE effect with any value (not only -50%).	2015-09-12 21:09:49 +03:00
AlexVinS	3a5a02e73b	Use boost::fromat in CBattleInterface::spellCast	2015-09-12 21:09:48 +03:00
AlexVinS	805c839761	More CBattleInterface::spellCast refactoring	2015-09-12 21:09:47 +03:00
AlexVinS	8171924eb4	More simplification of CBattleInterface::spellCast ... * was started in previous branch	2015-09-12 21:09:46 +03:00
AlexVinS	9482852020	few tweaks	2015-09-12 21:09:45 +03:00
AlexVinS	fb5903d610	Initial experiments on hero & creature casting unification	2015-09-12 21:09:44 +03:00
AlexVinS	28087099b8	More correct usage of SDL_Palette	2015-09-05 15:03:37 +03:00
AlexVinS	8f2da66a18	fix mantiss 1967 + some refactoring ... * remove TModDescr and realted APIs - they were only used in one place	2015-09-04 22:29:20 +03:00
AlexVinS	e82dfb5a85	fixed mantiss 0002254	2015-09-04 18:08:25 +03:00
AlexVinS	1510f1f14c	CQuestLog: boost::bind->std::bind	2015-09-02 20:00:56 +03:00
AlexVinS	b512005d38	Get rid of CSDL_Ext::colorSetAlpha	2015-09-02 18:49:29 +03:00
AlexVinS	e80c8d16a6	Cleanup CDefHandler	2015-09-02 18:27:56 +03:00
DjWarmonger	32f3f9d76d	Fixed high CPU usage by mapHandler::hideObject	2015-08-31 11:07:35 +02:00
Sandy Carter	a79ade7d44	Garrison: Move all but one creature when last slot	2015-08-26 08:44:23 -04:00
Sandy Carter	dafc40d896	Garrison: Fix selection behaviour when swapping with ally	2015-08-26 08:40:00 -04:00
Sandy Carter	a89ef88ce3	Garrison: Factor complex if statement to functions	2015-08-26 08:40:00 -04:00
Sandy Carter	cd13807115	Garrison: Clarify upg by turning into a class enum	2015-08-26 08:39:57 -04:00
Sandy Carter	b008d24c68	Garrison: Refactor Left Click ... Restructure large nested if statements into more shallow blocks Factor out contents of if statements to functions for better readability * viewInfo * hightlightOrDropArtifact * split	2015-08-25 09:47:23 -04:00
Sandy Carter	3d327e650a	Garrison: Boyscouting: simplify clickLeft	2015-08-25 09:47:23 -04:00
Sandy Carter	c02700853a	Garrison: Disable split buttons when visiting ally	2015-08-25 09:47:23 -04:00
Sandy Carter	742f244426	Garisson: Documentation: Convert comments to doc	2015-08-25 09:47:23 -04:00
Sandy Carter	6ffb03cba3	Garrison: Documentation for our() and ally()	2015-08-25 09:47:21 -04:00
Sandy Carter	219ce45866	CastleInterface: Fix tooltip saying Empty after swapping armies	2015-08-25 09:22:25 -04:00
Sandy Carter	b2da2b8ef0	Garrison: Show "(in garisson)" for garissoned heroes' creatures	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	236492ed39	widgets: Cleanup musicButton specific hacks	2015-08-22 12:40:14 -04:00
Sandy Carter	bf353a4f5b	windows: Replace CToggleGroup volume widget with CVolumeSlider	2015-08-22 12:40:14 -04:00
Sandy Carter	6a3c2d3071	gui: Fix in parameter for scroll events ... Refetch mouse position before checking if mouse is in widget Rect Give acurate position of the mouse when scrolling	2015-08-22 12:40:14 -04:00
Sandy Carter	9d62a2f0a1	Buttons: Add CVolumeSlider widget ... New widget specifically for volume settings. Replace previous implementation using 10 toggle buttons. Enable indicator animation Fix indicator ghosting when drag and releasing Add scroll capability to volume Volume now can be adjusted from 0 - 99 with the mouse or the scroll wheel	2015-08-22 12:40:14 -04:00
Sandy Carter	c6b51a7beb	Boyscouting: Fix doxygen format ... Remove commas to separate param from description Use three slashes-style	2015-08-22 12:40:14 -04:00
Sandy Carter	f28c33001c	Boyscouting: Fix typo in comment	2015-08-22 12:40:14 -04:00
Sandy Carter	a14711b3b4	Boyscouting: Fix backwards ternary operator	2015-08-22 12:40:14 -04:00
AlexVinS	371e4b8714	Fix mantiss 2235, 2237	2015-08-22 16:47:40 +03:00
AlexVinS	782c8ec40b	Changed windows minimum version back to winxp due to mingw bug ... * will be changed back after newer mingw tests	2015-08-20 04:22:54 +03:00
AlexVinS	03a295f1a0	Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts	2015-08-20 03:28:04 +03: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	5f7a90237c	More smooth fps counter	2015-06-23 01:08:25 +03:00
AlexVinS	958d596d54	Do not raise on non critical error	2015-06-23 01:07:35 +03:00
AlexVinS	32c15a8266	Extract fps counter drawing	2015-06-22 23:57:34 +03:00
AlexVinS	f58148cd94	Capture SDL log ... * just a stub for now	2015-06-22 22:19:32 +03:00
AlexVinS	cc669b0ae7	Move gui locking to GUIHandler	2015-06-22 21:53:47 +03: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	53b85d16be	Cleanup C::B projects	2015-06-21 01:59:33 +03:00
AlexVinS	ed281a3cc6	SDL1 wipe, part 4. Codebase cleanup finished. Untested.	2015-06-21 01:59:32 +03:00
AlexVinS	8c236e30bb	SDL1 wipe, part 3. 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	56a1805339	Merge branch 'issue/2185' into develop	2015-06-20 19:16:41 +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
DjWarmonger	6890ae9f02	- Fixed improper use of playersCount. Now RMG can generate maps up to 8 players, with CPU players only as well. ... - Fixes for template scheme	2015-05-27 11:30:46 +02:00
AlexVinS	3c9e4916b6	Fix printing stack stats in battle	2015-04-11 14:05:00 +03:00
AlexVinS	e1deff089d	Actually use ANY_CREATURE possible action ... * this fixes mantiss 0002140	2015-04-11 10:56:35 +03:00
AlexVinS	a061e3c2f7	Fix use-after-free in spell window	2015-04-11 10:18:40 +03:00
Fay	1cb54689cf	Prevents first aid tents from melee attacking; ... Moves attack possibility checks to battle callback (for consistency with shooting checks);	2015-04-09 21:49:11 +02: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
Ivan Savenko	eef45b5ae8	Fixed warnings	2015-03-31 00:55:37 +03:00
AlexVinS	67a7cd8350	Allow FREE_LOCATION action over dead stack. This fixes 0001560	2015-03-29 16:24:43 +03:00
AlexVinS	9600446cf9	+smart target, +hit animation	2015-03-18 17:48:32 +03:00
AlexVinS	69c458e881	initial implementation.	2015-03-18 13:27:07 +03:00
ArseniyShestakov	323c4e1637	RMG Options: make "Computer only teams" buttons work as expected ... Button "0" should be always enabled and if "Computer only players" set to "0" we should also computer only team count to "0" if it's not random.	2015-03-16 16:02:52 +03:00
ArseniyShestakov	448fbe44e9	Improve CButton::block and fix CToggleGroup->selectedID ... CToggleGroup. Originally when I added initialization for selectedID I didn't find out that -1 is used for "random" buttons. So as result I fixed uninitialized variable usage, but break initial button state change in RMG options because setSelected ignore state change request because it's see -1 button already marked as selected.	2015-03-16 15:55:36 +03:00
ArseniyShestakov	120301ecc8	Split army: dont highlight down garrison slots if there no visiting hero ... Before UI always highlighted all slots in both town garrisons even if there no visiting here and you can't actually set army on these slots. Now garrison slots only highlighted if they're owned by us or our ally. If there no visiting hero in town then only suitable upper garrison slots will be highlighted.	2015-03-16 02:04:18 +03:00
ArseniyShestakov	078bf6c69c	CSelectionScreen: always use isHost and isGuest when suitable	2015-03-15 19:33:58 +03:00
ArseniyShestakov	c4000f2ac7	Multiplayer: always display flags in lobby, but block them for guest	2015-03-15 19:24:03 +03:00
ArseniyShestakov	eeff8f3ea4	Multiplayer: add sync for RMG options in lobby ... Sadly I'm not yet find proper way to block all buttons in CToggleGroup without make them invisible so it's still possible to press buttons for guest. Though CRandomMapTab::updateMapInfo is now disabled for guest so even if guest going to press multiple buttons it's not going to cause crash for him.	2015-03-13 23:33:46 +03:00
ArseniyShestakov	67aa869a33	Multiplayer: make chat history visible in lobby and improve CTextBox ... Now we'll also play sound when new message added. CTextBox::setText now will automatically change text height for slider.	2015-03-13 18:45:07 +03:00
ArseniyShestakov	1f1f61cf15	Custom campaigns list: redraw parent as we use it's background ... This one fix issue 2057	2015-03-13 18:06:19 +03:00
ArseniyShestakov	f8747a1f16	Multiplayer: don't add newly joined players to CPU-only slots	2015-03-13 15:05:12 +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
DjWarmonger	8820bc05a9	MSVS compiler doesn't allow default arguments for Lambdas.	2015-03-10 10:06:45 +01:00
DjWarmonger	ec879046ca	Merge pull request #93 from ArseniyShestakov/feature/pathfindingTeleports ... Okay let's do this!	2015-03-10 09:04:25 +01:00
DjWarmonger	f7f3c2f21a	Migrated to SDL2. It also fixes animation speed in combat. ... Library package coming soon.	2015-03-10 08:57:45 +01:00
ArseniyShestakov	5233b60243	CPlayerInterface: all new code for automatic teleport usage	2015-03-08 17:17:24 +03:00
ArseniyShestakov	21aaad6972	MoveHero: add transit movement option ... Transit is new option for hero movement. If it passed for movement then hero can get get on tile without visiting of object on it. Currently it's will be only allowed is object under destination is teleport.	2015-03-08 17:04:09 +03:00
ArseniyShestakov	25656aa586	Add showTeleportDialog everywhere except actual code for AI and player ... Just like TeleportDialog it's based off showBlockingDialog, but as number of package is higher when possible showTeleportDialog will be after other dialogs handling code.	2015-03-08 16:52:50 +03:00
ArseniyShestakov	18535db0ef	Add TeleportDialog and CTeleportDialogQuery ... TeleportDialog is based off BlockingDialog and it's needed for server to ask client what teleport hero should be teleported to. It's also contain list of possible exits, identifier of currently used channel and also impassable option. If impassable set to true then client will remember that current teleport channel is lack of exit point.	2015-03-08 16:37:33 +03:00
AlexVinS	f4c683cd5e	Move VievXXX logic to server side (except expert ViewEarth)	2015-02-26 17:15:17 +03:00
AlexVinS	025a00362b	Simplify CBattleInterface::spellCast	2015-02-26 08:39:58 +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
AlexVinS	c4cbda88ac	Fix "reorder" warnings	2015-02-21 12:39:10 +03:00
Fay	9034a9d873	Fixed crashes due to invalid ptrs during advmap objects fadeout;	2015-02-20 23:19:16 +01:00
DjWarmonger	6ac00873b9	Compilation fixes - allow SDL1. ... Please do not define class-specific constants that are static at same time.	2015-02-18 15:31:55 +01:00
DjWarmonger	2a082e6c21	Merge pull request #84 from Fayth/test/advMapFading ... If no one objects, I will try to merge this.	2015-02-18 09:52:09 +01:00
DjWarmonger	5d1fbedf85	Merge pull request #91 from Fayth/fix-advmap-restoring ... Short and clear code is always welcome.	2015-02-18 07:59:00 +01:00
ArseniyShestakov	536015f1c2	Quest Log: move slider to start when blocked ... Partially fixes problem mentioned in issue 2093	2015-02-18 00:07:03 +03:00
DjWarmonger	200bcd7da6	Merge pull request #88 from ArseniyShestakov/improvedQuestLog ... Awesome, thanks!	2015-02-17 06:44:38 +01:00
ArseniyShestakov	c0b78de6b4	Quest Log: block hide complete button when it useless ... We only want to to be checkable when there is actually any complete quests in list.	2015-02-17 06:08:35 +03:00
ArseniyShestakov	ae20499854	Quest Log: implement option to hide complete quests	2015-02-17 05:47:49 +03:00
Fay	116e1d62a1	Makes player interface recreate advmap instead of reusing existing instance;	2015-02-16 21:45:16 +01:00
ArseniyShestakov	007f95fa44	Fix valgrind warning about uninitialised value	2015-02-16 13:28:10 +03:00
ArseniyShestakov	c865055803	Hero Exchange: fix quest log button	2015-02-16 01:33:05 +03:00
ArseniyShestakov	df2894b798	Quest Log: implement support Seer names	2015-02-16 00:44:48 +03:00
ArseniyShestakov	37a5930f84	CSoundHandler: fix memory leak and implement cache ... This one fix issue 2091 and add caching that actually works.	2015-02-15 22:51:33 +03:00
AlexVinS	c46999bcb8	Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect	2015-02-15 04:53:01 +03:00
AlexVinS	b71d985d49	cleanup	2015-02-15 01:46:47 +03:00
AlexVinS	aa5e9fc959	get rid of global debug macros.	2015-02-14 22:43:16 +03:00
ArseniyShestakov	9665c50f3f	Quest Log: clanup code that is not needed anymore ... As far as I understand once object capturing used it's no longer needed to manually call Show. Currently CIntObject::show and CIntObject::showAll automatically call it for all children.	2015-02-14 21:35:11 +03:00
ArseniyShestakov	8beed60815	Quest Log: cleanup minimap code ... Usage of shared_ptr suggested by @alexwins	2015-02-14 21:31:56 +03:00
ArseniyShestakov	5a5c126f0e	Quest Log: fix background resource name ... Currently it's not PCX, but PNG	2015-02-14 20:39:53 +03:00
AlexVinS	a5ebcd0f60	fix #2080. No more articaft exchange between heroes in kingdom overview.	2015-02-14 20:24:18 +03:00
AlexVinS	420e5f055c	Fix warnings	2015-02-14 19:24:21 +03:00
AlexVinS	0b546a9b9f	Correct placement for hero misc artifacts in kingdom overview	2015-02-14 18:59:33 +03:00
AlexVinS	c135591f81	Add comments about getArtPlace - it is a bit dangerouse	2015-02-14 16:00:57 +03:00
AlexVinS	7086fdc730	Crash fixed, but bug still present	2015-02-14 16:00:56 +03:00
AlexVinS	a6c8dcbc36	Cleanup	2015-02-14 16:00:56 +03:00
ArseniyShestakov	d06bba422a	Quest Log: display components under quest description ... This commit add CComponentBox under text. If quest have components description height will be changed to avoid conflicts. Though it's would be much better if VCMI had something like QScrollArea in Qt so both text and components was using shared slider.	2015-02-14 04:21:31 +03:00
ArseniyShestakov	c978bc862d	Quest Log: fix position of selection box on labels	2015-02-14 03:47:31 +03:00
ArseniyShestakov	c046f8ddc6	Quest Log: update code for new graphics and fix bugs ... This one should fix issues 1988 and 2022	2015-02-14 03:38:28 +03:00
ArseniyShestakov	8648081f0a	Quest Log: change minimap level when quest selected ... There also no need in own setLevel as one from CMinimap works fine.	2015-02-14 02:13:17 +03:00
ArseniyShestakov	fd99f0b9f3	Quest Log: decrease number of displayed quests ... New graphics only have 6 slots	2015-02-14 01:34:53 +03:00
ArseniyShestakov	0704e38697	Fix Quest Log button in hero window	2015-02-14 01:10:32 +03:00
ArseniyShestakov	ded4c18df9	CComponent: add option to choose image size ... This option is used to choose small resource icons in Quest Log when there more than 4 of them.	2015-02-14 00:53:24 +03:00
ArseniyShestakov	dae03fdf92	Blick Quest Log button if map have no quests	2015-02-14 00:52:00 +03:00
Fay	f30cb0fa5b	Fixes crash when loading game (if path was visible previously);	2015-02-13 11:20:13 +01:00
Fay	1c6a7a923d	Fixes color-keying after scaling bitmaps for world view display;	2015-02-09 20:16:42 +01:00
DjWarmonger	71bcacaa60	Partial fix for #2053	2015-02-09 16:23:29 +01:00
Fay	cbd3a19987	Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading ... Conflicts: client/CPlayerInterface.cpp	2015-02-09 16:09:27 +01:00
Fay	cbb75d1c7a	Support for fading heroes/boats (+flags); ... Disabled map movement requests during fade;	2015-02-09 16:03:24 +01:00
Fay	485a8b5c9a	Fixed updating camera position after teleportation (gate/teleport/spells);	2015-02-06 19:11:04 +01:00
Fay	3c3fb0e21d	Added advmap config options to enable/disable fading;	2015-02-02 19:38:30 +01:00
Fay	5a7a208617	Minor fixes (possible surface leak);	2015-02-02 17:42:42 +01:00
DjWarmonger	1d34d15983	Compilation fixes.	2015-02-01 19:25:42 +01:00
Fay	4c636c15e9	Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading	2015-02-01 19:12:03 +01:00
AlexVinS	594295da32	Merge branch 'feature/worldView' into develop	2015-02-01 20:49:14 +03:00
Fay	b59189ae6f	Minor fix to resolve clipping rect issue from previous commit;	2015-01-31 19:05:25 +01:00
Fay	dbedf245a0	Fixed some calculation to resolve edge tiles being partially cut-off in advmap world view mode;	2015-01-31 19:00:41 +01:00
Fay	447c4603a2	Fade-in fixes; ... Added more map object fading cases (teleports/(dis)embarking)	2015-01-31 18:36:57 +01:00
Fay	e56488d700	Fixed gems redrawing after world view scale change; ... Fixed hotkeys to start world view mode;	2015-01-31 10:57:13 +01:00
Fay	5e78a3147a	Abstracted fading into separate class; ... Smoother fade animations; Added fading when recentering hero after switching levels;	2015-01-30 23:37:28 +01:00
Fay	df419e23c0	Fixed recoloring filler background to correct player color after game reload;	2015-01-29 20:34:53 +01:00
Fay	794c03792a	Added empty background below world view panel for better compat with higher resolutions;	2015-01-29 18:39:46 +01:00
Mikhail Paulyshka	9b76ca0b27	Fix compilation with some versions of libavutil	2015-01-28 22:46:28 +03:00
Fay	e64c08df27	Initial;	2015-01-28 20:07:57 +01:00
AlexVinS	ba51de8b5f	Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop	2015-01-28 09:41:09 +03:00
Fay	4b5b6edd44	Added space between both text entries;	2015-01-26 17:16:39 +01:00
Fay	413523956f	Fixed missing info about dealt damage in combat log when there were casualties; ... Fixed blank row in combat log in the same case;	2015-01-25 18:03:34 +01:00
Fay	b03eb56706	Possibly fixes looping videos;	2015-01-25 14:28:11 +01:00
DjWarmonger	86fde2ba54	Merge pull request #76 from Fayth/mantis-2016 ... Looks much better now :)	2015-01-25 07:49:46 +01:00
Fay	551925b6d7	Added comments;	2015-01-24 23:12:17 +01:00
Fay	ad8a6c55d7	Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection); ... Fixes skipping first hero selection when switching them with left arrow; Fixes redrawing random hero portrait correctly after switching that player to AI;	2015-01-24 21:24:23 +01:00
Fay	72f34a7799	Fixes crash on dropping an artifact on an empty garrison slot;	2015-01-24 00:21:18 +01:00
Fay	77908dcf76	Added missing deletes in map handler dtor;	2015-01-20 20:51:09 +01:00
Fay	8adc209366	Fixed setting adventure map underground button state after game load;	2015-01-19 21:48:52 +01:00
Fay	beaf1a62c5	Added puzzle view button to world view gui;	2015-01-19 20:46:03 +01:00
Fay	01029779d7	World view mode drawing: refactoring, part 2 (further merging of common functionalities; abstracted puzzle view to separate blitter);	2015-01-19 20:08:19 +01:00
Fay	97d89d1d6c	World view mode drawing: refactoring, part 1 (merged main drawing method);	2015-01-18 18:53:40 +01:00
Fay	103f2ed627	(auto whitespace fix)	2015-01-18 18:23:23 +01:00
AlexVinS	a90d603c16	fix modded spell effect not showing	2015-01-18 19:38:35 +03:00
Fay	e3dc37fece	Fixed hotkeys in world view mode (added missing hotkeys + disabled non-world-view hotkeys); ... Fixed minimap radar calculation for world view mode;	2015-01-17 13:41:59 +01:00
Fay	447119e2f5	Changed zoom factors to resemble OH3 as closely as possible; ... Minor refactoring;	2015-01-17 11:56:12 +01:00
Fay	9b3b69b108	Fixed incorrect display of scaled+rotated map images in world view mode; ... Fixed miscalculated viewport sizes in somee cases;	2015-01-16 23:49:15 +01:00
Fay	8e840d2c30	Changed map surface-cache key from int to intptr_t;	2015-01-15 17:17:26 +01:00
Fay	3823631a57	Fixed recoloring world view panel info icons after current player change; ... Refactored ui objects handling in CAdvMapInt to slightly reduce clutter; Minor other improvements;	2015-01-15 00:22:20 +01:00
Fay	4b248c2762	World view impl -- initial;	2015-01-13 20:57:41 +01:00
ArseniyShestakov	af8b030810	Fix skills learning in Universities ... This one fixes 1945 and 1991	2015-01-07 18:33:09 +03:00
ArseniyShestakov	3466457d69	Fix crash on opening of Hill Fort window and attempt to upgrade one stack ... This one fixes issue 1899	2015-01-07 13:10:48 +03:00
ArseniyShestakov	ceb5da44d1	This fixes crash in battle I introduced in 8a697f2 ... dismissInfo do not present when createButtonPanel used inside the battle.	2014-12-27 06:29:09 +03:00
DjWarmonger	9962623220	Merge pull request #72 from ArseniyShestakov/fixTradeWindow ... Small fixes for CTradeWindow	2014-12-26 09:57:40 +01:00
DjWarmonger	84b2510aa4	Merge pull request #62 from vcmi/SpellsRefactoring4 ... OK	2014-12-26 08:46:29 +01:00
ArseniyShestakov	6ab807f694	Put artifact in different slot if selected is used ... This one fixes issue 2002.	2014-12-26 01:42:50 +03:00
ArseniyShestakov	27705e1ac6	Fix removal of fully sacrificed stacks from heroes garrison slots ... This one fixes issue 2010. Though CAltarWindow need proper refactoring.	2014-12-26 01:18:58 +03:00
ArseniyShestakov	aca0eeed86	Fix position of selected unit count in Freelancer's Guild ... This one fixes issue 2009	2014-12-25 22:03:19 +03:00
ArseniyShestakov	f71cfdf173	Check if slot locked before pick on Artifact Merchants ... This one is fixes issue 2007	2014-12-25 19:24:28 +03:00
ArseniyShestakov	54437a3b19	Fix check of locked artifacts for Altar of Sacrifice ... This one is explained in issue 2001	2014-12-25 06:27:39 +03:00
ArseniyShestakov	046a6fc45a	Visible blocked button for good and evil heroes on Altar of Sacrifice ... This is expected behaviour as explained in issue 558	2014-12-25 06:20:40 +03:00
ArseniyShestakov	3371cd36c9	Fix check of 22 artifacts limit on Altar of Sacrifice ... Partially fix for issue 558	2014-12-25 06:17:26 +03:00
ArseniyShestakov	4cb98e7e8d	Use isTradable and fix issue 1392 ... This change make it possible to sell spell scrolls in Artifacts Merchant.	2014-12-24 20:48:37 +03:00
ArseniyShestakov	937ef0227b	Use ArtifactID instead of int when possible	2014-12-24 18:49:12 +03:00
ArseniyShestakov	edccd60564	Tiny improvement for resources selection boxes ... This one is related to issue 562	2014-12-24 03:22:48 +03:00
ArseniyShestakov	36e05402d8	Fix text label and location on sell articacts windows ... This one fixes issue 1998	2014-12-24 03:21:28 +03:00
ArseniyShestakov	150c8425f5	Fix town income on View Towns screen ... This is fix issue 1996	2014-12-24 00:39:48 +03:00
AlexVinS	eebf65e88f	Merge branch 'develop' into SpellsRefactoring4	2014-12-24 00:15:27 +03:00
ArseniyShestakov	94d0e5486a	CSplitWindow: added input check ... This one fixes issue 1952	2014-12-23 07:38:58 +03:00
ArseniyShestakov	8a697f2ba3	Fix disabling of dismiss button for last troop ... Fix issue 1994	2014-12-23 07:12:42 +03:00
ArseniyShestakov	79cdabe3aa	CCreatureWindow: correct caption for "Ok" button ... This one is fixes issue 1396	2014-12-23 07:10:33 +03:00
DjWarmonger	94c0d5896f	[MVS] Added /LTCG option to improve linker performance.	2014-12-22 19:44:15 +01:00
DjWarmonger	7735e193f0	Merge branch 'develop' into experimental/serializerrefactoring	2014-12-22 19:17:40 +01:00
AlexVinS	2b88a914ff	Fix client build ... * use regular overloaded methods for client serialization. (serialize template not needed if connection.h already included and save/load code is different)	2014-12-21 22:33:20 +03:00
AlexVinS	3bca68fd2d	Initial refactoring ... * reduce registerTypes* templtates instantiation	2014-12-21 17:29:42 +03:00
DjWarmonger	c538370c5d	Players will be always able to see their owned heroes and other objects. Fixes #1959.	2014-12-21 13:56:32 +01:00
AlexVinS	65ed0ec356	Trying to fix random freeze	2014-11-28 02:47:14 +03:00
AlexVinS	d94f15bdf4	Added configurable animation for SPELL_LIKE_ATTACK	2014-11-28 00:36:14 +03:00
AlexVinS	943a5bf0d3	cleanup	2014-11-27 22:10:36 +03:00
AlexVinS	0612042928	Tweak creature spell projectile start position ... * need more finetuning	2014-11-27 21:33:57 +03:00
AlexVinS	04202eb030	Shoot spell projectile from creature	2014-11-27 21:06:11 +03:00
AlexVinS	657385e32c	We need to know caster stack ID for proper projectile animation	2014-11-27 20:47:37 +03:00
AlexVinS	6893509f65	Fix manaGain animation always showing	2014-11-27 19:09:59 +03:00
AlexVinS	c67f52732a	Fix CSpellEffectAnimation call parameters ... (!) need check areaEffect usage	2014-11-27 17:39:37 +03:00
AlexVinS	f1ab328a09	Cleanup	2014-11-27 17:08:19 +03:00
AlexVinS	75b93b070d	Implemented configurable hit/affect animation ... * need more testing	2014-11-27 16:51:16 +03:00
AlexVinS	256894d18a	Use configuration for spell projectile	2014-11-27 00:27:38 +03:00
ArseniyShestakov	f2aedabcb3	Fix slider remain enabled when not needed for changed label text ... This one fix issue with map description label #1977	2014-11-24 16:18:10 +03:00
ArseniyShestakov	0e346a4f0d	Reset mapDescription scrolling position on change of map / save ... This one fixes bug #1974	2014-11-24 15:56:33 +03:00
ArseniyShestakov	53c7a3cfcb	Added function CSlider::moveToMin	2014-11-24 15:24:03 +03:00
AlexVinS	a71c452fc6	Merge branch 'develop' into SpellsRefactoring4	2014-11-24 12:45:34 +03:00
AlexVinS	85a4b725f5	[Creature window] 2-line bonus description	2014-11-24 12:44:45 +03:00
AlexVinS	f7ff61ce4f	Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4	2014-11-24 12:41:17 +03:00
ArseniyShestakov	6fd0f76547	Fix invisible save select when click on save name area	2014-11-23 08:51:48 +03:00
DjWarmonger	c094e70784	Replaced legacy sprintf with boost::format.	2014-11-22 12:45:13 +01:00
KroArtem	82b278307f	fixed typo	2014-11-17 23:08:08 +03:00
KroArtem	e73c60740c	corrected text in vcmibuilder, corrected errors and warnings from cppcheck	2014-11-16 20:48:29 +03:00
AlexVinS	885b495cf4	[Creature window] Fix creature art dismount possibility	2014-11-15 21:54:45 +03:00
AlexVinS	c43b218d64	Fix duplicate MR bonus display	2014-11-15 20:39:21 +03:00
AlexVinS	68d1105233	Fix creature window not showing bonus description	2014-11-15 20:22:50 +03:00
AlexVinS	752965ff69	Merge branch 'develop' into SpellsRefactoring4 ... Conflicts: lib/CSpellHandler.cpp	2014-11-14 05:28:23 +03:00
AlexVinS	81fb2ae584	Fix crash when casting firewall-like spells after creature casting ... #1910	2014-11-14 04:12:50 +03:00
AlexVinS	9e8b09d747	Use clearAffected flag	2014-11-13 15:00:45 +03:00
Ivan Savenko	dce9880d16	Minor refactoring of FunctionList using variadic templates. ... Please make sure that all supported compilers are OK with this code	2014-11-12 22:46:37 +02:00
Ilya Zhuravlev	b22973e717	Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame.	2014-11-10 20:21:39 +03:00
Ilya Zhuravlev	62a3dfb086	Fixed "Hex grid" button crash, partially fixes 1907.	2014-11-04 15:34:30 +03:00
Ilya Zhuravlev	3eb3996241	Fix android build.	2014-11-02 16:19:14 +03:00
DjWarmonger	530a3e69bf	Option to allow / ban certain types of town in a template.	2014-10-30 10:00:29 +01:00
Patrick Simmons	407755ee77	Minor multiplayer load bugfixes	2014-10-25 19:05:50 -04:00
Patrick Simmons	1dabdf7b3a	Minor fixes to multiplayer load game support	2014-10-25 19:05:50 -04:00
Patrick Simmons	6aa3c11084	SUCCESS!	2014-10-25 19:05:49 -04:00
Patrick Simmons	7babdccd59	This is very wrong but works better than anything else I've tried.	2014-10-25 19:05:49 -04:00
Patrick Simmons	41da0ad2e6	multiplayerload changes (committing so I can revert...)	2014-10-25 19:05:49 -04:00
Patrick Simmons	3685e96042	Revert "multiplayer load changes" ... This reverts commit 368d2c8836cc6e3b5af9cf71e892bf4515f26bda.	2014-10-25 19:05:49 -04:00
Patrick Simmons	99a63c4bbd	multiplayer load changes	2014-10-25 19:05:49 -04:00
Patrick Simmons	cfa6f46d62	VERY buggy, unusable, but progress is being made...	2014-10-25 19:05:49 -04:00
Ilya Pomaskin	ff12aca83a	bind -> std::bind	2014-10-25 19:05:49 -04:00
Mikhail Paulyshka	ab5e1f9109	don't use separate .rc files for MSVC and MinGW	2014-10-12 16:32:02 +03:00
AlexVinS	54453aee73	get rid of boost::assign	2014-10-04 00:34:13 +04:00
AlexVinS	66b022f93e	initializer lists part1	2014-10-02 19:43:46 +04:00
DjWarmonger	01491f9f1e	Fixed #1718	2014-10-01 14:20:00 +02:00
Ivan Savenko	6aef70eca1	Fixed animation order in lucky attacks. May fix 1891.	2014-09-23 17:30:36 +03:00
Ivan Savenko	a5c3ed080f	Fixes 1892 - properly handle animation of dying clones	2014-09-23 16:02:30 +03:00
Ivan Savenko	33c0e24940	Fixes 1895 - Properly select upper army for recruitment	2014-09-23 14:28:55 +03:00
Ivan Savenko	fc16c8d207	Merge branch 'optimization/swiftAI' into develop ... Conflicts: lib/CGameState.cpp	2014-09-21 22:31:29 +03:00
Ivan Savenko	aa0433228a	Fixed cheats - sendMesssage will also pass current object. ... Workaround-ish but should work. Branch should be fixed now.	2014-09-21 20:35:53 +03:00
Ivan Savenko	6c0c03d74b	Refactoing of pathfinder <-> client/AI interaction to remove dependency on selected hero ... - finished removal of server-side setSelection - disabled some broken code (AI & cheats). TODO: fix	2014-09-21 16:42:08 +03:00
Ivan Savenko	ca47ddca5c	Miscellaneous fixes to creature window: ... - implemented missing stack size indicator - fixed detection of battle presence - fixed placement of spell icons	2014-09-19 16:31:01 +03:00
Ivan Savenko	78709e223b	Breaking things - trying to remove server-side knowledge of selected objects	2014-09-19 00:18:49 +03:00
Ivan Savenko	818a766fd6	Fixed 1888 - centering adv.map will also redraw minimap	2014-09-18 17:53:41 +03:00
Ivan Savenko	6cd3d1b30e	Fixed 1889 - removed memory leak that caused multiple identical quest marks	2014-09-18 17:46:35 +03:00
Ivan Savenko	3939c70a81	Fixed 1277 - only 2 cursor buttons will be enabled for sliders, depending on its direction (horizontal/vertical)	2014-09-18 17:08:21 +03:00
DjWarmonger	a17e27bfc6	Merge branch 'develop' of https://github.com/vcmi/vcmi into develop	2014-09-18 14:43:37 +02:00
DjWarmonger	495c39304d	Fixed crash due to incorrect RMG options.	2014-09-18 14:29:57 +02:00
Ivan Savenko	9a4aa8749f	Fall back to first available resolution if config contains invalid value. ... Fixes crash on starting game with unavailable resolution	2014-09-18 14:20:53 +03:00
AlexVinS	22deb07b66	[c::b] update prejects, fix build	2014-09-11 17:53:25 +04:00
DjWarmonger	ec8476d43a	Compile fixes for Visual.	2014-09-05 20:13:58 +02:00
DjWarmonger	a89512111c	Updated visual files.	2014-09-05 16:38:19 +02:00
Ivan Savenko	b551bdb725	Final part of the merge ... Merging VCMI Dirs refactoring + GUI refactoring with current develop	2014-09-04 20:59:07 +03:00
Ivan Savenko	de9c5b1af7	Merge branch 'develop' of github.com:karol57/vcmi into karol57-develop	2014-09-04 20:29:24 +03:00
Ivan Savenko	1647b3670c	Merge pull request #35 from rhn/rhn ... Fixes to sound handling.	2014-09-04 20:26:32 +03:00
DjWarmonger	0edaf4fa8a	Merge pull request #26 from vcmi/FFMpeg ... Let's do this, way too many branches running now.	2014-09-01 10:35:30 +02:00
DjWarmonger	8b10f70afd	Migrating to MSVS 2013, which allows to delete inttypes.h file.	2014-08-31 19:08:39 +02:00
Karol	37bd4790f7	VCMIDirs update #6 fix ... - Apple compilation fix - Removed unnecessary macros - Updated macros indent style - Fixed 1. warning.	2014-08-30 15:04:00 +02:00
Karol	53ab0593b7	VCMIDirs update #6 ... - Minor fixes - CLoadFile updated to boost::filesystem::path	2014-08-27 12:31:58 +02:00
Karol	1b6f2ea3b7	VCMIDirs update #5 fix ... - Updated old OS detect macros. - Fixed 1 misspell.	2014-08-26 12:19:04 +02:00
Karol	958839668c	VCMIDirs update #5 ... - Minor fixes - string based paths -> boost::filesystem::path paths (I hope it's final) - New user data path on windows - New moving dir method on windows.	2014-08-21 22:26:28 +02:00
DjWarmonger	94832c743c	Updated build configs. Everything works.	2014-08-14 16:07:40 +02:00
DjWarmonger	6656515395	Updated Visual for FFMPEG. Need to define environmental variable FFMPEGDIR for it to compile. Not functional yet, though.	2014-08-13 19:21:58 +02:00
Karol	2da6d9e7dd	VCMIDirs update #4 fix	2014-08-11 21:24:31 +02:00
Ivan Savenko	e692f3f520	Implemnted enemy turn speed selection: ... - implemented switch in settings screen - implemented "0 speed", animation-free. *may* also work for player-owned heroes - removed no longer used creature window switch	2014-08-11 19:16:39 +03:00
Ivan Savenko	8838607669	Trying to fix Travis compilation issues	2014-08-11 17:58:41 +03:00
Ivan Savenko	cc61ffca73	Removed debug output	2014-08-11 17:27:41 +03:00
Ivan Savenko	092df7a71c	Fixed crash on stack-less creatures, e.g. war machines	2014-08-11 16:28:15 +03:00
Ivan Savenko	4092929b70	Fixed endianness	2014-08-11 16:21:23 +03:00
Ivan Savenko	8f1a4fcb56	Fixed crash on opening creature window in battle	2014-08-11 15:57:15 +03:00
Karol	a302f6c7ad	VCMIDirs update #3 ... bfs = boost::filesystem; - Updateting filenames (std::string -> bfs::path) #1 - Added platform detection, and some specyfic boost::filesystem includes to Global.h - Updated CBasicLogConfigurator. Now class uses bfs::path pathes.	2014-08-10 23:42:39 +02:00
Ivan Savenko	a115406fa3	Fixed data presence check	2014-08-10 10:58:56 +03:00
Ivan Savenko	1e5e02c7df	Compilation fixes caused by merge, replaced some remaining boost::bind with std's	2014-08-09 15:14:31 +03:00
Ivan Savenko	b1285bc506	Merged GUI refactoring into develop, fixed conflicts	2014-08-09 15:01:55 +03:00
Ivan Savenko	66c4d469f8	Possible fix for neutral palette (1867)	2014-08-07 19:53:07 +03:00
Ivan Savenko	d1dd7eef48	Proper fix for #1712 - Building requirement tests are now fixed ... - added minimize() method in logical expressions that will remove excessive elements - replaced forEach() with morph() that allows replacing types in variant	2014-08-07 19:53:07 +03:00
Ivan Savenko	4d6ab2c32d	Fixed rendering of bitmap fonts shadow	2014-08-07 19:53:07 +03:00
rhn	c8929b364b	fixed typo	2014-08-06 17:55:29 +02:00
rhn	e4fce8fc8f	fixed object types playing sounds	2014-08-06 17:19:54 +02:00
rhn	a491c11305	Fixed sound effect when hero disappears	2014-08-06 17:19:53 +02:00
rhn	e9534603c2	Fixed sound on object pickup with dialog	2014-08-06 17:19:53 +02:00
beegee1	5139378319	- migrated boost::function/ref/bind to std:: variants	2014-08-04 20:33:59 +02:00
Ivan Savenko	00cda400a1	Miscellaneous improvements for Launcher UI: ... - Implemented "show intro" toggle in settings - Install/Update/Enable buttons are now visible even when mod info is hidden - Fixed behaviour of show mod info switch, added more obvious button to enable it - Removed no longer used "Enable mods on install" switch - Added buttons to open data, user data and temporary directories	2014-08-04 14:03:57 +03:00
Ivan Savenko	77a73fbaa9	Merge branch 'feature/freegfx' into refactoring/guiClasses ... Conflicts: client/windows/CHeroWindow.cpp client/windows/CQuestLog.cpp client/windows/GUIClasses.cpp	2014-08-03 18:50:59 +03:00
Ivan Savenko	7390647cd5	End of buttons refactoring: ... - cleanup of slider API - documentation fixes	2014-08-03 17:31:56 +03:00
Ivan Savenko	0882201b17	Miscellaneous fixes to toggle buttons	2014-08-03 16:19:16 +03:00
Ivan Savenko	10fc1892a8	Large refactoring of button classes: ... - renamed CAdventureMapButton to more expectable CButton - merged CButtonBase into CButton - created more generic class for clickable elements - created more generic class for selectable elements - renamed CHighlightableButton to CToggleButton - renamed CHighlightableButtonsGrous to CToggleGroup - minimized differences between API of all these classes - removed all but one contructors in buttons, with same parameters across all classes	2014-08-03 14:16:19 +03:00
AlexVinS	76c3228afa	Merge branch 'develop' into FFMpeg ... Conflicts: client/CVideoHandler.cpp	2014-07-26 07:54:43 +04:00
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
Ivan Savenko	4fca583062	Merge pull request #29 from Mixaill/nsis ... CMake: add NSIS generator settings	2014-07-18 00:56:46 +03:00
DjWarmonger	e8580229dc	RMG will now actually use all the settings from pregame. Till now it did not.	2014-07-15 16:44:07 +02:00
DjWarmonger	89c97a88bb	Updated Visual projects for SDL2.	2014-07-15 12:26:18 +02:00
Ivan Savenko	731aedf3a1	Split CIntObjectClasses into multiple smaller files. This should be the last change in files	2014-07-15 10:14:49 +03:00
Ivan Savenko	9f5704f8ba	Uploaded recreated stack queue backgrounds	2014-07-14 22:38:13 +03:00
Ivan Savenko	52da593292	New resolution selection button	2014-07-14 21:49:52 +03:00
Ivan Savenko	5111bff6cc	Implemented new button for commander window	2014-07-14 20:43:38 +03:00
Ivan Savenko	7f790f9d6a	Quest window now uses new background, using same gfx sources as creature window	2014-07-14 18:07:57 +03:00
Ivan Savenko	a69fcdd435	Fixed compilation issues caused by merge	2014-07-14 17:44:15 +03:00
Ivan Savenko	92d22bae63	Merge branch 'feature/creatureWindow' into refactoring/guiClasses	2014-07-14 17:23:24 +03:00
Ivan Savenko	2a0a0e81a7	Cleaning up includes	2014-07-14 17:19:44 +03:00
Michael Pavlyshko	6a23960642	CMake/WIN32 : add icon to client and launcher	2014-07-14 01:02:00 +03:00
Ivan Savenko	647b9c683f	Reorganized client source tree: ... - client/widgets for reusable GUI elements - client/windows for independent windows - client/gui for base GUI classes which should remain internal	2014-07-13 20:53:37 +03:00
Ivan Savenko	cec9161f8f	Added missing files	2014-07-13 18:40:13 +03:00
Ivan Savenko	83099fdb78	Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree	2014-07-13 18:39:45 +03:00
Ivan Savenko	55ff933b7f	Reducing size of GUI classes. Split trade windows into a separate file	2014-07-13 16:31:00 +03:00
Ivan Savenko	09bedf9aa9	Reducing size of GUIClasses. Moved Garrison Int into a separate file.	2014-07-13 16:11:25 +03:00
Ivan Savenko	7e76a5dd0e	Moved some code from GUIClasses into two smaller files: ... - CArtifactHolder.* - CComponent.* Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class	2014-07-13 14:56:30 +03:00
Michael Pavlyshko	bad7050096	spaces -> tabulation	2014-07-11 11:01:03 +03:00
AlexVinS	679dd64ff9	Make scale a parameter of "open" methods	2014-07-10 14:18:21 +04:00
Michael Pavlyshko	08ee65c3c8	fix .dll and .exe filenames	2014-07-10 01:06:37 +03:00
Michael Pavlyshko	c935193558	disable WIN32 flag for executables, fix previous commit	2014-07-10 00:47:22 +03:00
Michael Pavlyshko	11d73f2ac9	fix CVideoHandler compilation	2014-07-09 18:01:12 +03:00
Michael Pavlyshko	afc6530084	fix vcmiclient linkage	2014-07-09 17:37:08 +03:00
AlexVinS	18f34e14f8	set scale to off by default	2014-07-08 22:01:01 +04:00
AlexVinS	0efb6e2890	Use scaling ... (*) into - fullscreen (*) spellbook - no scaling	2014-07-08 18:20:22 +04:00
AlexVinS	61b31e5c60	add api to enable|disable scaling (unimplemented)	2014-07-08 17:39:47 +04:00
AlexVinS	c71237bba3	Mingw build with ffmpeg ... (*) get rid of BIK SMK dlls (-) missing sound (-) spellbook is scaled to fullscreen	2014-07-08 16:40:25 +04:00
Ivan Savenko	1ae7a77246	Cleanup of stack artifacts code	2014-07-05 11:48:03 +03:00
Ivan Savenko	60e5815014	Implemented stack artifact handling, no tested yet	2014-07-05 01:22:56 +03:00
AlexVinS	0edd10078f	Fix usage of fillRect. ... * proper fix for slider drawing	2014-07-05 01:52:11 +04:00
Ivan Savenko	ac6cfdfb92	Extracted too big lambda into a separate helper method	2014-07-04 20:58:18 +03:00
Ivan Savenko	20f7071d11	Implemented stack experience/commander experience display for window	2014-07-04 12:48:09 +03:00
AlexVinS	e70e68a56b	Fix puzzle map fade.	2014-07-03 23:06:11 +04:00
AlexVinS	74d3effa98	More safe way of update locking	2014-07-03 22:30:56 +04:00
Ivan Savenko	e4e9d71143	Fixed texts: ... - added new texts to translate.json - implemented texts for abilities Remaining TODO's: - handling of stack artifact - handling of commander artifacts - stack experience	2014-07-03 21:09:17 +03:00
AlexVinS	9b8ad51cd3	Run all rendering with pim lock if possible	2014-07-03 22:05:59 +04:00
AlexVinS	30d6eab20b	Do not render fully hidden tiles	2014-07-03 20:41:42 +04:00
Ivan Savenko	079866d99d	Implemented leveling up abilities. TODO: implement visible selection/descriptions	2014-07-03 19:05:19 +03:00
AlexVinS	8a488aeb86	Cleanup	2014-07-03 19:57:21 +04:00
AlexVinS	57f82f2bed	Add a comment.	2014-07-03 18:46:23 +04:00
AlexVinS	f3067878dd	Force full redraw for sliders. This fixes backgroung glitches with SDL2. ... (!) there should be better fix	2014-07-03 18:44:25 +04:00
AlexVinS	ecc7b8e05a	Draw cursor on each frame. Fix TTF rendering under cursor.	2014-07-03 18:05:07 +04:00
AlexVinS	e521e6687a	centralize cursor drawing	2014-07-03 15:10:01 +04:00
AlexVinS	022f71c26e	fix deletion in in-game console	2014-07-03 14:58:56 +04:00
AlexVinS	397f4cf8b6	Workaround for TFF font glitches under cursor in pregame	2014-07-03 14:10:15 +04:00
AlexVinS	c948891fc6	Fix threaded handlers initialization, cleanup	2014-07-03 12:26:15 +04:00
Ivan Savenko	328944e111	Fixed levelling up of commander	2014-07-03 01:00:16 +03:00
AlexVinS	dbb7526040	fix uninitialized flag	2014-07-02 23:53:49 +04:00
AlexVinS	5a029c88d1	cleanup	2014-07-02 23:53:23 +04:00
AlexVinS	3e4e810888	More ColorKey cleanup	2014-07-02 22:41:11 +04:00
Ivan Savenko	b58bbcbdd8	Leveling up commander skills seems to be working. Optimized some png's to decrease size	2014-07-02 21:38:38 +03:00
Ivan Savenko	617ea79d3c	Button overlays are now more generic (not necessarily text), removed old version of creature window	2014-07-02 21:38:38 +03:00
Ivan Savenko	7a9547bb44	New creature window made without use of H3 graphics ... This is import of ancient unfinished branch from svn. As of now window is largely finished but commander-related elements are still TODO. Note that I also uploading graphical content - this is intended and necessary for final goal - to make VCMI functional without any additional graphical pack.	2014-07-02 21:38:38 +03:00
AlexVinS	638dac90af	centralize key color management	2014-07-02 22:20:54 +04:00
AlexVinS	082c9a506e	Fix battle absolute obstactes rendering	2014-07-02 21:38:15 +04:00
AlexVinS	7b75b19d1a	Fix hero flags rendering	2014-07-02 21:09:49 +04:00
AlexVinS	9606aed4a3	Using int3 for color is weird	2014-07-02 20:12:15 +04:00
AlexVinS	e57dbbde15	Extract startTextInput & stopTextInput ... (*) these functions do nothing with SDL1 - this is by design - less ifdef`s	2014-07-02 19:41:30 +04:00
AlexVinS	9797372dbe	Implement Unicode support for ingame console	2014-07-02 19:16:05 +04:00
AlexVinS	195eae48ca	Merge branch 'develop' into SDL2 ... Conflicts: client/CPlayerInterface.cpp	2014-07-02 17:15:12 +04:00
Ivan Savenko	c956b3f02a	Fixed #1820, better detection of object below cursor that uses same logic as renderer	2014-07-01 17:19:08 +03:00
AlexVinS	50dfe05cd1	[C::B] Small projects fix	2014-06-30 11:19:55 +04:00
DjWarmonger	57fa905a2b	Something that compiles.	2014-06-26 22:05:27 +02:00
DjWarmonger	e51e2190fd	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-26 20:12:37 +02:00
Ivan Savenko	32240da34e	Reduced number of #include's in headers. May break compilation on Win ... since some net packs now need DLL_LINKAGE	2014-06-25 17:11:07 +03:00
Ivan Savenko	a0689fa377	Refactoring of hoverText from objects: ... - removed hoverText field - split getHoverText() method into 3: - - getObjectName() for generic name - - getHoverText(Player) for player-specific text - - getHoverText(Hero) for hero-specific strings	2014-06-24 20:39:47 +03:00
Ivan Savenko	ad632d1e8a	Moved FoW management from CGObjectInstance to callback	2014-06-24 20:39:47 +03:00
Ivan Savenko	5ebc0e8614	First part of object instance API cleanup ... - removed passability() method in favour of passableFor(PlayerColor) - moved operator < code to map handler - updated class documentation	2014-06-24 20:39:47 +03:00
AlexVinS	4e4ba6654c	fix Eye of magi, also fix #1608 ... Conflicts: lib/CObjectHandler.cpp	2014-06-24 18:20:28 +04:00
AlexVinS	3b8d0e44d4	Merge branch 'develop' into SDL2	2014-06-24 14:09:44 +04:00
DjWarmonger	79036484dd	Trying to sort out project changes and compile issues.	2014-06-23 19:58:19 +02:00
Ivan Savenko	47639832b1	Probably fixed bug with map border rendering in rectangular maps	2014-06-23 20:47:09 +03:00
DjWarmonger	3ac306f501	Merge pull request #19 from vcmi/feature/mapObjects ... Feature/map objects	2014-06-22 14:49:42 +02:00
AlexVinS	2ec8c31558	Partial fix for hero flag rendering ... (-) blue & teal heroes are still gitchy. IDN why ...	2014-06-21 14:54:41 +04:00
AlexVinS	ac7703ffb0	Fix hero movement rendering	2014-06-21 12:13:19 +04:00
AlexVinS	8cc5363882	fix warning, cleanup	2014-06-21 11:35:08 +04:00
AlexVinS	13bd4ddcb2	Now movement can be canceled ... (-) rendering still missing	2014-06-21 10:49:27 +04:00
AlexVinS	5fa5ba622f	Start preparation for moveHero threaded implementation	2014-06-18 14:31:11 +04:00
AlexVinS	c2dd696e96	simplify CGuiHandler::handleEvents() ... Threre is no need to allow (and I doubt is was in fact possible with old code) new events to arrive during processing events. Let them to be processed in next frame.	2014-06-18 08:30:23 +04:00
Ivan Savenko	09d595e385	- Implemented "mapObject" entry for hero classes ... - Updated schemas - Some bugfixing	2014-06-16 19:27:26 +03:00
AlexVinS	5fdc63ab5b	tiny fixes	2014-06-16 14:32:37 +04:00
Ivan Savenko	836c466f81	- Implementation of overrides for towns ... - Converted dwellings.json into new format - Implemented "mapObject" entry in town format - Removed capital/fort/village fields from town in favor of overrides	2014-06-15 19:43:01 +03:00
DjWarmonger	e56f41b8be	Fixed monster strength selection.	2014-06-15 12:00:34 +02:00
DjWarmonger	5c431da0f9	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-15 10:01:18 +02:00
AlexVinS	c7390316b7	small cleanup	2014-06-13 07:55:50 +04:00
AlexVinS	d707e55472	restore inGuiThread flag	2014-06-13 07:55:50 +04:00
AlexVinS	41a0319985	remove separate GUI thread ... + this fixes OGL - has some issues(f.e. hero movement)	2014-06-13 07:55:49 +04:00
AlexVinS	15fe37133c	Fix compilation with SDL1 ... + seems to be fully backward compatible (need more testing)	2014-06-13 07:55:48 +04:00
AlexVinS	56c74bc46a	+More build target to support both SDL1 and SDL2 builds	2014-06-13 07:55:48 +04:00
AlexVinS	bbd0312b45	Tweak configuration	2014-06-13 07:55:47 +04:00
Ivan Savenko	c424677736	- Hotfix: overlay was a pointer	2014-06-13 07:55:47 +04:00
Ivan Savenko	6205d07223	Re-enabled video player, should now work with SDL 2	2014-06-13 07:55:46 +04:00
AlexVinS	47979d28bb	Remove broken assertion ... * this restores music support	2014-06-13 07:55:46 +04:00
Ivan Savenko	8eb661461c	- vcmi compiles with SDL2 on Linux, video player is disabled for now	2014-06-13 07:55:45 +04:00
AlexVinS	3db7fb4f63	Still try to fix opengl backend ... - no success + make backend selection configurable	2014-06-13 07:55:45 +04:00
AlexVinS	d289c6a34a	Prefere opengl rendering ... - broken ...	2014-06-13 07:55:44 +04:00
AlexVinS	5bb3d859eb	Nice fullscreen mode++	2014-06-13 07:55:44 +04:00
AlexVinS	04aa76b842	Fix arrow keys moving on adventure map	2014-06-13 07:55:43 +04:00
AlexVinS	6474e37b76	try to fix hotkeys	2014-06-13 07:55:43 +04:00
AlexVinS	ac2896da42	Implemented SDL2 unicode input. Hotkeys are sill broken.	2014-06-13 07:55:42 +04:00
AlexVinS	d50976bf4a	restore some SDL1 code in CMT.XXX	2014-06-13 07:55:41 +04:00
AlexVinS	0ef16feca9	Refactoring towards backward compatibility (WiP)	2014-06-13 07:55:41 +04:00
AlexVinS	1597254399	just a few tweaks and it works! ... * enable video again * set default bpp to 32 - SDL2 dont like 24 bit resolution * now almost everything looks as expected (some issues are present though)	2014-06-13 07:55:40 +04:00
AlexVinS	6890c2650b	fix keyboard state access ... * is somewhat playable already!	2014-06-13 07:55:40 +04:00
AlexVinS	cd81e85a61	fix loading to pregame. Looks awful. More work to do. ... * video temprorary disabled * multithread loading seems to be broken - disabled	2014-06-13 07:55:39 +04:00
AlexVinS	e072b2664f	fix pixel format ... * now it shows intro video (but then crash ...)	2014-06-13 07:55:39 +04:00
AlexVinS	62d42465de	fix compilation ... * may not even run * text input disabled	2014-06-13 07:55:38 +04:00
AlexVinS	796905ec42	change VCMI_client.cbp to new externals layout ... * it will not compile of course	2014-06-13 07:55:38 +04:00
Haryaalcar	11955605b5	sorting by filename implemented for save and load screens	2014-06-11 00:03:08 +03:00
Ivan Savenko	44742814cd	More cleanup: ... - moved SoundBase.h to lib since it contains shared data - added RMG info to object format. Note that data is not yet imported in configs - slightly updated API of object handlers	2014-06-05 23:51:24 +03:00
Ivan Savenko	b2e8c92383	Cleanup: ... - removed commented-out #includ'es - renamed some files to match name of class	2014-06-05 20:26:50 +03:00
Ivan Savenko	652ceb2bde	Finally shattered CObjectHandler.cpp into tiny bits ... - This file is now split into multiple smaller files in mapObjects directory - CObjectHandler itself now contains only core classes (Handler itself, CGObject and interfaces) - Cleaned up excessive #include's through whole project	2014-06-05 19:52:14 +03:00
Ivan Savenko	0afdfa529c	Moved all object-related files to lib/mapObjects directory. ... Renamed some classes to more readable names	2014-06-05 14:19:47 +03:00
DjWarmonger	62e9f13b08	- Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426 ... - Some primitive way to randomize treasures	2014-06-04 10:16:08 +02:00
Ivan Savenko	32b6568b65	Merged changes from upstream and fixed compilation caused by API changes	2014-06-03 22:45:18 +03:00
beegee1	a87363c0f1	- fixed mantis #783 - play sound when entering message in chat box	2014-06-01 18:48:40 +02:00
Ivan Savenko	1d17d60449	gcc update: ... - removed support for 4.6 - compilation fixes for 4.7	2014-05-29 13:42:05 +03:00
karol57	dd33fd51a8	int3 dist2d microoptimization	2014-05-25 20:42:25 +02:00
Ivan Savenko	7f276185bd	Moving files: ... - new config for objects (config/objects/generic.json) - renamed lib/CDefObjectHandler to lib/CObjectClassesHandler	2014-05-24 02:07:54 +03:00
Ivan Savenko	6bd6be0835	Object class handler is now a proper "handler" ... - Some changes in interfaces - Fixed some missing fields in serialization - Moved object names to new handler	2014-05-24 01:56:51 +03:00
AlexVinS	8a3b997fa5	fix a few comments. No code changes.	2014-05-21 13:02:20 +04:00
DjWarmonger	1ea6723a32	Merge pull request #8 from xyzz/android-rolling ... Android port.	2014-05-17 05:17:54 +02:00
Ivan Savenko	b5160acbac	Finalization of object type handler interface ... - updated code to use new interface - removed old DefObjHandler (todo - rename file) Summary: - most code but loading is now in place - type names may deserve improvements (some of them are too similar) - still barely compiles and not tested	2014-05-16 23:50:02 +03:00
Ilya Zhuravlev	db7cd79cf7	Android port. ... Conflicts: lib/vcmi_endian.h	2014-05-16 23:24:29 +04:00
beegee1	80765eb0a3	- fixed clang compiler warnings (detects now unused constant vars)	2014-05-16 19:22:21 +02:00
DjWarmonger	1dbc0c7177	Compilation fix. This will be released as VCMI 0.95b.	2014-05-02 12:19:50 +02:00
DjWarmonger	fb5152254d	Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup ... Conflicts: client/CKingdomInterface.cpp	2014-05-02 12:03:02 +02:00
Macron1Robot	9976fcc671	Update GUIClasses.cpp ... spaces change	2014-04-29 22:25:30 +04:00
Macron1Robot	fd1640f931	Update GUIClasses.cpp ... Removed excessive check for tavernVideo string	2014-04-29 13:06:55 +04:00
DjWarmonger	4a71442c80	Missing changes.	2014-04-27 14:38:20 +02:00
DjWarmonger	f418b468c4	Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup	2014-04-27 12:49:29 +02:00
Macron1Robot	8ec7a9b919	Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json"	2014-04-27 10:43:46 +04:00
Macron1Robot	907caedb13	Added "produce" section in "building" structure. Changed dailyIncome.	2014-04-26 18:23:35 +04:00
Michał Janiszewski	bece1e5b1f	fixed possible nullptr dereference ... * Fixed a switch() statement in InfoBoxHeroData::getValueText that could result in nullptr dereference. If 'type' was HERO_MANA and 'hero' was nullptr, a fallthrough would occur to HERO_EXPERIENCE, where 'hero' would we be dereferenced. * Fixed line endings.	2014-04-25 14:31:11 +02:00
Macron1Robot	9123c7a787	Fix for map tavern (video set to standard)	2014-04-25 01:06:14 +04:00
Macron1Robot	b7b890acff	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
DjWarmonger	9e7013de77	Backup for my own MVS project configuration	2014-04-24 21:07:43 +02:00
beegee1	1d57b75bc5	- random number generation refactoring ... - fixed mantis #1743	2014-04-10 19:22:32 +02:00
Ivan Savenko	43ba3d30ea	Breaking things - first commit towards configurable object(s). ... - New files: lib/CObjectWithReward.h/cpp - Classes that will be replaced by configurable object are now in this fil Status: far from functional, currently at "it compiles" point, some essential pieces are still missing.	2014-04-06 23:14:26 +03:00
DjWarmonger	30b79588db	- Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player. ... - Some optimizations with local cb pinter in VCAI.	2014-04-01 11:53:28 +00:00
Ivan Savenko	771c1ce255	- some effords to get rid of bottlenecks in AI code ... - fixes, probably partially #1577 - enabled code for reading map object templates from json, still not used - disabled PCH for launcher due to speed issues.	2014-03-23 16:36:16 +00:00
Ivan Savenko	9c0df68cb8	Fixing spelling mistakes. Patch from josch, fixes #1759	2014-03-23 12:59:03 +00:00
Ivan Savenko	760ae7d44a	Changes related to Debian packaging, based on josch patch ... - AUTHORS file is now in UTF-8 - tags for desktop files - fixed some typos - better reaction on --help and --version commands - vcmibuilder should work with both avconf and ffmpeg	2014-03-20 18:17:40 +00:00
beegee1	fe1b16a7ec	Some preparation towards mantis #1743: ... - refactored CRandomGenerator (added util methods, improved method names) - usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced) - refactored getArtSync method of CArtHandler -> now named pickRandomArtifact - fixed some compiler warnings - updated source code URL in VCMI spec	2014-03-17 19:51:07 +00:00
alexvins	9cac0af7be	[Spells] More spell related refactoring ... + smart target modifier - CREATURE_EXPERT_MASSIVE target type * save format changed spell format changes already documented in http://wiki.vcmi.eu/index.php?title=Spell_Format	2014-03-17 13:11:10 +00:00
alexvins	065b8366fb	[Spells] Added basic support for icons and sounds ... * few changes in spell format * save format changed	2014-03-10 16:00:58 +00:00
Ivan Savenko	d2ae847ecf	- files in local directories (saves & configs) now always have higher ... priority than mods. Fixes #1685 and #1733 - fixed possible crash on exit in dispose() function - (vcmibuilder) fixes problem with partial mp3 -> ogg conversion	2014-03-08 16:05:23 +00:00
alexvins	4203d69525	Part 2 of new spell configuration ... 1) spell handler refactored to support modding in general way 2) imunnity icons moved to WoG as they depends on wog`s graphics 3) introduced new class template for handlers (todo: use this in other handlers) 4) save format changed 5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config) 6) new format documented on wiki, added json schema. * more split of registertypes - fixes 32 mingw build	2014-03-07 13:21:09 +00:00
Ivan Savenko	5cbec833c2	- (linux) XDG filesystem support ... BIG NOTE TO LINUX USERS All user data has been moved according to XDG specs: - Game data (H3 files and mods) and saves: from ~/.vcmi to ~/.local/ - Temporary files, including logs: from ~/.vcmi to ~/.cache/vcmi - Config files: from ~/.vcmi/config to ~/.config/vcmi For compatibility VCMI will read game data from ~/.vcmi as well but this is temporary behavior and will be removed	2014-03-04 14:51:10 +00:00
stopiccot	7356145c3a	updated LD_RUNPATH_SEARCH_PATHS	2014-03-04 03:51:17 +00:00
Michał W. Urbańczyk	2c52617c1d	Fixed video flickering in the campaign intro screen.	2014-03-01 18:50:50 +00:00
Michał W. Urbańczyk	f6c2c96cdc	Copyright update.	2014-03-01 18:46:54 +00:00
Michał W. Urbańczyk	03fbd4e8a7	Fixed tracking autosaves.	2014-03-01 17:35:56 +00:00
Michał W. Urbańczyk	a6f68d6870	Fixed #1726.	2014-03-01 13:42:23 +00:00
DjWarmonger	b8b809bd50	Fixed #1667, #1669	2014-02-28 17:49:56 +00:00
Michał W. Urbańczyk	93856dbe98	Quick solution for #1688.	2014-02-27 20:44:20 +00:00
Ivan Savenko	e101caa997	Fixed possible buffer overflow on visiting tavern ... Introduction of unicode made fixed-length buffers too short in some cases	2014-02-26 21:20:36 +00:00
Ivan Savenko	78609871ae	bugfixing: ... - fixed parsing of campaign bonuses (conversion to building ID) - CONTROL event condition can be also fulfilled by allies - fix for crash on opening exchange window in Russian version	2014-02-26 17:32:42 +00:00
Ivan Savenko	8d36bcabce	Split registerTypes into multiple files, now in lib/registerTypes ... directory in order to reduce huge memory usage by gcc	2014-02-24 19:57:33 +00:00
Michał W. Urbańczyk	1e555a8ee3	Improved serializer. See: http://forum.vcmi.eu/viewtopic.php?p=11562#11562 ... Save format changed, removed compatibility workarounds.	2014-02-19 01:04:27 +00:00
alexvins	d01b84b460	[mechanics] fix copy-paste errors in magic skill arrays ... [c::b] few tweaks to configuration	2014-02-15 09:40:33 +00:00
Ivan Savenko	48d6e2cd59	- move campaigns description into new config file, campaignSets.json ... - campaigns parser uses binary reader, fixes #1711 - fixed description of change resolution button	2014-02-14 22:46:06 +00:00
Ivan Savenko	e6f433795b	- fixed some crashes on staring a map/campaign	2014-02-08 21:05:24 +00:00
Ivan Savenko	562dc02b3b	- fixed crash on decompressing some files from gzip stream (reported on ... forums)	2014-02-08 10:30:10 +00:00
beegee1	95034b9fa0	- Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required ... - Fixed compilation error (VCAI ResourceSet logging)	2014-02-05 20:25:36 +00:00
Michał W. Urbańczyk	55271e621b	Possibility to switch autoskip in the runtime.	2014-02-02 14:39:32 +00:00
Michał W. Urbańczyk	55165a8535	Fixed #1686. Compatibility measures to be removed later, when format changes become to big.	2014-02-02 14:31:56 +00:00
Ivan Savenko	14535c1c7b	- fixed crash on finishing a campaign.	2014-02-01 14:32:09 +00:00
beegee1	df0a28d9cb	- added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON)	2014-02-01 13:37:26 +00:00
Michał W. Urbańczyk	be3bd35b95	Hopefully fixes #1677 and its duplciates.	2014-02-01 13:35:03 +00:00
beegee1	d4fd361d4b	- fixed #1643 -> hero placeholder handling ... - fixed bug when loading victory/loss conditions of the 3rd scenario in the first ROE campaign - fixed bug when loading artifacts to hero of the 3rd scenario in the first ROE campaign (due to corrupt H3M map) - implemented function object to quickly find a object by it's sub ID in a list - added netbackbase.h to header list in CMake - removed false message which said that the server loaded the map successfully	2014-01-30 18:56:31 +00:00
Ivan Savenko	3779a54ddd	- probably fixed 1671 ... - fixed missing loss condition in Birth of Barbarian - fixed some bugs found by cppcheck	2014-01-30 11:08:37 +00:00
alexvins	16d6292be9	[refactor] extract often used classes from lib\NetPacks.h to separate header - less dependecies on whole packets class tree ... [mingw build] fix linking issues with netpacks. Mingw build is finally fixed! [c::b] update projects [config] fix and cleanup spell_info.json	2014-01-16 20:24:06 +00:00
Ivan Savenko	47c91e03b5	- fix to last commit ... - workaround to crash on disabling auto-battle (somehow client "remembers" one command given during auto-battle)	2014-01-14 14:34:08 +00:00
Ivan Savenko	c5b74a2dce	Miscellaneous fixes: ... - proper block of "back" button in campaign menu. - proper block of AI switch in battles - vertical garrisons can now be attacked from top - better UI logging, vcmi will print to log file all pressed buttons - server will not try to build already existing building	2014-01-13 17:44:21 +00:00
Ivan Savenko	fb5c9fc972	- creatures availability tests no longer check for built buildings. ... Fixes #1650 - do not crash if town has 0 creatures on some dwelling level - do not crash if dwelling for some level is not present in town at all	2014-01-11 18:12:09 +00:00
Michał W. Urbańczyk	0b2ca4416a	It is possible to use ffmpeg with Visual Studio 2013 build by definining USE_FFMPEG macro.	2014-01-06 19:12:21 +00:00
alexvins	a740f7989c	[c::b] update projects, disable PHC for now, +few fixes (still wip)	2014-01-05 17:48:50 +00:00
Ivan Savenko	1f325bafb3	fixes #1619 and #1647 ... - removed some no longer needed code from map handler - blocked "back" button on campaign map screen if some of scenarios are already completed	2014-01-05 13:45:44 +00:00
alexvins	339e1cd98b	[c::b] project file for minizip, lib & client update (wip)	2014-01-03 15:43:54 +00:00
Ivan Savenko	2c4c964a45	Large rewrite of adventure map objects: ... - replaced CDefObjInfo with ObjectTemplate class - ObjectTempate is a direct member of objects instead of pointer with shared ownership across CMap, handler and game objects - simplified handling of objects that can change appearance (e.g. towns) - all object queries regarding object appearance/blockmaps use h3m pos instead of relative positions - removed need of modhandler::reload - cleanup of some old code	2014-01-02 23:48:38 +00:00
Ivan Savenko	7e02f6b670	Support for overriding victory/defeat conditions from h3m map or ... campaign: - new file MapFormatJson that implements small subset of Json map format, as described on wiki - vcmi will read overrides from file config/mapOverrides.json (currently empty) - Json writer for logical expressions TODO: write data for map overrides	2013-12-30 23:09:58 +00:00
DjWarmonger	51e6961d08	Compile fix for MVS.	2013-12-29 15:48:56 +00:00
Ivan Savenko	96cc1b0e75	fixed slow loading of map selection window	2013-12-29 12:18:02 +00:00
Ivan Savenko	0c5be52a42	Win/loss conditions based on logical expressions, yet another large ... changeset: - victory/defeat will be detected using triggered events - vcmi will convert h3 conditions into set of triggered events - it is possible to either change number of days without towns or even remove this loss condition completely - possibility of custom win/loss text and icons in pregame (no longer connected to win/loss conditions) Still missing: - No interface to pass custom events/victory conditions into the game - AI would benefit from improvemets (handle all victory conditions, select best one to fulfill) - You have X days till defeat message still hardcoded to 7 days	2013-12-29 11:27:38 +00:00
Ivan Savenko	f6c1dace6c	Minors: ... - By default, cmake will keep debug info - removed warnings from adventure map infobox (part of #1636) - adventure map infobox will refresh on artifact changes (part of #1636) - moved terrain music files to terrains.json file - player should act before AI in all games, not only campaigns	2013-12-28 18:57:08 +00:00
beegee1	11ca1ec1f8	- Fixed custom main hero handling (map options) ... - Refactoring	2013-12-23 15:59:37 +00:00
Ivan Savenko	41cb1603e1	Fix for #1624 : ... - recreate adventure map interface on each scenario (to make sure that there is no garbage data from prev. game) - added check to avoid such situations in future	2013-12-20 15:00:48 +00:00
beegee1	68bdf71db6	- Fixed GCC compiler warnings ... - Implemented move heroes to next scenario partially	2013-12-20 13:07:58 +00:00
Ivan Savenko	29f4a12814	- fixed some evil memory leaks ... - fixed recursive dependency of castles	2013-12-19 19:43:16 +00:00
Ivan Savenko	881a7cf862	- added check to avoid recursion in AI town building code ... - restored previously missing AI shield during AI turn	2013-12-19 17:29:35 +00:00
beegee1	f0cbbbdb70	- Refactored method CGameState::init	2013-12-18 18:18:12 +00:00
beegee1	61fc216a6f	- Fixed mantis #1421 ... - Fixed initial map selection in campaign bonus screen	2013-12-17 17:14:55 +00:00
beegee1	d1002f7e8f	- Fixed starting another map from campaign bonus selection screen while playing a campaign mission	2013-12-17 12:12:25 +00:00
beegee1	b9b25ef552	- Fixed mantis #1422 (starting another scenario crashes VCMI for now) ... - Refactoring	2013-12-16 18:39:56 +00:00
stopiccot	c5e0e48d98	Some OS X related fixes	2013-12-13 11:51:15 +00:00
beegee1	69eee05ccc	- Partially fixed mantis #1065 (Gate with hex 95 can't be attacked) ... - Fixed 'catapult tried to attack non-catapultable hex!' problem, now catapult attacks attackable wall parts only - Fixed problem that the server performed applying damage on a wall part twice - Added methods for checking what wall parts are attackable and if a wall part is potentially attackable - Added functionality to trace net packages - Added functionality to trace std::vectors - Added tracing for CatapultAttack(CPack) - Updated various toString methods to use {} instead of [] - Refactoring	2013-12-08 17:54:13 +00:00
Ivan Savenko	5de70ba235	Minor fixes: ... - properly re-enable necessary mods during update - do not crash if building border is fully-colored	2013-12-08 10:07:06 +00:00
beegee1	f2cc630e2c	- Show confirmation dialog when pressing Alt + F4 to quit the game	2013-12-07 18:26:15 +00:00
beegee1	6caac8e82b	- Fixed mantis #1613	2013-12-07 10:04:17 +00:00
beegee1	2d095cf20a	- Fixed days without castle counter ... - Fixed 'you have only 0 days...' message - Checks victory/loss conditions every player turn instead of every day - Fixed mantis #1463	2013-12-06 19:44:11 +00:00
Ivan Savenko	b1e638d1af	More fixes: ... - logical expressions should compile without cpp include - fixed #1608 and #1610	2013-12-04 03:54:02 +00:00
DjWarmonger	b3b523b768	Compile fixes for MVS.	2013-12-03 15:24:13 +00:00
Ivan Savenko	ee1b0459e6	Extended building dependencies: ... - buiding/structure lists must use object format. This may break some outdated mods. - generic support for logical expressions that consist from and/or/not operators. - string ID's for buidings are now actually used.	2013-12-02 11:58:02 +00:00
DjWarmonger	21c18e44a0	Components of combined artifacts will now display info about entire set.	2013-12-01 13:08:35 +00:00
beegee1	36a69aaa2f	- Fixed VS project files (added missing .cpp files) ... - Structured VS project files (added a filter for every subfolder)	2013-11-30 14:22:03 +00:00
beegee1	41e274b4aa	- Moved FunctionList from /client to /lib -> used in client and server ... - Updated project files	2013-11-30 10:08:38 +00:00
beegee1	c786a3076a	- Refactored victory loss condition checks ... - Added toString() method to EVictoryLossCheckResult enum class to improve debugging - Removed mostly unused CFunctionList2 - Added missing header files for vcmiclient project to CMakeLists - Tweaked SDL suggests bpp message a bit - Added showInfoDialogAndWait (info dialog and waits, used from client thread) and showOkDialog (callback to ok click, used from GUI thread) to player interface - Added showOkDialog method to CInfoWindow (unused for now, but may be used later)	2013-11-30 09:43:31 +00:00
Ivan Savenko	27a30b5ff9	- compile fix ... - fixed crash if json defines only one creature horde	2013-11-24 11:36:51 +00:00
beegee1	3e4407593f	- Refactoring for checking victory/loss conditions (use enum class instead of magic numbers) ... - Improved showing player lost message for one special case	2013-11-17 17:57:04 +00:00
Ivan Savenko	2b6cdd5f41	- (linux) launcher will be available in OS start menu/launchers as ... "VCMI" and client will be present as "VCMI Client"	2013-11-16 18:13:30 +00:00
Ivan Savenko	3560bbb7f3	two patches/pull requests from janisozaur ... - replace our custom bmap with std::map::at() - compile fixes for editor	2013-11-12 10:45:42 +00:00
beegee1	237e4272da	Fixed mantis #1485	2013-11-10 15:04:29 +00:00
beegee1	e01ef8e36a	- Fixed mantis #1576 (doesn't hang game) ... - Implemented output stream operator<< for various classes(BattleAction, BattleHex,...) to improve debugging and logging	2013-11-09 16:25:20 +00:00
Ivan Savenko	55577d0ac4	- fixed missing DLL_LINKAGE ... - use precalculated checksum for zip files - UNUSED macro to silence some warnings	2013-11-09 13:49:36 +00:00
Ivan Savenko	ee6cdbeffe	went through the rest of cppcheck warnings, mostly harmless	2013-11-07 12:48:41 +00:00
Ivan Savenko	71d6b0fea9	- Fixed some warnings from cppcheck ... - Minor improvements to JSON validation - Cleanup in SDL_Extensions.cpp - Implemented new propery for creature format: idle animation duration - Disabled idle animation of some of conflux creatures (was clearly broken)	2013-11-06 13:42:58 +00:00
beegee1	86b7feeab3	- Fixed mantis #1248 ... - Fixed spellbook page save positions for hotseat mode	2013-11-03 18:16:25 +00:00
beegee1	94bee3fd1b	- Changed visibility of curInt member of BattleInterface from public to private and provided a getter method	2013-11-03 16:44:47 +00:00
Ivan Savenko	0e3eae3095	patch from KroArtem	2013-11-03 12:51:25 +00:00
Ivan Savenko	c4716d0a9a	- reordered files in cmake so files with long compile times will be ... compiled first. - changed format of modSettings.json, VCMI should properly update file on the first run. - implemented property "defaultTavern" that acts as default value for "tavern" entry in hero class and town formats.	2013-11-03 12:07:23 +00:00
beegee1	aa1c193b88	Fixed mantis #1582	2013-11-02 20:07:45 +00:00
Ivan Savenko	6cb3cb006d	Several minor fixes/features ... - moved all traslatable strings into one json file, removed threats.txt file - implemented "spellbook animation" option - fixed missing central tower when attacking fort	2013-10-27 13:05:01 +00:00
Ivan Savenko	9237e6d97d	Improved json validation ... - split JsonNode.cpp into JsonNode and JsonDetail files - validation should be notably faster (at least 10% faster loading) - support for "format" field, allows checking existance of files. - minor fixes in schemas - msk/msg files are now optional	2013-10-26 19:33:34 +00:00
Ivan Savenko	e2c037402c	Unicode support. ... - boost-locale library is now required (boost 1.48 or higher) - Unicode namespace that contains UTF-8 handling - All non-ASCII strings from H3 data will be converted to UTF-8 during loading - All JSON files MUST use UTF-8. - H3 data encoding can be selected via launcher or directly in config file	2013-10-25 21:45:14 +00:00
Ivan Savenko	f6a3d6770f	- chinese fonts now use fallback to H3 fonts for ASCII characters ... - proper messages for not implemented main menu entries - some cleanup of CMessage::breakText()	2013-10-20 21:53:27 +00:00
Ivan Savenko	f838cceddd	- fixes Inferno Castle Gate	2013-10-17 13:54:12 +00:00
Michał W. Urbańczyk	d5263d75f8	Fixed #1490.	2013-10-13 17:37:59 +00:00
stopiccot	cbc8cde10a	some OS X fixes	2013-10-07 01:19:02 +00:00
Ivan Savenko	d09294e40a	compile fix, fixes blit order of heroes in siege	2013-09-30 08:45:26 +00:00
Ivan Savenko	84dea676f2	compile fix, fixes missing end-of-line #1483	2013-09-28 13:32:49 +00:00
Michał W. Urbańczyk	0abbe71b25	Merged fixes from the branch.	2013-09-28 00:58:33 +00:00
Michał W. Urbańczyk	c6c53a5b1e	Few more freeze-related fixes.	2013-09-28 00:30:12 +00:00
Michał W. Urbańczyk	d1807585ad	Fixed at least two #1428 freezes, likely more. ... They were occurring when AI hero visited bank that was also guarded by neutral creature nearby,	2013-09-27 23:46:58 +00:00
Michał W. Urbańczyk	4f29b526ca	The battle callback method battleGetAllStacks will by default omit the arrow turrets. Fixes #1453, #1455 and related.	2013-09-27 19:42:17 +00:00
Ivan Savenko	eb6ff6b114	fixes #1482, add one pixel spacing for Chinese fonts	2013-09-25 21:15:15 +00:00
DjWarmonger	1ea9dab30d	Creature abilities without any name (but with graphics) will display in creature window.	2013-09-25 10:41:32 +00:00
Ivan Savenko	208df34fc2	bigfixing & new file: launcher/jsonutils.cpp ... - launcher uses json parser from vcmi lib instead of one from Qt #1469 - fixed abilities overrides for some creatures #1476 - fixed hero portraits in seer huts #1402 - ttf fonts will render text in utf-8 mode. Not really useful at this point - new settings entry, available in launcher: encoding. Unused for now.	2013-09-21 18:29:26 +00:00
DjWarmonger	d06b02638b	Partially implemented #481	2013-09-17 12:02:33 +00:00
Michał W. Urbańczyk	d4a8e90460	Fixed #1448, #1470	2013-09-14 19:09:35 +00:00
Michał W. Urbańczyk	291da5e893	Fixed #1442, likely a few others as well.	2013-09-12 22:33:08 +00:00
Michał W. Urbańczyk	b62bb096a7	Fixed #1430, work-around to make #1435 non-crashing. ... Fixed at least one of the #1428 infinite turns cases.	2013-09-11 21:57:08 +00:00
Ivan Savenko	6331995afd	minors: ... - fixes missing line of pixels with Chinese fonts - disabling a mod won't disable all its requirements as well	2013-09-08 18:35:09 +00:00
Ivan Savenko	e13dc872e0	- support for Chinese fonts (GBK 2-byte encoding) ... - fixes #1446	2013-09-08 16:49:23 +00:00
Ivan Savenko	42879225f0	minor fixes: ... - don't crash if image can't be player-colored (no palette) - fixes #1447 - compile fix	2013-09-08 13:02:34 +00:00
Ivan Savenko	76c77d58f6	const-ified CTown. May fix #1444	2013-09-06 21:57:16 +00:00
Michał W. Urbańczyk	385f4ab7f5	#1153 and #1395 should be fixed. Terrible, terrible, terrible. ... Fixed crash in battles, when attempted to access <0 screen coordinates.	2013-09-01 22:55:57 +00:00
Ivan Savenko	708b0c6f47	- fixes #1424 - added missing override and CLabel::visibleText()	2013-09-01 17:34:46 +00:00
Ivan Savenko	7f43150bb9	- fixes #1423 - convert values to int before using	2013-08-31 00:21:29 +00:00
Ivan Savenko	fba4c2cf9e	- fixes #874	2013-08-30 13:19:08 +00:00
Ivan Savenko	8ac6a1fcf4	- fixes 1394	2013-08-29 20:35:24 +00:00