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
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
63e685ea39
Add a method to get the Animation from a Ptr
2013-01-16 09:59:19 -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
scrawl
df602553d1
Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.
2013-01-16 09:13:36 +01:00
Chris Robinson
8361192b64
Use typedefs for some maps and some cleanup
2013-01-15 11:10:41 -08:00
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
2013-01-12 08:23:15 +01:00
scrawl
2c3719a6f5
Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.
2013-01-12 07:02:12 +01:00
scrawl
30136eb449
Update settings UI
2013-01-12 06:36:48 +01:00
Chris Robinson
97f8c73d91
Remove some useless parameters
...
SceneNode::setVisibility merely passes the value to its attached object, of
which there are none at the point it would be called. Additionally, the method
is always called with enabled=true anyway.
2013-01-10 11:09:33 -08:00
scrawl
6ef85c46fd
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-01-10 19:35:40 +01:00
Chris Robinson
e8ac3976b5
Fix some subentity assumptions
2013-01-10 06:35:06 -08:00
Chris Robinson
7f2d71554e
Use the correct offset when building static geometry from an entity
2013-01-10 04:16:18 -08:00
Chris Robinson
23ac1c2de5
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-01-09 20:52:12 -08:00
scrawl
d3c0851aa7
Changed light attenuation back to linear in all cases, this seems to be what MW does.
2013-01-09 22:08:42 +01:00
scrawl
b8c6f6640b
Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)
2013-01-09 21:56:26 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
Chris Robinson
a14132b5a0
Merge remote-tracking branch 'zini/master' into animation2
2013-01-09 11:12:26 -08:00
scrawl
bc73c5b1ec
enable directional lighting for character previews
2013-01-09 20:08:59 +01:00
Chris Robinson
c4c8295e0b
Rename NIFLoader to Loader, and update some comments
2013-01-09 09:10:59 -08:00
Chris Robinson
be74859f05
Avoid some unnecessary copying when calling addPartGroup
2013-01-09 08:03:28 -08:00
Chris Robinson
9fedaf18d6
Make some methods private
2013-01-09 07:55:55 -08:00
Chris Robinson
625a538f03
Combine part selection into a single loop
2013-01-09 07:43:10 -08:00
Chris Robinson
1e38e381a4
Use text keys for each animation
2013-01-09 03:30:55 -08:00
Chris Robinson
bb98542c5a
Build separate animations for each group
2013-01-09 01:40:38 -08:00
Chris Robinson
e44729cd43
Make the text keys lower-case when extracting them
...
I think it's safe to assume all text keys are treated in a case-insensitive
manner. So far the only known NiTextKeyExtraData records are for animation
keys, which effectively are.
2013-01-09 00:17:42 -08:00
Jordan Milne
857bb42297
Create a separate scenemanager for each CharacterPreview instance
2013-01-09 01:44:15 -04:00
Chris Robinson
9675a6d04a
Merge remote-tracking branch 'zini/master' into animation2
2013-01-08 02:25:37 -08:00
Marc Zinnschlag
c6ff58d5b5
Merge remote-tracking branch 'scrawl/videoplayback'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-08 11:17:19 +01:00
Chris Robinson
2a9dc5ad94
Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist
2013-01-07 21:00:21 -08:00
Chris Robinson
d8dbd5e206
Store text key iterators for the start and stop times
2013-01-07 05:56:03 -08:00
Chris Robinson
d3e949f5c6
Make the animation text keys lower case to help lookup
2013-01-07 05:23:44 -08:00
Chris Robinson
05dfafa777
Avoid an unnecessary lookup when moving the scene node
2013-01-07 05:09:15 -08:00
Chris Robinson
5f668976a8
Improve resetting the animation position
2013-01-07 04:48:59 -08:00
scrawl
c2b75e28e9
Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback
2013-01-07 13:20:50 +01:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
Marc Zinnschlag
2557ef4d7d
post merge fixes and some misc clean up
2013-01-07 12:17:46 +01:00
Chris Robinson
648e3331f5
Don't try to move objects that aren't in a cell
2013-01-06 23:20:20 -08:00
Chris Robinson
5b3a20ef69
Update the object position as the animation moves
2013-01-06 21:18:48 -08:00
Chris Robinson
910619eb21
Store the NonAccum animation root from the skeleton instance
...
Currently this is assumed to be the node with the animation text keys.
2013-01-06 17:31:53 -08:00
Chris Robinson
b96a979719
Store an MWWorld::Ptr with the Animation
2013-01-06 17:05:48 -08:00
Nathan Jeffords
0f3712f284
change flickering light's brightness pattern
2013-01-06 14:29:22 -08:00
Chris Robinson
2b1fe7dc44
Add part info for weapons and shields
2013-01-06 05:39:39 -08:00
Chris Robinson
976b042cca
Use a list to reduce some repeating code
2013-01-06 02:14:19 -08:00
Chris Robinson
99769879e3
Fix some createEntities calls
2013-01-06 00:32:38 -08:00
Chris Robinson
efca5ded47
Clean up some header includes to reduce nesting
2013-01-05 21:12:08 -08:00
Chris Robinson
58d35dbfcf
Have createEntities' caller retrieve the text keys as needed
2013-01-05 04:01:11 -08:00
