346 commits

Author	SHA1	Message	Date
scrawl	07d0f4458d	Rotate clouds/particles to come from red mountain (Fixes #245)	2014-06-27 03:22:00 +02:00
scrawl	9eb8addc70	Make flying creatures fall when paralyzed (Fixes #1494)	2014-06-27 03:21:50 +02:00
scrawl	3d9bdad8ba	Correct run speed for creatures (by Hrnchamd - Fixes #1136)	2014-06-25 00:51:02 +02:00
scrawl	693a097b21	Implement idlestorm animation (Feature #41)	2014-06-24 18:37:38 +02:00
scrawl	9a6737073f	Fix broken swimdeath in first person	2014-06-18 16:57:54 +02:00
scrawl	345ba99c17	Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497)	2014-06-16 02:52:25 +02:00
scrawl	9ea071c1e8	Fix weapon incorrectly showing when saving and loading with spell equipped	2014-06-16 02:52:25 +02:00
scrawl	e288437885	Disable all other animations on death (Fixes #1483)	2014-06-15 14:18:16 +02:00
mrcheko	fc6366fb27	Merge remote-tracking branch 'upstream/master' ... Equipping_Weapon check isn't needed cause there won't be WeapType_None in that case Conflicts: apps/openmw/mwmechanics/character.cpp	2014-06-13 14:12:41 +04:00
mrcheko	698cbba6ef	old bug + comment fix	2014-06-09 23:02:06 +04:00
scrawl	69855097ca	Fix an always true condition (Bug #1355)	2014-06-08 11:22:37 +02:00
scrawl	927ae00454	Fix code that stopped animation immediately after starting it, due to thinking it has completed (Fixes #1370)	2014-06-08 11:22:37 +02:00
scrawl	d2e98c4de1	Fix forced switch to third person on death not always working ... For instance, when dying from fall damage	2014-06-05 17:21:02 +02:00
scrawl	0966755a0c	Store death animation index in CreatureStats	2014-05-26 20:52:32 +02:00
Emanuel Guevel	1e4a854433	Remove static method MWWorld::Class::get(&Ptr) ... It was just adding a level of indirection to Ptr.getClass(). All the call were replaced by that instead. The number of lines changed is important, but the change itself is trivial, so everything should be fine. :)	2014-05-22 20:50:00 +02:00
mrcheko	aa5647b45e	merge master, resolve conflicts	2014-05-17 19:20:57 +04:00
scrawl	dfacf8c044	Change ActiveSpells to use ActorId	2014-05-14 07:14:08 +02:00
scrawl	365ca6c7e1	Fixes #1331: Manually disable movement state for dead actors. ... For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.	2014-05-13 21:47:45 +02:00
mrcheko	e4fe78937a	Merge remote-tracking branch 'upstream/master'	2014-05-12 22:06:26 +04:00
mrcheko	f596b698d9	fixes to slow-down at jump startup and infinite air intertia growth	2014-05-04 18:15:07 +04:00
scrawl	fc7e79027a	Fixes #1144: Don't refreshCurrentAnims when adding already dead actors	2014-05-01 16:55:16 +02:00
mrcheko	6a3dddfb9a	merge master	2014-04-27 13:49:31 +04:00
scrawl	04964595ef	Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame	2014-04-26 16:44:20 +02:00
mrcheko	f3626adc86	remake of z-moving in combat for flying/swimming enemies	2014-04-26 00:20:55 +04:00
mrcheko	fbd0ffe86f	enable z-moving for flying/water combatants	2014-04-22 22:59:39 +04:00
scrawl	688415ce54	Play deathknockout/deathknockdown animations when appropriate	2014-03-26 18:55:16 +01:00
scrawl	394284d0f8	Fixes #1209: Tarhiel never falls ... There are a few pitfalls with this code: - Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?) - The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.	2014-03-22 02:08:04 +01:00
scrawl	12de0afb03	Feature #50: Spawn projectiles ... Fix a bug in copyObjectToCell. Make actor rotations more consistent.	2014-03-08 01:31:27 +01:00
Marc Zinnschlag	367919200f	moved CellRefList into a separate file	2014-02-23 20:11:05 +01:00
mrcheko	a6be72673c	improves animation-controlled velocity check	2014-02-08 16:59:15 +02:00
scrawl	6ce499f0e6	Fixes #848: Use hardcoded animation velocity for first person movement	2014-02-06 04:05:22 +01:00
scrawl	ffe19e7a52	Feature #50: Handle attach & release of projectiles	2014-02-05 05:18:11 +01:00
scrawl	8b8fb931a0	Feature #50: Don't allow ranged weapon attack when ammunition is empty	2014-02-05 05:18:10 +01:00
scrawl	a07eaa0c0d	Feature #50: Allow body pitch in third person for ranged weapon aiming	2014-02-05 05:18:10 +01:00
scrawl	5ee105c812	Fix typo	2014-02-05 05:18:10 +01:00
scrawl	7cf22391a5	Feature #50: Handle weapon controllers (i.e. bowstring animations, etc)	2014-02-05 05:18:10 +01:00
scrawl	df78357e05	Handle knockout separately (Closes #1151)	2014-02-05 05:18:09 +01:00
mrcheko	688f359a33	discard creatures speed and negative fatique changes	2014-02-03 23:09:26 +02:00
mrcheko	761f13d3ce	activate whole-body attack animations	2014-02-02 16:29:51 +02:00
mrcheko	b85a4dd35e	pos accum without conformity with animation bug/creature speed	2014-02-02 15:01:49 +02:00
scrawl	49e26415be	Don't call loadGame() from within the MWMechanics::Actors update sequence	2014-02-01 18:42:00 +01:00
Marc Zinnschlag	1b5301eec0	Merge branch 'savedgame' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwbase/soundmanager.hpp apps/openmw/mwgui/mapwindow.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwsound/soundmanagerimp.hpp components/esm/loadcell.cpp	2014-02-01 18:16:32 +01:00
scrawl	067c2bc2ec	Disable combat movements for creatures without weapons	2014-01-31 04:43:35 +01:00
scrawl	7820ea5806	"Always best attack" should only affect the player	2014-01-31 04:43:35 +01:00
scrawl	39d86a9468	Improvements to smooth NPC steering	2014-01-31 04:43:29 +01:00
mrcheko	80d8aa4030	bug with sequence of knockouts; giving sense to some hit state code	2014-01-30 23:54:26 +02:00
mrcheko	e50e94af0b	remove CreatureStats::mAttackType, set/getAttackType()	2014-01-27 23:05:17 +02:00
mrcheko	fe0268062d	merge with master	2014-01-27 22:38:01 +02:00
mrcheko	45b3aa3d93	corrected things connected to determining attack type	2014-01-26 23:32:57 +02:00
scrawl	b1066de81d	Revert "Merge remote-tracking branch 'mrcheko/master'" ... This reverts commit 4e360136b1, reversing changes made to 047bbe43b2. Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-01-26 00:31:44 +01:00
scrawl	28185e2017	Death/godmode fixes: Revive player *after* character update, since there might be fall damage.	2014-01-25 15:54:24 +01:00
scrawl	03cf383be7	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-24 18:28:35 +01:00
mrcheko	87e83a92f8	refactoring of setting an attack type	2014-01-23 23:14:20 +02:00
scrawl	16f5f5862d	Feature #956: Implement blocking melee attacks	2014-01-21 23:25:24 +01:00
scrawl	fec26342cd	Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)	2014-01-19 21:11:48 +01:00
mrcheko	339399f8b1	bug fix/logic fix/future suggestion	2014-01-19 22:09:51 +02:00
scrawl	4e360136b1	Merge remote-tracking branch 'mrcheko/master' ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2014-01-19 14:01:39 +01:00
scrawl	047bbe43b2	Don't complain about missing jump animations	2014-01-19 13:46:40 +01:00
scrawl	13646a651b	Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.	2014-01-19 13:32:58 +01:00
scrawl	5049f3b134	Fix the group for creature attack animations	2014-01-17 20:18:35 +01:00
mrcheko	a11a6b616b	Merge remote-tracking branch 'upstream/master'	2014-01-17 21:00:55 +02:00
scrawl	9b32b1403b	Feature #960: Implement Creature::hit	2014-01-17 17:19:08 +01:00
scrawl	228254c890	Handle creature attack animations in character controller	2014-01-17 16:31:27 +01:00
scrawl	c548dcee13	Quick keys menu: make sure selected spell still exists	2014-01-17 15:20:22 +01:00
mrcheko	f2ad1c18f2	fix merging problem/some logic fixes	2014-01-16 22:24:05 +02:00
mrcheko	d5f794d4fb	update to combat ai behaviour	2014-01-15 22:56:55 +02:00
scrawl	d544551f61	Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization) ... Information provided by Hrnchamd.	2014-01-15 15:50:45 +01:00
scrawl	7534fc968d	Minor acrobatics fixes	2014-01-15 14:53:30 +01:00
scrawl	da3295d69c	Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations.	2014-01-15 14:53:29 +01:00
scrawl	de64c57179	Fix some typos and accidental commit	2014-01-15 14:53:28 +01:00
scrawl	52b9ebff9d	Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.	2014-01-14 07:42:03 +01:00
scrawl	83872f6bf5	Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.	2014-01-13 10:18:02 +01:00
scrawl	767c72e619	Fix diagonal movement being faster than forward movement	2014-01-12 10:04:06 +01:00
scrawl	921ef6cd9c	Closes #1093: Show weapon when initializing the character controller with a weapon equipped	2014-01-12 00:42:27 +01:00
scrawl	44b2380874	Closes #947: Decrease fatigue when running, swimming and attacking	2014-01-11 22:28:50 +01:00
Marc Zinnschlag	1b03eec63e	Merge remote-tracking branch 'scrawl/master'	2014-01-11 11:43:12 +01:00
scrawl	3896c88403	Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any	2014-01-11 05:58:05 +01:00
Marc Zinnschlag	f62497dfdc	Merge remote-tracking branch 'mrcheko/master'	2014-01-10 19:08:35 +01:00
mrcheko	ffcb7fb280	fix for bug scrawl mentioned	2014-01-10 19:04:07 +02:00
mrcheko	d41f27451b	appropriate camera vanity<>preview mode switch + hit recoils fix	2014-01-09 23:36:40 +02:00
Marc Zinnschlag	85707b5e3e	Merge remote-tracking branch 'scrawl/master'	2014-01-09 09:35:54 +01:00
scrawl	098f9712f1	Add getPlayerPtr() utility method. Reduces dependencies a lot.	2014-01-08 18:39:44 +01:00
mrcheko	46519062d3	hit recoils/knockdowns feature	2014-01-08 16:05:14 +02:00
mrcheko	2591ff2d5a	bug repairing	2014-01-06 22:00:01 +02:00
scrawl	62774fcc4a	Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp	2014-01-06 00:23:17 +01:00
mrcheko	7002412760	resolve conflict in character.cpp	2014-01-04 17:55:09 +02:00
scrawl	b22dd40b41	Implement Paralyze magic effect	2014-01-03 17:06:05 +01:00
mrcheko	79e972bdb6	resolved accompanying minor problems	2014-01-02 21:54:41 +02:00
mrcheko	16e10cc702	error fix	2014-01-01 22:46:29 +02:00
mrcheko	09a0a69b04	more improvements	2014-01-01 21:40:31 +02:00
mrcheko	a8fb1ae51c	improved, added knockdown after falling	2013-12-31 17:55:04 +02:00
mrcheko	d6345bce91	added npc hit reactions	2013-12-31 13:24:20 +02:00
scrawl	79a440e94a	Many additions to 900bc06d2c: ... - Fix indentation - Consider any kind of light, not just torch_infinite_time - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon) - Remove redundant code and don't add additional lights to the inventory - World::isDark returns false for interiors which are unaffected by weather	2013-12-30 17:57:41 +01:00
Marc Zinnschlag	6de39a7329	Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-12-29 15:00:31 +01:00
scrawl	17ff8165d2	Closes #1065: Don't apply fall damage when landing in water	2013-12-29 00:36:36 +01:00
scrawl	85ec80100c	Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat	2013-12-27 22:00:16 +01:00
scrawl	7265b427fe	Bug #1013: Rewrote fall height detection	2013-12-27 21:21:18 +01:00
scrawl	a3017e16d4	Don't allow changing the spell that is being cast mid-animation	2013-12-26 22:32:39 +01:00
scrawl	5054d8e6c1	Bug #1055: Check power use and mana before starting cast animation	2013-12-26 22:06:13 +01:00
Lukasz Gromanowski	900bc06d2c	Fixes #845: NPCs hold torches during the day ... Moved 'equipping torches at night and unequipping at day' code from Character to Actors class. Removed unneeded showLights method (introduced in previous commits) from animation/npcanimation classes. Since this commit autoEquip() method doesn't automatically equip lights. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 22:38:23 +01:00