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
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
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
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
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
Marc Zinnschlag
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
2013-01-06 13:31:01 +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
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
58d35dbfcf
Have createEntities' caller retrieve the text keys as needed
2013-01-05 04:01:11 -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
Marc Zinnschlag
fbb59302d9
Merge remote-tracking branch 'blunted2night/loading_screen_fix'
2013-01-04 10:50:59 +01:00
Emanuel Guevel
67273fc177
mwiniimporter: use Utf8Encoder
2013-01-04 01:52:02 +01:00
Nathan Jeffords
9afe4467d8
cache results of query for spash screen names
...
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
2013-01-03 15:45:09 -08:00
Marc Zinnschlag
0af7a2888a
Merge remote-tracking branch 'scrawl/ai_script'
2013-01-03 09:56:36 +01:00
Marc Zinnschlag
25d9918765
post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)
2013-01-03 09:55:48 +01:00
Marc Zinnschlag
c0260697c2
Merge remote-tracking branch 'scrawl/master'
2013-01-03 09:52:46 +01:00
Marc Zinnschlag
ce5d27b07b
Merge remote-tracking branch 'scrawl/button_fixes'
2013-01-03 09:50:24 +01:00
scrawl
42e0501c67
fix typo
2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6
Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
...
Conflicts:
apps/openmw/mwscript/aiextensions.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-01-03 02:34:31 +01:00
scrawl
ba7086cadf
Use race/class names (instead of ID) in replaced escape sequences
2013-01-03 02:05:05 +01:00
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
2013-01-03 01:09:03 +01:00
scrawl
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
2013-01-03 01:07:17 +01:00
Marc Zinnschlag
ff74f687fb
Merge remote-tracking branch 'lazydev/master'
2013-01-02 16:04:44 +01:00
lazydev
04cca2a1ce
fix for http://bugs.openmw.org/issues/517
2013-01-02 18:58:52 +04:00
Marc Zinnschlag
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2013-01-02 10:05:27 +01:00
scrawl
86f30992d7
fix message boxes not appearing properly when e.g. trading
2013-01-01 22:00:14 +01:00
Emanuel Guevel
2a7336c310
mwiniimporter: handle ini file encodings
...
Use components/to_utf8 to handle encodings.
Add an --encoding option for choosing between win1250, win1251 and
win1252 encodings for the imported ini file.
2013-01-01 21:59:30 +01:00
Marc Zinnschlag
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
2013-01-01 20:45:09 +01:00
