Chris Robinson
|
90e29c83c0
|
Merge remote-tracking branch 'zini/master' into animations
Conflicts:
apps/openmw/mwmechanics/character.cpp
|
2013-05-06 19:17:39 -07:00 |
|
kpp
|
dcccfd9f22
|
Initialize values
|
2013-05-02 22:43:21 +04:00 |
|
Chris Robinson
|
a120653c38
|
Implement handling weapon states
|
2013-05-01 10:19:16 -07:00 |
|
Marc Zinnschlag
|
95eeea2a27
|
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
This reverts commit 089ef7a2a02d62c1bdaf3fa0fda470189f5182bb, reversing
changes made to 67422c397c883017b4ff6a7adfb405cdf767f807.
|
2013-05-01 16:56:16 +02:00 |
|
Glorf
|
b8630239d7
|
Code cleanup
|
2013-05-01 12:25:02 +02:00 |
|
Glorf
|
236ec3409f
|
Finished acrobatics
|
2013-05-01 12:21:59 +02:00 |
|
Chris Robinson
|
4b15da076b
|
Move getStateInfo into the character controller
|
2013-04-30 19:26:41 -07:00 |
|
Glorf
|
d30e43784a
|
Fatigue decrease when jumping, live decrease when falling
|
2013-04-30 23:39:56 +02:00 |
|
Glorf
|
5a8c1661be
|
Jump acrobatics working, started falling acrobatics implementation
|
2013-04-30 20:44:17 +02:00 |
|
Glorf
|
add3cd6456
|
Advance acrobatics on jump
|
2013-04-30 18:22:59 +02: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
|
0817d59f23
|
Allow specifying where to start in an animation
|
2013-04-24 19:09:36 -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
|
c58dfbe921
|
Specify the loop count to Animation::play
|
2013-04-24 04:56:39 -07:00 |
|
Chris Robinson
|
8782ae6976
|
Separate some Animation fields into a separate AnimLayer class
|
2013-04-22 23:52:28 -07:00 |
|
Chris Robinson
|
bb64efc18e
|
Improve looping behavior
|
2013-04-22 05:08:52 -07:00 |
|
Chris Robinson
|
6c85d6763a
|
Pass "loop stop" to the character controller
|
2013-04-21 18:38:25 -07:00 |
|
Chris Robinson
|
d0703efd69
|
Another place to check the class' isActor method
|
2013-03-31 17:32:39 -07:00 |
|
Chris Robinson
|
4836ba16f7
|
Implement turning states
|
2013-03-31 03:50:20 -07:00 |
|
Chris Robinson
|
7b02ec411b
|
Apply the rotation when updating the character controller
|
2013-03-31 01:29:24 -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
|
0ce188b7cc
|
Store the position and rotation in MWMechanics::Movement
|
2013-03-30 19:00:46 -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
|
89d4c245e9
|
Better calculate jump velocity
The fatigue term isn't currently used correctly
|
2013-02-24 03:30:33 -08:00 |
|
Chris Robinson
|
d77d035d3a
|
Handle the "sound" events in runAnimation
|
2013-02-23 14:15:11 -08:00 |
|
Chris Robinson
|
e6da9dfae5
|
Specify the animation key to stop playing at
|
2013-02-23 05:15:10 -08:00 |
|
Chris Robinson
|
f841576bba
|
Don't override animations played with playgroup
|
2013-02-23 01:54:46 -08:00 |
|
Chris Robinson
|
7fcca180b6
|
Implement rudimentary jumping
|
2013-02-20 20:08:04 -08:00 |
|
Chris Robinson
|
1399a06c76
|
Update animation looping when setting the same state
|
2013-02-19 04:01:33 -08:00 |
|
Chris Robinson
|
17200cb226
|
Don't try to move when there's no speed
|
2013-02-18 20:43:55 -08:00 |
|
Chris Robinson
|
627b866744
|
Don't try to set a new state when dead
|
2013-02-18 06:29:16 -08:00 |
|
Chris Robinson
|
f2948ced23
|
Allow diagonal movement
|
2013-02-18 03:07:31 -08:00 |
|
Chris Robinson
|
e4341525c8
|
Add a jump state
Currently unused
|
2013-02-15 04:45:28 -08:00 |
|
Chris Robinson
|
ff0099fa6e
|
Scale the animation speed based on the animation velocity and movement speed
This may not be totoally correct since it takes the whole animation into
account, rather than just the looping portion. But it's good enough for now.
|
2013-02-15 02:15:39 -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
|
8c0bb1ff4d
|
Rotate movement in the movement solver
|
2013-02-05 14:02:14 -08:00 |
|
Chris Robinson
|
f7f1adfb9d
|
Don't accumulate animations with activators
|
2013-02-05 12:55:06 -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
|
82e4da4e64
|
Get the half-extents from the physicactor
|
2013-02-05 07:41:57 -08:00 |
|
Chris Robinson
|
39cf7b0b42
|
Pass the Ptr of the object being moved to the move method
This prevents having to store another copy of it, which risks getting out of
sync.
|
2013-02-04 11:17:48 -08:00 |
|