1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

4479 Commits

Author SHA1 Message Date
AlexVinS
fe1233310f Centralize dispell mechanics 2014-11-25 23:59:21 +03:00
AlexVinS
756c19227b update VS project. untested. 2014-11-25 22:47:28 +03:00
AlexVinS
ca5391cde6 Get rid of handleSpellCasting 2014-11-25 22:00:04 +03:00
AlexVinS
2a75c432e0 Remove 2 unused methods 2014-11-25 19:45:50 +03:00
AlexVinS
fa9c1e8637 remove healedHP calculation from battlestate 2014-11-25 19:43:34 +03:00
AlexVinS
20a058f3f9 Formatting & cleanup 2014-11-25 18:27:18 +03:00
AlexVinS
c67887ae58 Use spell mechanics clases in GameHandler 2014-11-25 18:16:14 +03:00
AlexVinS
6d4cd1c91b Copying of handleSpellCasting finished 2014-11-25 17:37:42 +03:00
AlexVinS
a387ad0d09 Continue moving spell cast logic 2014-11-25 16:16:49 +03:00
AlexVinS
d87153a610 Hide mechanics classes 2014-11-25 15:00:34 +03:00
AlexVinS
c8f1e6d1a1 Move mechanics factory 2014-11-25 14:58:42 +03:00
AlexVinS
226b737b6b Small cleanup 2014-11-25 14:51:55 +03:00
AlexVinS
0fda90c67d Start moving server side spell mechanics 2014-11-25 14:19:13 +03:00
AlexVinS
f2bf3d7f7b Added a way to obtain ID of newly added Stack 2014-11-25 12:26:32 +03:00
AlexVinS
aa31625774 More flexible way of spell school access 2014-11-24 19:14:10 +03:00
AlexVinS
a71c452fc6 Merge branch 'develop' into SpellsRefactoring4 2014-11-24 12:45:34 +03:00
AlexVinS
bddf662178 Few tweaks to bonus descriptions 2014-11-24 12:44:46 +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
AlexVinS
6dbed27b65 Add more "const" 2014-11-23 14:10:29 +03:00
DjWarmonger
49c8137f6f Merge pull request #60 from ArseniyShestakov/saveMenuListFix
Fix invisible save select when click on save name area #944
2014-11-23 10:42:17 +01:00
ArseniyShestakov
6fd0f76547 Fix invisible save select when click on save name area 2014-11-23 08:51:48 +03:00
DjWarmonger
9e5cc2d1b1 Treasure piles will prefer to grow upwards to make space for object accessible from bottom. 2014-11-22 14:17:53 +01:00
DjWarmonger
91d89add7c Reverted RMG bug introduced in 6da79d01d7 2014-11-22 13:01:28 +01:00
DjWarmonger
c094e70784 Replaced legacy sprintf with boost::format. 2014-11-22 12:45:13 +01:00
DjWarmonger
4b02af23e1 Merge pull request #55 from KroArtem/develop
Merging, thanks!
2014-11-20 16:00:38 +01:00
KroArtem
6da79d01d7 reverted changes back 2014-11-20 15:33:22 +03:00
KroArtem
305ce5b53d fixed else statement 2014-11-20 15:14:16 +03:00
Ivan Savenko
7d429247ab Merge pull request #57 from josch/includeFuzzyliteCPP11Headers
add FL_CPP11 preprocessor define independent of which fuzzylite is used
2014-11-18 19:25:05 +02:00
Ivan Savenko
ffd5867913 Merge pull request #58 from josch/kFreeBSDandHurdSupport
FreeBSD and HURD support
2014-11-18 19:24:50 +02:00
Ivan Savenko
b73edea856 Merge pull request #59 from adrianlang/patch-1
vcmibuilder: Support another root directory
2014-11-18 19:22:56 +02:00
Adrian Lang
a939518950 vcmibuilder: Support another root directory
On my disk (HoMM 3 Complete Version 4.0 September 2000), LangInde_Program_Files is the root directory.
2014-11-18 09:55:27 +01:00
KroArtem
82b278307f fixed typo 2014-11-17 23:08:08 +03:00
DjWarmonger
2126939c98 Merge pull request #56 from ArseniyShestakov/develop
Simplest solutions are usually the best ;)
2014-11-17 17:14:57 +01:00
josch
5c356f4415 add support for the HURD 2014-11-17 16:43:26 +01:00
josch
a96b5e7905 add support for FreeBSD 2014-11-17 12:25:10 +01:00
josch
c36042f8c7 rename preprocessor variable VCMI_LINUX to VCMI_XDG
- the variable is only used to enable XDG support
 - XDG is not exclusive to linux
2014-11-17 12:19:52 +01:00
josch
2812334de9 add FL_CPP11 preprocessor define independent of which fuzzylite is used 2014-11-17 11:42:30 +01:00
ArseniyShestakov
4dd1ca5e78 Fix bonuses of Rampart's Treasury and Fountain of Fortune
Change IDs of two special buildings in Rampart to make them identical with one in config files / game assets.

Original code was introduced in 0ca9f64 with those two IDs likely was typo. As result Fountain of Fortune +2 luck bonus was given to Treasury and Treasury's weekly bonus didn't worked at all.
2014-11-17 03:26:18 +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
4c5c83aa1f Re add ERM to workspace
* To keep track of successful build
2014-11-14 07:48:56 +03:00
AlexVinS
b7ed11f582 Fix ERM build
(-) there is one regression, but ERM is unused yet
2014-11-14 07:45:44 +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
7a429fc38b Revert @24efb9b4 2014-11-14 03:29:11 +03:00
AlexVinS
8979de7960 Fix issue #1843 (teleport case) 2014-11-14 03:07:14 +03:00
AlexVinS
7af4f44237 rewrite CGHeroInstance::canCastThisSpell 2014-11-13 17:57:35 +03:00