Chris Robinson
|
054ef3113a
|
Check existing skeleton sources if the current one has no animation root
|
2013-02-05 17:15:40 -08:00 |
|
Chris Robinson
|
16933e3926
|
Scale the accumulation root translation
|
2013-02-05 16:59:20 -08:00 |
|
Chris Robinson
|
600fe06f00
|
Use a vector of skeletons to handle animation sources
|
2013-02-05 16:29:51 -08:00 |
|
Chris Robinson
|
e217a3d25c
|
Silence some console spam
|
2013-02-05 15:51:26 -08:00 |
|
Chris Robinson
|
ee3764e9b3
|
Increase max slope to 60. 45 is too low.
|
2013-02-05 15:07:48 -08:00 |
|
scrawl
|
86d65519e3
|
Settings window fix
|
2013-02-05 23:57:30 +01: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 |
|
scrawl
|
608c112f34
|
Supply the new render window to mygui
|
2013-02-05 20:48:25 +01:00 |
|
scrawl
|
31f760ccce
|
Fixing issues from last commit: restored input and occlusion queries
|
2013-02-05 20:26:13 +01:00 |
|
Chris Robinson
|
0a4568bd11
|
Move the PtrMovementList typedef to MWWorld
Use it for the doPhysics parameter, too
|
2013-02-05 11:03:39 -08:00 |
|
Chris Robinson
|
2cdda96798
|
Clear out some unneeded doPhysics stuff
|
2013-02-05 10:23:26 -08:00 |
|
scrawl
|
c4d518132f
|
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
|
2013-02-05 19:22:08 +01:00 |
|
Chris Robinson
|
3251796ba0
|
Fix left/right movement
|
2013-02-05 09:57:08 -08:00 |
|
Chris Robinson
|
d50832081c
|
Remove the unneeded PhysicActor field from MovementSolver
|
2013-02-05 09:37:02 -08:00 |
|
Chris Robinson
|
a782a9109b
|
Store the vertical velocity in the physic actor
|
2013-02-05 09:24:22 -08:00 |
|
Chris Robinson
|
82e4da4e64
|
Get the half-extents from the physicactor
|
2013-02-05 07:41:57 -08:00 |
|
scrawl
|
499f3ac0d1
|
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
|
2013-02-05 16:40:41 +01:00 |
|
Chris Robinson
|
1c604445ba
|
Store movement vectors as they get returned
|
2013-02-05 06:59:01 -08:00 |
|
scrawl
|
3772cd9257
|
Refraction can be disabled separately now
|
2013-02-05 14:29:46 +01:00 |
|
Chris Robinson
|
4bd1e63ac1
|
Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
apps/openmw/mwworld/worldimp.cpp
|
2013-02-05 03:26:46 -08:00 |
|
Marc Zinnschlag
|
c409f1184e
|
cleaned up object movement and fixed a bug regarding local scripts
|
2013-02-05 12:19:06 +01:00 |
|
Chris Robinson
|
786cb6e928
|
Merge remote-tracking branch 'zini/master' into animation2
|
2013-02-05 02:57:02 -08:00 |
|
Marc Zinnschlag
|
86fb3574a0
|
Merge remote-tracking branch 'wheybags/master' into next
|
2013-02-05 11:55:47 +01:00 |
|
Chris Robinson
|
bd4fdf47a3
|
Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
apps/openmw/mwrender/sky.cpp
|
2013-02-05 02:27:57 -08:00 |
|
scrawl
|
a29919d02d
|
restored global map
|
2013-02-05 00:39:56 +01:00 |
|
scrawl
|
35b5fdab5d
|
Merge branch 'terrainfix' into graphics
|
2013-02-05 00:28:59 +01:00 |
|
scrawl
|
09180666b2
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix
|
2013-02-05 00:21:42 +01:00 |
|
scrawl
|
58cf182db2
|
better place for syncing
|
2013-02-05 00:21:29 +01:00 |
|
scrawl
|
bb1f23875d
|
Merge branch 'terrainfix' into graphics
|
2013-02-04 23:16:11 +01:00 |
|
scrawl
|
596628d339
|
Fix terrain derived data update (bug 534, bug 544)
|
2013-02-04 23:13:01 +01:00 |
|
Chris Robinson
|
5ee298cdc1
|
Make sure the player updates last
|
2013-02-04 14:08:38 -08:00 |
|
Chris Robinson
|
2f8affc955
|
Make sure the player's controller is properly updated when they change
|
2013-02-04 12:58:06 -08:00 |
|
scrawl
|
0f37c24d5f
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
2013-02-04 21:55:41 +01:00 |
|
Chris Robinson
|
ee9b19d2ed
|
Make sure to remove a Ptr from the activators when requested
|
2013-02-04 12:04:06 -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 |
|
Chris Robinson
|
1a5cb8760d
|
Rotate movement vector to world space before passing to the movement solver
|
2013-02-04 11:04:20 -08:00 |
|
Chris Robinson
|
6b32fa7999
|
Use the correct position for the actor
|
2013-02-04 09:48:21 -08:00 |
|
scrawl
|
bf037b7d29
|
Removed problematic ModVertexAlpha method, now done in shader
|
2013-02-04 18:03:03 +01: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 |
|
scrawl
|
fa07288b15
|
tweaked map light color
|
2013-02-03 20:29:50 +01:00 |
|
scrawl
|
5cc8af0f14
|
fix map positions
|
2013-02-03 20:06:03 +01:00 |
|
scrawl
|
a44dfcd2ac
|
Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.
|
2013-02-03 19:28:31 +01:00 |
|
scrawl
|
109d0a942f
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
2013-02-03 19:02:57 +01:00 |
|
scrawl
|
979a874220
|
Fixed the custom near clip planes
|
2013-02-03 19:01:59 +01:00 |
|
scrawl
|
5334934612
|
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
|
2013-02-03 18:03:09 +01:00 |
|
Chris Robinson
|
51d5efeeb2
|
Work out the state in the character controller update method
|
2013-02-03 07:15:34 -08:00 |
|
Mark Siewert
|
3e43db5f76
|
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
|
2013-02-03 16:14:41 +01:00 |
|