gus
|
ee47e99dad
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
Conflicts:
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
|
2013-07-16 11:40:19 +01:00 |
|
Chris Robinson
|
a932a89e02
|
Specify the velocity-based animation speed multiplier when playing it
|
2013-07-16 01:30:03 -07:00 |
|
Chris Robinson
|
06e631f213
|
Track death separately in the character controller
|
2013-07-15 23:43:33 -07:00 |
|
Chris Robinson
|
4ae65c20e6
|
Separate movement and idle states
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
|
2013-07-15 22:56:23 -07:00 |
|
gus
|
f7f23ac5d8
|
improvement of the chop animation. Still some jittering.
|
2013-07-15 17:18:16 +01:00 |
|
gus
|
3947f44aa3
|
Porting old work
|
2013-07-13 22:24:52 +01:00 |
|
Glorf
|
88f8637145
|
Bugfix #795
|
2013-06-26 22:20:24 +02:00 |
|
Torben Carrington
|
c8c1ddd927
|
Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.
|
2013-05-24 20:10:07 -07:00 |
|
Chris Robinson
|
e8bbb755c3
|
Play the left-arm torch animation when it's equipped
|
2013-05-17 06:21:59 -07:00 |
|
Chris Robinson
|
4b9a888d74
|
Use the PickProbe animation group as appropriate
|
2013-05-17 01:46:51 -07:00 |
|
Chris Robinson
|
6201cb0093
|
Add a method to clear the animation queue
|
2013-05-16 06:59:41 -07:00 |
|
Chris Robinson
|
f83ee5d316
|
Play ready/unready animations on the upper body
|
2013-05-13 03:32:00 -07:00 |
|
Chris Robinson
|
70dc2f77ad
|
Move the priority enum to MWMechanics
|
2013-05-13 00:54:44 -07:00 |
|
Chris Robinson
|
7ba2508556
|
add a priority for death animations, and store it in the state list
|
2013-05-12 19:19:21 -07:00 |
|
Chris Robinson
|
4e389b5a8f
|
Store whether a given animation loops in the state table
|
2013-05-12 05:59:39 -07:00 |
|
Chris Robinson
|
2c556e4036
|
Be smarter about handling non-moving animations
Don't rely on being told by the play method, so the animation can
automatically change without impacting the character controller.
|
2013-05-12 04:29:42 -07:00 |
|
Chris Robinson
|
6b8a687a79
|
Add methods to disable an animation
And rename WeaponState to WeaponType
|
2013-05-10 22:22:39 -07:00 |
|
Chris Robinson
|
a120653c38
|
Implement handling weapon states
|
2013-05-01 10:19:16 -07:00 |
|
Chris Robinson
|
4b15da076b
|
Move getStateInfo into the character controller
|
2013-04-30 19:26:41 -07:00 |
|
Chris Robinson
|
05060e57ec
|
Add a weapon state to the character controller
|
2013-04-29 13:07:49 -07:00 |
|
scrawl
|
07891fa213
|
Athletics skill increase
|
2013-04-28 07:53:04 +02:00 |
|
Chris Robinson
|
274f3c7b77
|
Force character state to update after switching view modes
|
2013-04-25 07:08:11 -07:00 |
|
Chris Robinson
|
e4eb4b7e30
|
Keep track of the character looping state
|
2013-04-25 06:29:17 -07:00 |
|
Chris Robinson
|
9da2c9153e
|
Don't store the animation group string in the character controller
|
2013-04-25 06:12:37 -07:00 |
|
Chris Robinson
|
24f1eba902
|
Keep track of whether an animation supplies movement
Also handle it when it doesn't.
|
2013-04-24 22:45:43 -07:00 |
|
Chris Robinson
|
333354fe62
|
Remove the character controller from the Animation class
|
2013-04-24 07:10:41 -07:00 |
|
Chris Robinson
|
b80891099e
|
Don't use the character controller to handle text keys
The Animation class has the Ptr and can call to whatever subsystem is needed.
|
2013-04-24 06:48:34 -07:00 |
|
Chris Robinson
|
e8cabc9434
|
Pass the loop count from loopgroup to the play method
Instead of queueing each iteration separately.
|
2013-04-24 06:32:11 -07:00 |
|
Chris Robinson
|
4836ba16f7
|
Implement turning states
|
2013-03-31 03:50:20 -07:00 |
|
Chris Robinson
|
466c0086b8
|
Use a full Movement to hand off to the world physics update
|
2013-03-31 00:13:56 -07:00 |
|
Chris Robinson
|
af65ecd841
|
Pass the movement vector in as a parameter to CharacterController::update
|
2013-03-30 18:37:40 -07:00 |
|
scrawl
|
268bb23590
|
Implemented sneaking animation
|
2013-03-06 16:58:56 +01:00 |
|
Chris Robinson
|
48271e49ec
|
Properly update the Ptr object in the mechanics manager when moving across cells
|
2013-02-25 09:57:34 -08:00 |
|
Chris Robinson
|
f841576bba
|
Don't override animations played with playgroup
|
2013-02-23 01:54:46 -08:00 |
|
Chris Robinson
|
e4341525c8
|
Add a jump state
Currently unused
|
2013-02-15 04:45:28 -08:00 |
|
Chris Robinson
|
3348e8a436
|
Clarify a comment
|
2013-02-14 22:41:14 -08:00 |
|
Chris Robinson
|
cbaf489eb6
|
Add running states
|
2013-02-06 16:53:52 -08:00 |
|
Chris Robinson
|
fc307e64b0
|
Add swimming states
|
2013-02-05 19:05:07 -08:00 |
|
Chris Robinson
|
2c39760bd5
|
Move the movement solver code to mwworld's physics system
|
2013-02-05 12:45:10 -08:00 |
|
Chris Robinson
|
1747c1e01a
|
Integrate a new movement solver to handle object movement and collisions
Temporary, and pretty breoken. Needs some serious integration fixes.
|
2013-02-04 07:10:14 -08:00 |
|
Chris Robinson
|
91513206a0
|
Don't use per-animation accumulation values
This breaks walking diagonally and "jumping" (which technically wasn't jumping
anyway).
|
2013-02-03 12:02:51 -08:00 |
|
Chris Robinson
|
51d5efeeb2
|
Work out the state in the character controller update method
|
2013-02-03 07:15:34 -08:00 |
|
Chris Robinson
|
7fe877d8ea
|
Add a couple more character states
|
2013-02-03 00:19:22 -08:00 |
|
Chris Robinson
|
007a5963de
|
Handle most state changes in the character controller when setting the movement vector
|
2013-02-02 23:39:43 -08:00 |
|
Chris Robinson
|
37fe1bd3f0
|
Handle looping in the Animation object
|
2013-01-21 22:51:13 -08:00 |
|
Chris Robinson
|
e956a1cbc0
|
Merge SpecialIdle character state into Idle
|
2013-01-21 03:24:52 -08:00 |
|
Chris Robinson
|
85ca1e993f
|
Properly check if an animation exists before playing it
|
2013-01-19 21:55:04 -08:00 |
|
Chris Robinson
|
68779375b2
|
Implement WalkLeft and WalkRight character states
|
2013-01-19 16:19:47 -08:00 |
|
Chris Robinson
|
de2d084e61
|
Add a looping property to handle if an animation should loop
|
2013-01-19 14:22:15 -08:00 |
|
Chris Robinson
|
0b68953f0d
|
Scale animation speed using the direction length
The direction length doesn't currently give a good speed, but it's something.
|
2013-01-18 21:40:47 -08:00 |
|