games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
5,463 Commits 30 Branches 75 Tags
a1f5a0a85ca75f2e472a4ad123056bf451429ae6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS 5cd4e852d4 Use portable cast in CTeleportDialogQuery also 2015-12-13 15:59:48 +03:00
AlexVinS 9a0161e4e2 Fix and unify CBattleQuery::blocksPack 2015-12-13 15:57:33 +03:00
Alexander Shishkin d9ada3a42f Merge pull request #149 from vmarkovtsev/issue/2306 
Remove undefined behavior in requestActionASAP
 2015-12-13 15:31:34 +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
AlexVinS d6bb599bc8 Another ffmpeg api fix 2015-11-14 03:59:16 +03:00
AlexVinS cdec29e413 Merge branch 'ffmpeg-cleanup' into develop 2015-11-12 15:47:02 +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
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
Alexander Shishkin da01af319b Merge pull request #124 from vcmi/issue/1372 
Issue/1372
 2015-11-04 10:39:40 +03: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
AlexVinS fbebbf39f3 Fix zero size stack summoned in case of basic resurrection. 2015-11-03 02:18:35 +03:00
AlexVinS f6b9015324 Use constant for summoned creature slot 2015-11-03 02:18:34 +03:00
AlexVinS c94bea51e3 Update army in case of summoned creatures 2015-11-03 02:18:33 +03:00
AlexVinS b024237e8a Remove stack instancies of removed stacks 2015-11-03 02:18:32 +03:00
AlexVinS 1bcfa986e4 Apply fixes to pathfinder 2015-11-01 01:52:43 +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
Alexander Shishkin 4df16d525a Merge pull request #130 from vmarkovtsev/issue/2306 
Issue/2306
 2015-11-01 01:10:27 +03:00
AlexVinS 34cc9c78f7 [c::b] update projects 2015-11-01 00:01:41 +03:00
Alexander Shishkin 610318d5d3 Merge pull request #129 from vmarkovtsev/issue/2306 
Fix the second crash (dynamic_cast failure)
 2015-10-27 13:23:42 +03:00
AlexVinS c9e03405f2 fix a warning 2015-10-25 23:17:33 +03:00
AlexVinS e8e484bbca Merge branch 'mutexRelax_fix' into develop 2015-10-25 22:35:19 +03:00
Alexander Shishkin 07f99f06ef Merge pull request #126 from vmarkovtsev/issue/2306 
Fix typeid ordering bug on MacOSX
 2015-10-25 15:47:11 +03:00
AlexVinS cfb5853689 Just a bit of black magic 2015-10-25 03:29:16 +03:00
AlexVinS 0f9de1c560 Made CTypeList threadsafe 2015-10-25 03:26:48 +03:00
AlexVinS 687a82886f cleanup CTypeList interface 2015-10-25 01:38:30 +03:00
AlexVinS 92ae56b369 Mingw build fix 2015-10-24 22:21:54 +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
AlexVinS b94432b4ba Fixed http://bugs.vcmi.eu/view.php?id=2297 
* allow banned spells by Tomes (XXX_SPELLS bonus), Spelbinders Hat (SPELLS_OF_LEVEL bonus)
* allow banned spells by cheat-code (now also SPELLS_OF_LEVEL bonus)
 2015-10-13 13:16:46 +03:00
AlexVinS 61af4ee89a Merge branch 'SpellsRefactoring7' into develop 2015-10-13 08:12:22 +03:00
AlexVinS eeb100d6a4 More comments about dispell special cases. 2015-10-13 07:11:49 +03:00
AlexVinS 2677d4a677 Fixed action cancel on active stack remove 2015-10-08 08:15:29 +03:00
AlexVinS 02c15085be Remove (aready disabled in prev. commit) active stack change in sacrifice mechanics 
* stack removing is evil, but changing active stack by spells is more evil ...
 2015-10-06 03:59:05 +03:00
AlexVinS f99bf099ca Made player interface tolerant to active stack removal. 2015-10-06 03:46:35 +03:00
AlexVinS d042b08682 Fix the SACRIFICE fix regression 
(crach if stack die on counter attack)
 2015-10-06 02:04:25 +03:00
AlexVinS 4e60b4cf53 Fixed 0002280 2015-10-06 01:26:50 +03:00
AlexVinS f1d9e15783 [Tweak] Magic values-- 2015-10-06 00:33:46 +03:00
AlexVinS a112c2f7c8 Made Disrupting Ray effect permanent. 2015-10-06 00:26:04 +03:00
AlexVinS d1ec538d72 Fix server crash releated to active stack remove. 2015-10-05 21:09:00 +03:00
AlexVinS 6cf220b882 Partial fix for 2272, there are more active stack sacrifice problems. 2015-10-05 20:33:05 +03:00
AlexVinS fa06e05487 Merge branch 'develop' into SpellsRefactoring7 2015-10-05 00:45:57 +03:00
AlexVinS b07d272c2a Added new BattleSpellCastParameters support to SACRIFICE spell. 2015-10-01 02:36:00 +03:00
AlexVinS 939a9180e2 Added new BattleSpellCastParameters support to TELEPORT spell. 2015-09-30 22:38:50 +03:00
AlexVinS 57e5b768e8 Allow multiple destinations in BattleSpellCastParameters 2015-09-30 00:31:50 +03:00
AlexVinS a06e34cf61 Cleanup 2015-09-29 19:14:24 +03:00
AlexVinS 1e2e40b9c0 Tweak bonus descriptions, fixes mantiss 2261 2015-09-29 18:11:43 +03:00
AlexVinS 70d9be8447 Use ISpellCaster in battle callback 2015-09-29 17:26:52 +03:00
AlexVinS 75c2566410 "const" tweak 2015-09-29 17:26:51 +03:00
AlexVinS 36e154d9b9 Use ISpellCaster in getAffectedStacks 2015-09-29 17:26:50 +03:00
AlexVinS 947f6089d5 Use ISpellCaster in isImmuneByStack 2015-09-29 17:26:49 +03:00
AlexVinS a4d4851d80 Fix typo: casted->cast 2015-09-29 17:26:48 +03:00
AlexVinS d9cbe487c7 remove useless function CSpell::getTargetInfo 2015-09-29 17:26:47 +03:00
AlexVinS 72587a8299 Removed hardcoded check for ANIMATE_DEAD absolute imminity - there is json configuration for that 2015-09-29 17:26:46 +03:00
AlexVinS 5f41ec912f fix sphereOfPermanence 2015-09-29 17:26:45 +03:00
AlexVinS 3d7435c520 Introduced absolute specific spell immunity. 2015-09-29 17:26:44 +03:00
AlexVinS 253b850ac3 Partial fix for 1791 2015-09-29 17:26:43 +03:00
AlexVinS a44c606277 Use callback methods 2015-09-29 17:26:42 +03:00
AlexVinS 660203b436 Tweak BattleSpellCastParameters 2015-09-29 17:26:41 +03:00
AlexVinS 2b434111bf More hero|creature casting unification 2015-09-29 17:26:40 +03:00
AlexVinS e454649886 Use BattleSpellCastParameters for spell parameters override 2015-09-29 17:26:39 +03:00
AlexVinS 10318a3da3 Intoduce PASSIVE_CASTING mode for opening battle spells 
* now at least one "caster" object is present
 2015-09-29 17:26:39 +03:00
AlexVinS 6010bbe7ba More correct usage of battleGetFightingHero 
* this should fix "FIXME: battleGetFightingHero wrong argument!"
 2015-09-29 17:26:38 +03:00
AlexVinS 92990c887c Fix creatures can always cast on self 2015-09-29 17:26:37 +03:00
AlexVinS e552e37cf7 Factored out CDefaultSpellMechanics::battleCast 
(-) still huge
 2015-09-29 17:26:36 +03:00
AlexVinS baba3a46e1 Centralize creature spell bonuses handling 
* unified heal and damage calculation
* apply SPELL_DAMAGE_REDUCTION, MORE_DAMAGE_FROM_SPELL for Fairy dragon
 2015-09-29 17:26:35 +03:00
AlexVinS 67bd698019 Added some debug logging 2015-09-29 17:26:34 +03:00
AlexVinS 873979a300 The only usage of secHero cast parameter is mana channeling - better to get it OTF 2015-09-29 17:26:33 +03:00
AlexVinS 46f99db8d7 Hide some spell mechnaics details 2015-09-29 17:26:32 +03:00
AlexVinS 2c3a607497 Tweak StacksHealedOrResurrected 
* flags should be bool
 2015-09-29 17:26:31 +03:00
AlexVinS a1e06aa217 Unify LIFE_DRAIN and Tent healing with magic healing 2015-09-29 17:26:30 +03:00
AlexVinS 9ed9075afc Introduce calculateHealedHP again, now in better place. 2015-09-29 17:26:29 +03:00
AlexVinS 0929e009db Remove suspicios code in display damage calculation 2015-09-29 17:26:28 +03:00
AlexVinS 16f0714474 More usage of OOP in HealingSpellMechanics::applyBattleEffects 2015-09-29 17:26:28 +03:00
AlexVinS 0fecb40039 Extract HealingSpellMechanics 
* healing effects are too specific to be allowed for any spell
* mixing heal with direct damage does not make sence
* mixing heal with timed effect can be easy allowed if needed
 2015-09-29 17:26:27 +03:00
AlexVinS c050fde3f9 Get rid of DefaultSpellMechanics::calculateHealedHP 2015-09-29 17:26:26 +03:00
AlexVinS a35b8a46d3 Comment out wrong code 2015-09-29 17:26:25 +03:00
AlexVinS f66c29ea3b fix comments 2015-09-29 17:26:24 +03:00
AlexVinS 05e52993fd Simplified healed HP calculation 2015-09-29 17:26:23 +03:00
AlexVinS eb1753851e Fix comment 2015-09-29 17:25:04 +03:00
AlexVinS 108d4c39b5 Fix build 2015-09-24 11:55:23 +03:00
AlexVinS 8cad23956c Fix 2258 2015-09-19 17:16:09 +03:00
AlexVinS 9e0fd70208 Move isCastableBy logic back to CGHeroInstance - it is Hero-specific 
* When and if canCastThisSpell will also be implmented for creatures common part may be moved to CSpell class.
 2015-09-16 04:39:44 +03:00
AlexVinS dc8b05fbd8 Give banned spells only by SPELL bonus 2015-09-16 04:16:46 +03:00
AlexVinS f2605e059c Fix 2042 2015-09-16 02:20:57 +03:00
AlexVinS b0c039bd7f fix 2241 2015-09-15 10:54:55 +03:00
AlexVinS d181d764bb fix 2215 2015-09-15 10:02:27 +03:00
AlexVinS 395070b584 Fix 1974 2015-09-15 08:51:05 +03:00
AlexVinS 017b4c308c Enable crashhandler for mingw. It works for mingw 4.0. 2015-09-15 07:27:18 +03:00
AlexVinS 080244f30e MAXED_SPELL bonus should only affect spell effects 
* fixes 2146
 2015-09-15 06:00:24 +03:00
AlexVinS b4d73409b7 Fix random server crash after CLONE or SACRIFICE use 2015-09-15 04:58:32 +03:00
AlexVinS 27f2dfc576 Quick fix for SACRIFICE immunity check 2015-09-15 04:31:43 +03:00
AlexVinS bd70f672c3 fix 1814 2015-09-15 03:08:45 +03:00
AlexVinS 466ddb37b3 fix 1556 2015-09-14 18:38:41 +03:00
AlexVinS e5b4b2341d Fix fortess heros specialities, issue 2131 2015-09-14 17:36:33 +03:00
AlexVinS 3ed3f1fa13 Use json configuration for special spell effect duration 2015-09-14 13:22:23 +03:00
AlexVinS 3c053e5dd5 Quick fix for 2245 & 2238 2015-09-14 12:35:58 +03:00