Chris Robinson
40f8e75763
Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations
...
Note that actors will *not* automatically resume a normal idle state afterward.
Their AI will need to control what to do when the special idle is finished.
2013-01-18 15:39:28 -08:00
Chris Robinson
a527cb8349
Loop the current animation when not dead
...
This should be better, but it's not perfect. It misses the case where
start < loop start == loop stop <= stop
2013-01-18 15:22:14 -08:00
Chris Robinson
c7684cb979
Pass the key time to markerEvent
2013-01-18 14:50:55 -08:00
Chris Robinson
3e9b0a333c
Allow specifying the accumulation for animations
...
Animations that move a character may do so either visually or physically. An
axis' accumuluation value specifies whether the movement is visual (0) or
physical (1). Idle animations, for instance, typically don't physically move a
character, while death animations may physically move them along the X and Y
planes, but not along Z (the vertical movement is purely visual).
2013-01-18 14:25:32 -08:00
Chris Robinson
5cafc24ee2
Rename CharState_Alive back to CharState_Idle
2013-01-18 13:43:45 -08:00
Chris Robinson
613529f1d6
Merge remote-tracking branch 'zini/master' into animation2
2013-01-18 01:02:53 -08:00
Chris Robinson
a94947029e
Check the marker name before deciding what to do with it
...
Also, don't force 'idle' after a playgroup
2013-01-18 00:59:48 -08:00
Chris Robinson
9d7ccfda1f
Rename CharState_Idle to CharState_Alive
2013-01-17 21:07:36 -08:00
Chris Robinson
8720433fa9
Do not automatically loop animations
...
There are 0 length idle animations that break this
2013-01-17 17:54:09 -08:00
Chris Robinson
8fa1b56efc
Loop the current animation if there's nothing more queued
2013-01-17 16:34:26 -08:00
Chris Robinson
00879ab20e
Fix player rendering
2013-01-17 15:48:09 -08:00
Chris Robinson
fef6284f15
Only reset the animation time if a new state was set
2013-01-17 15:47:25 -08:00
Chris Robinson
fc0f9e2159
The animation state tracks the animation time for us
2013-01-17 14:49:42 -08:00
Chris Robinson
7cce44290e
Handle the animation queue in mwmechanics
2013-01-17 13:18:40 -08:00
Chris Robinson
47c157303a
Filter events that do not belong to the current group
2013-01-17 11:03:58 -08:00
Chris Robinson
da4f17859e
Recognize soundgen animation markers
2013-01-17 10:16:36 -08:00
Marc Zinnschlag
82b790770d
Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'
2013-01-17 10:21:01 +01:00
Chris Robinson
82d549e22f
Don't update the animation if time is the same
2013-01-16 21:39:14 -08:00
Chris Robinson
7ee389f3b2
Handle animation skipping in the character controller
2013-01-16 21:25:50 -08:00
Chris Robinson
852aa214cc
Store the available animation names in the character controller
2013-01-16 21:16:22 -08:00
Chris Robinson
afbc9f3e41
Keep track of the animation group currently playing
2013-01-16 20:44:37 -08:00
Chris Robinson
4dd01b81c6
Update mTime when updating or reseting the animation, and refactor the animation loop
2013-01-16 20:14:49 -08:00
Chris Robinson
685f219560
Return a movement vector from the character controller update
2013-01-16 18:56:13 -08:00
Chris Robinson
daad8d9859
Don't update the character controller while paused
2013-01-16 18:03:39 -08:00
Chris Robinson
d2f5a886c7
Handle playgroup and skipanim through mwmechanics
2013-01-16 17:53:18 -08:00
Emanuel Guevel
4feaa66897
Do not open the dialogue window if no greeting is found
2013-01-17 01:58:44 +01:00
Chris Robinson
46fc61a4c1
Run animations from the character controller
2013-01-16 16:31:09 -08:00
Chris Robinson
46728ab27f
Handle "sound:" animation events
2013-01-16 15:52:03 -08:00
Chris Robinson
3c32385e17
Avoid trying to animate things that don't have animations
2013-01-16 15:00:06 -08:00
Chris Robinson
94b93227d3
Treat activators as actors for rendering and mechanics
...
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
2013-01-16 14:37:32 -08:00
Chris Robinson
d2fc3c7b33
Add a method to tell the character controller of new text keys
2013-01-16 13:09:21 -08:00
Marc Zinnschlag
7b568cbb15
Merge remote-tracking branch 'potatoesmaster/dialogue'
2013-01-16 22:03:40 +01:00
Chris Robinson
0a2f92f679
Keep track of the current text key in the animation
2013-01-16 11:57:08 -08:00
Chris Robinson
f46587c383
Store an character controller in the animation
2013-01-16 11:01:08 -08:00
Chris Robinson
3c487e6019
Play an animation when changing states
2013-01-16 10:45:18 -08:00
Chris Robinson
b378bc92a0
Store an animation object in the character controller
2013-01-16 10:16:37 -08:00
Chris Robinson
63e685ea39
Add a method to get the Animation from a Ptr
2013-01-16 09:59:19 -08:00
Chris Robinson
c1b32d6006
Remove outdated comments
2013-01-16 08:24:20 -08:00
Chris Robinson
3c02e1ccc9
Run physics right after updating the actors
2013-01-16 08:22:38 -08:00
Chris Robinson
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
2013-01-16 07:36:56 -08:00
Marc Zinnschlag
312f68bf9c
Merge remote-tracking branch 'thoronador/fix-spelling'
2013-01-16 12:28:33 +01:00
Thoronador
3220330ce0
fix spelling in comment
2013-01-16 04:19:16 +01:00
Chris Robinson
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-01-15 14:59:30 -08:00
Emanuel Guevel
9e00c6694f
Allow only ID filtered topics for dialogue with creatures
2013-01-15 21:40:44 +01:00
Chris Robinson
8a073c113e
Use const references where appropriate
2013-01-15 12:07:15 -08:00
Chris Robinson
8361192b64
Use typedefs for some maps and some cleanup
2013-01-15 11:10:41 -08:00
Marc Zinnschlag
3053440462
Issue #539 : fixed AiWander
2013-01-15 12:40:44 +01:00
Emanuel Guevel
82287445af
DialogueWindow: do not execute onFrame() when not visible
2013-01-15 00:59:48 +01:00
Emanuel Guevel
f1f9173f24
Prevent closing dialogue window when an answer is expected
2013-01-15 00:53:32 +01:00
Marc Zinnschlag
654cd3ab9b
Issue #479 : Use magnitude specified when adding disease
2013-01-13 14:52:55 +01:00
