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
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
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
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
Emanuel Guevel
e9a464c9f7
mwiniimporter: remove fallback values for Cursors
2012-12-31 16:45:24 +01:00
Emanuel Guevel
e2b348de96
mwiniimporter: fix line ending problem
2012-12-31 16:44:22 +01:00
Marc Zinnschlag
65c7c7f60e
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2012-12-31 14:47:05 +01:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Marc Zinnschlag
8b2785400b
Merge remote-tracking branch 'trombonecot/comparestring'
2012-12-30 20:11:18 +01:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
Marc Zinnschlag
e577731a06
Merge remote-tracking branch 'scrawl/master'
2012-12-30 18:31:35 +01:00
scrawl
f56182cac2
fix journal window not rendering any text
2012-12-30 17:06:17 +01:00
Emanuel Guevel
cb71efc427
mwiniimporter: clean up
2012-12-30 16:44:52 +01:00
Emanuel Guevel
38e7dbb970
mwininimporter: add more fallback values
2012-12-30 16:43:05 +01:00
Marc Zinnschlag
714b1924a5
partial dialogue subview implementation
2012-12-30 14:01:52 +01:00
eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +01:00
eduard
fb25f407fb
dialoguemanager conflict
2012-12-30 13:37:19 +01:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
