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
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
Chris Robinson
e5ce55b6a4
Remove a hack
2013-01-05 06:20:21 -08: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
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
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
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
Marc Zinnschlag
215b43cc7b
Merge remote-tracking branch 'blunted2night/texname_fix'
2013-01-04 23:19:51 +01:00
Marc Zinnschlag
3b80fd74fc
Merge remote-tracking branch 'blunted2night/mygui_fix'
2013-01-04 23:17:41 +01:00
Marc Zinnschlag
b4d63814cc
post merge fix
2013-01-04 23:12:56 +01:00
Nathan Jeffords
fec9a59237
changed EMSLoader to use ConstrainedDataStream
...
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
2013-01-04 13:41:03 -08:00
Nathan Jeffords
278337116b
increased performance of ConstrainedDataStream
...
Reimplemented ConstrainedDataStream to use low-level IO calls and a
custom buffering scheme to avoid using C++ iostreams.
2013-01-04 13:40:00 -08:00
Nathan Jeffords
5c7f1bd497
moved ConstrainedDataStream into its own file
...
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
2013-01-04 13:39:10 -08:00
Nathan Jeffords
dcfa902525
fixed error in cmake when disabling esmtool
2013-01-04 13:08:09 -08:00
Nathan Jeffords
2181393518
change texture renaming logic to increase performance
...
ResourceGroupManager::resourceExistsInAnyGroup is slow (at least on
windows) if the tested path does not exist, but is fast if it does (due
to finding it in the index). This change tries the '.dds' version of the
name first, and reverts to the original if the '.dds' version was not
found.
2013-01-04 11:36:22 -08:00
Nathan Jeffords
3c91f7793b
overrode MyGUI::DataManager::isDataExist
...
Created a override of MyGUI::DataManager::isDataExist to fix a
performance issue with MyGUI startup. This required moving the
functionality of MyGUI::OgrePlatform into OEngine::GUI::MyGUIManager so
that a new version of the MyGUI::DataManager could be created.
2013-01-04 08:50:37 -08:00
Marc Zinnschlag
fbb59302d9
Merge remote-tracking branch 'blunted2night/loading_screen_fix'
2013-01-04 10:50:59 +01:00
Chris Robinson
61ad8bb3dd
Use a list of mesh names instead of mesh objects
2013-01-04 00:14:41 -08:00
Chris Robinson
019893b5c6
Get rid of some unnecessary case-insensitive compares
2013-01-03 23:44:58 -08: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
5c007cd527
updated credits file
2013-01-03 10:05:37 +01: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
c613f07b84
updated credits file
2013-01-02 10:10:10 +01:00
Marc Zinnschlag
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2013-01-02 10:05:27 +01:00
Marc Zinnschlag
0e80b445a9
Merge remote-tracking branch 'scrawl/master'
2013-01-02 10:03:59 +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
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
2013-01-01 21:19:27 +01:00
