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 |
|
Tom Mason
|
9ee823d8f8
|
fixed typo in vmformat.txt
|
2013-01-07 21:09:03 +00:00 |
|
Tom Mason
|
4c5ed43cc9
|
added removesoulgem, and fixed addsoulgem
|
2013-01-07 21:08:04 +00:00 |
|
Tom Mason
|
c2901fe6cc
|
added addsoulgem scripting function
|
2013-01-07 18:16:50 +00: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
|
f1b138d0a8
|
Merge branch 'master' into videoplayback
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2013-01-07 13:25:15 +01:00 |
|
Chris Robinson
|
14d814d1d3
|
Avoid creating bones for NiTriShape nodes
The offset specified for them can be just as easilly handled by the tag point
they get connected to, and as such it's just needless extra nodes.
|
2013-01-07 04:21:25 -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 |
|
scrawl
|
35f4d09288
|
swscale handled better (cmake)
|
2013-01-07 13:06:16 +01:00 |
|
Marc Zinnschlag
|
2557ef4d7d
|
post merge fixes and some misc clean up
|
2013-01-07 12:17:46 +01:00 |
|
Marc Zinnschlag
|
41767f8dfa
|
Merge remote-tracking branch 'blunted2night/better_flicker'
|
2013-01-07 12:06:21 +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
|
921ae76ea9
|
Merge remote-tracking branch 'zini/master' into animation2
|
2013-01-06 21:20:49 -08:00 |
|
Chris Robinson
|
5b3a20ef69
|
Update the object position as the animation moves
|
2013-01-06 21:18:48 -08:00 |
|
Chris Robinson
|
7ba09ff025
|
Catch errors from buildBones
|
2013-01-06 20:05:50 -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 |
|
Marc Zinnschlag
|
e31cd1c805
|
Merge remote-tracking branch 'corristo/master'
|
2013-01-06 18:40:30 +01:00 |
|
Nikolay Kasyanov
|
1d3f3bcce3
|
clang build fix
|
2013-01-06 19:19:12 +04:00 |
|
Chris Robinson
|
2b1fe7dc44
|
Add part info for weapons and shields
|
2013-01-06 05:39:39 -08:00 |
|
Marc Zinnschlag
|
25815ab8f7
|
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
|
2013-01-06 13:31:01 +01:00 |
|
Emanuel Guevel
|
0b7d11d38d
|
to_utf8 test: fix Utf8Encoder constructor
|
2013-01-06 11:39:18 +01: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
|
8ebf49a35b
|
Only lower-case the model name
The skeleton name will already be lower-case
|
2013-01-05 20:54:57 -08:00 |
|
Chris Robinson
|
18389c7b04
|
Set non-bone nodes as manually controlled
|
2013-01-05 17:50:22 -08:00 |
|
Emanuel Guevel
|
63f09462fd
|
to_utf8, Utf8Encoder: pass encoding as constructor parameter
Edit other files accordingly.
|
2013-01-06 01:37:58 +01:00 |
|
Chris Robinson
|
e5ce55b6a4
|
Remove a hack
|
2013-01-05 06:20:21 -08:00 |
|
Marc Zinnschlag
|
043e6c09fe
|
Merge remote-tracking branch 'chris/animation2'
|
2013-01-05 13:34:46 +01:00 |
|
Marc Zinnschlag
|
20e624e11a
|
Merge remote-tracking branch 'jordanmilne/443-fix'
|
2013-01-05 13:31:38 +01:00 |
|
Chris Robinson
|
58d35dbfcf
|
Have createEntities' caller retrieve the text keys as needed
|
2013-01-05 04:01:11 -08:00 |
|
Chris Robinson
|
761914bdaa
|
Use a separate method to build the animation
|
2013-01-05 03:31:51 -08:00 |
|
Chris Robinson
|
818a24cdd6
|
Hold on to the AnimationState being used for animating
|
2013-01-05 00:03:14 -08:00 |
|
Chris Robinson
|
6e84d4bcdd
|
Add a helper method to load entity objects
|
2013-01-04 23:19:48 -08:00 |
|
Jordan Milne
|
3ed77ca189
|
Include C++ header instead
|
2013-01-05 01:17:07 -04:00 |
|
Chris Robinson
|
8a086e3afb
|
Cache the mesh names from the mesh/skeleton pairs
|
2013-01-04 20:58:35 -08:00 |
|
Chris Robinson
|
3131e8dae6
|
Don't get the text keys if they're not being requested
|
2013-01-04 20:33:26 -08:00 |
|
Jordan Milne
|
917bbc4e11
|
Create static and non-discardable textures with the right parameters (should fix Issue 443)
|
2013-01-05 00:26:33 -04:00 |
|
Chris Robinson
|
683ced54a0
|
Store and retrieve the node text keys in the bones' user object bindings
|
2013-01-04 19:41:37 -08:00 |
|
Chris Robinson
|
a3d33db415
|
Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone
|
2013-01-04 15:55:47 -08:00 |
|
Jordan Milne
|
b52904a6ea
|
Include headers necessary for compilation under VS2010
|
2013-01-04 19:52:27 -04:00 |
|
Chris Robinson
|
1d4d67f811
|
Avoid underflows if the texture name doesn't include a '.'
|
2013-01-04 15:03:57 -08:00 |
|
Chris Robinson
|
3f19b13695
|
Merge remote-tracking branch 'zini/master' into animation2
|
2013-01-04 14:47:01 -08:00 |
|
Marc Zinnschlag
|
78e55a92a8
|
Merge remote-tracking branch 'blunted2night/cmake_no_esmtool_fix'
|
2013-01-04 23:21:12 +01:00 |
|