mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 15:26:38 +00:00
Code Issues Releases Wiki Activity
9141 commits 115 branches 76 tags 128 MiB
Commit graph

1489 commits

Author SHA1 Message Date
Chris Robinson
822f130f79 Merge remote-tracking branch 'zini/master' into animations 2013-05-13 04:09:56 -07:00
Marc Zinnschlag
e2620a1edf Issue #694: allow float literals starting with . 2013-05-13 11:38:35 +02:00
Chris Robinson
eb4daaf512 Build a skeleton for Nifs that have a matching .kf file 2013-05-08 01:03:57 -07:00
Chris Robinson
bf94ffb839 Only support NiSequenceStreamHelper as a Kf root 
Newer versions of the Nif foramt may have other record types, but we don't
support those.
 2013-05-07 18:26:22 -07:00
Chris Robinson
8e38dc410f Allow loading multiple animation sources 
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
 2013-05-07 16:59:32 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
Marc Zinnschlag
b21dae8d75 added blank function to all referencable record structs 2013-05-06 14:10:43 +02:00
scrawl
f0354ea04c Fix member variable case problem 2013-05-04 19:14:19 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Marc Zinnschlag
fe038cef03 turned redeclartion of local variables from an error into a warning 2013-05-01 14:20:09 +02:00
Marc Zinnschlag
63407a662c allow <== and >== as alternative for <= and >= in scripts 2013-05-01 14:08:05 +02:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
scrawl
20d5ba0eec Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs" 
This reverts commit 6dbb53493b.
 2013-04-30 14:54:07 +02:00
scrawl
24f968623f Revert "reworked Nif::KeyListT into Nif::CurveT" 
This reverts commit e7665582ad.
 2013-04-30 14:53:51 +02:00
scrawl
de3c76a54b Revert "reworked NIFStream to use a type-handler" 
This reverts commit 03ee7663a3.
 2013-04-30 14:53:41 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
scrawl
d5c7a26041 Fix broken loose file resources when using Ogre 1.9 2013-04-29 12:32:24 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
4cedf0fbab Avoid colliding with AvoidNodes 
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
 2013-04-28 11:12:55 -07:00
Glorf
6ea82333d4 Headers cleanup 2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
Marc Zinnschlag
90b38cbfbe fixed parsing of end statements in scripts with IDs matching keywords 2013-04-27 14:06:23 +02:00
Nathan Jeffords
c7ede9b523 port code to C++03 2013-04-24 20:22:57 -07:00
Nathan Jeffords
6e7c9ebbe6 fix for gcc not handling static constant initialized in class definition 2013-04-24 20:22:57 -07:00
Nathan Jeffords
75757cb675 Created a class to represent a stream of UTF8 characters. 2013-04-24 20:20:00 -07:00
Nathan Jeffords
6dbb53493b enable move construction/assignment to key ESM data structure to reduce sorting costs 2013-04-24 20:20:00 -07:00
Nathan Jeffords
e7665582ad reworked Nif::KeyListT into Nif::CurveT 
Renamed Nif:KeyListT to Nif::CurveT, moved it into its own file and
changed its implementation so that on compatible platforms, the entire
array of key-frames can be read in a single read call. Added a helper
class called Nif::CurveT::interpolator to allow other code to easily
evaluate the curve. Reworked part of the skeletonLoader code to use
the interpolator to simplify its own logic.
 2013-04-24 20:20:00 -07:00
Nathan Jeffords
03ee7663a3 reworked NIFStream to use a type-handler 
Reworked NIFStream to use a type-handler system to decide how to extract
data from the NIF. It also has the capability to perform bulk reads on
compatible platforms, thus improving cell-load performance.
 2013-04-24 20:20:00 -07:00
Chris Robinson
68a9a4de5f Fix setting and getting KeyframeController transforms 2013-04-24 04:12:27 -07:00
Chris Robinson
26cc86ffdc Use the Nif node's transform for skinned fixups 2013-04-24 00:42:45 -07:00
Chris Robinson
6f0b9a5f2c Avoid unnecessary multimap copies 2013-04-23 21:42:59 -07:00
Chris Robinson
512ff3687a Don't create Ogre animations for skeletons 2013-04-23 20:42:54 -07:00
Chris Robinson
634b0fd067 Fix for controller delta time going below start time 2013-04-23 17:57:40 -07:00
Chris Robinson
020bc410bf Merge remote-tracking branch 'zini/master' into nifogre 2013-04-23 16:57:59 -07:00
scrawl
44ac0a7c18 Use one vertex buffer for all UV coordinates 2013-04-23 22:47:57 +02:00
Chris Robinson
adc6a948c7 Add methods to get the rotation, translation, and scale from a NodeTargetValue 2013-04-22 03:41:38 -07:00
Chris Robinson
59137d93c9 Partially handle NiGeomMorpherController 
The morphs aren't actually applied yet, but the Ogre controller is set up so
all that has to be done is to implement the setValue method.
 2013-04-22 03:24:02 -07:00
Chris Robinson
d936291dbf Remove an unused ostream operator<< 2013-04-22 02:53:32 -07:00
Chris Robinson
a3511c62cf Don't store textkeys in user object bindings 
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.

Plus, proper serialization can help for future optimizations.
 2013-04-22 00:01:30 -07:00
Chris Robinson
2345b5e8b3 Avoid storing text keys for each animation 2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6 Don't clip out the group name from the textkeys 2013-04-21 22:13:49 -07:00
Chris Robinson
ace7d647e5 Add a method to apply a NodeTargetValue-based controller to a specified node. 2013-04-20 15:35:19 -07:00
Chris Robinson
f37a71f025 Use a separate method to build node-based controllers 2013-04-19 23:56:47 -07:00
Chris Robinson
1051fa51a7 Recognize NiFlipController 2013-04-19 15:07:08 -07:00
Chris Robinson
6d59325bff Merge remote-tracking branch 'zini/master' into nifogre 2013-04-17 23:21:17 -07:00
scrawl
c519fc360d Move away from fixed record names for body parts 2013-04-18 00:19:34 +02:00
Chris Robinson
3def2a0f45 Treat the particle random values as the max differential 2013-04-16 19:16:45 -07:00
Chris Robinson
cac793758b Merge remote-tracking branch 'zini/master' into nifogre 2013-04-16 11:52:19 -07:00
Chris Robinson
36170c5374 Use flag enums instead of hard-coded hex values 2013-04-16 01:20:32 -07:00
Chris Robinson
1b1f9f7921 Allow multiple ObjectLists to be created for Animations. 
addObjectList may not currently be called outside of the related constructor.
 2013-04-15 18:55:28 -07:00
Chris Robinson
7000a1aa3e Add a ParticleSystemController 2013-04-14 13:50:55 -07:00
Chris Robinson
bf8bc989fc Recognize and partly handle NiBSParticleNode 2013-04-14 12:52:20 -07:00
Marc Zinnschlag
f692fc1093 Merge branch 'cell' 2013-04-14 19:35:19 +02:00
Marc Zinnschlag
0c33dd86d5 added basic cell table 2013-04-14 17:04:55 +02:00
Chris Robinson
f4695ec4ac Cleanup NIFObjectLoader some 2013-04-14 00:06:40 -07:00
Chris Robinson
acb1b5f002 Try to handle NiBSAnimationNode 
This is still incomplete guess work. Currently it seems as though flag 0x20
specifies whether the controllers auto-play (if on), rather than follow the
object's animation time.
 2013-04-13 22:54:32 -07:00
Chris Robinson
0b363ba36e Handle NiParticleColorModifier with Ogre's ColourInterpolator 
Note that Ogre's ColourInterpolator has a maximum of six color stages. This
seems to be fine so far, but if we want anything better, we'll need a custom
affector for it.
 2013-04-13 16:42:32 -07:00
Chris Robinson
80a4345787 Keep particles in local space 2013-04-13 16:26:34 -07:00
Chris Robinson
dd981077b9 Handle the vertical and horizontal parameters of Nif particles 
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
 2013-04-13 16:16:57 -07:00
Chris Robinson
7191f6ed2a Start a Nif-style particle emitter 
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
 2013-04-13 14:36:24 -07:00
Chris Robinson
07c24e0382 Don't create entities and particles when only the skeleton base is needed 2013-04-13 13:13:09 -07:00
Chris Robinson
4a42f89e08 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-13 13:04:41 -07:00
Chris Robinson
5b30677e41 Add the start of a custom gravity affector 2013-04-12 14:39:06 -07:00
Marc Zinnschlag
a1ece7de30 Bug #613: fixed assert in string literal access function 2013-04-12 14:48:53 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
Marc Zinnschlag
5bfa691f14 Merge branch 'script' 2013-04-11 10:50:46 +02:00
Marc Zinnschlag
6d3a2cd5a0 added comment token (for use in syntax colouring) 2013-04-11 10:50:22 +02:00
Chris Robinson
d26ffe9de0 Move a method to the Node class 2013-04-10 23:19:47 -07:00
Chris Robinson
62e0abd945 Move the mesh loader to its own source file 2013-04-10 22:38:46 -07:00
Chris Robinson
75489b1e9d Move NIFMaterialLoader to a separate file 2013-04-10 20:24:44 -07:00
Chris Robinson
3970407772 Use actual classes for properties 2013-04-10 20:22:13 -07:00
Chris Robinson
caff28e20a Move NIFSkeletonLoader to a separate file 2013-04-10 19:58:17 -07:00
Marc Zinnschlag
74145410f2 basic syntax highlighting in script subview 2013-04-10 22:49:22 +02:00
Chris Robinson
6c6750342c Specified particle size is actually the radius 2013-04-10 13:37:20 -07:00
Chris Robinson
9d29921913 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-09 15:12:19 -07:00
Marc Zinnschlag
ec6dff38b1 added basic spell table 2013-04-09 11:40:36 +02:00
Chris Robinson
973fdeb2e0 Improve particle system placement when no emitters are specified 2013-04-08 15:21:28 -07:00
Chris Robinson
e7c0f2a211 Minor cleanup to loading texture UV coords 2013-04-08 14:54:13 -07:00
Chris Robinson
01a1a0b846 Merge remote-tracking branch 'zini/master' into nifogre 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 2013-04-08 11:46:57 -07:00
Marc Zinnschlag
85e5bd212b Merge remote-tracking branch 'scrawl/master' 2013-04-08 20:05:52 +02:00
Chris Robinson
23097ac9dc Minor cleanup of NiMorphData 2013-04-08 09:47:03 -07:00
scrawl
343e2027af Support NIF detail maps 2013-04-08 15:17:30 +02:00
scrawl
a5c868c9f5 Create a separate vertex buffer for each UV set 2013-04-08 14:54:19 +02:00
Chris Robinson
c6c67a1bb4 Read NiGravity fields 2013-04-07 18:15:23 -07:00
Chris Robinson
3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-07 17:24:47 -07:00
Chris Robinson
dba7308248 Recognize NiParticleRotation 2013-04-07 17:16:49 -07:00
Chris Robinson
3c633e275e Don't create a controller for empty keyframe data 2013-04-07 15:42:07 -07:00
Chris Robinson
261ea1fe5e Implement a KeyframeController 2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1 Update animation source controller targets 2013-04-07 13:51:04 -07:00
Chris Robinson
44a59e1b87 Fix a couple messages 2013-04-07 13:03:41 -07:00
Chris Robinson
2362e920f3 Use an unconnected object list for animation sources 
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
 2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d added basic birthsign table 2013-04-07 20:26:39 +02:00
Chris Robinson
399394ff10 Don't restrict animations to the keyframe time limits 2013-04-07 10:03:13 -07:00
Chris Robinson
ab5980ae18 Let the default controller function use absolute input 
And convert the VisController to use it.
 2013-04-07 08:29:56 -07:00
Chris Robinson
fe9a7f12b6 Material fixes 2013-04-07 07:53:01 -07:00
Marc Zinnschlag
e25f5c6dfe added basic region table 2013-04-07 16:32:06 +02:00
Chris Robinson
2e067e95a9 Handle NiWireframeProperty 2013-04-07 07:12:52 -07:00
Chris Robinson
ebff64a7a4 Fix UVController and add warn about unhandled material controllers 2013-04-07 06:56:12 -07:00
Marc Zinnschlag
ff1d908af4 added script table 2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891 Handle NiCamera nodes 2013-04-07 02:28:15 -07:00
Chris Robinson
2db72ae607 Rename EntityList to ObjectList 2013-04-07 01:52:35 -07:00
Chris Robinson
834a6a1f00 Remove old, unused code 2013-04-07 01:14:26 -07:00
Chris Robinson
d97b341dc6 Rename NIFMeshLoader to NIFObjectLoader 2013-04-07 01:02:21 -07:00
Marc Zinnschlag
ec7a8f1add small fix 2013-04-06 21:58:28 +02:00
Chris Robinson
63cbf7ddeb Specify a default return for failed lookups 2013-04-06 12:41:40 -07:00
Chris Robinson
ca289a317c Separate the UVController function out and make it generic 
Also fix a timing bug in it.
 2013-04-06 12:26:58 -07:00
Marc Zinnschlag
8bf569d58a added basic sound table 2013-04-06 21:21:10 +02:00
Chris Robinson
6b151be3f4 Create particle systems even when MRK was specified 2013-04-06 11:26:51 -07:00
Chris Robinson
41e410347e Merge remote-tracking branch 'zini/master' into nifogre 2013-04-06 10:35:01 -07:00
Chris Robinson
c283991126 Remove an unneeded method 2013-04-06 10:33:07 -07:00
Marc Zinnschlag
0f34c79d0a Merge branch 'race' 2013-04-06 19:21:38 +02:00
Chris Robinson
ebcb4c66c3 Properly read and use the NIF root record list 2013-04-06 10:17:09 -07:00
Chris Robinson
59f1d4b047 Add support for NiUVController on meshes 2013-04-06 09:44:10 -07:00
Chris Robinson
e0da265972 Use accurate bone lookups for attaching objects 
NIFs don't requires nodes to have unique names, which means looking up a
bone by name may get the wrong one. Instead, use a NifIndex:BoneHandle
map to make sure we can get the proper bone from a given Nif::Node.
 2013-04-06 08:15:12 -07:00
Chris Robinson
95730cc127 Create entities and particle systems for hidden objects 
They're set as (in)visible as appropriate.
 2013-04-06 06:53:08 -07:00
Chris Robinson
f764f243d2 Fix the particle quota 2013-04-06 06:44:34 -07:00
Chris Robinson
41ce5464c9 Recognize NiBSAnimationNode as a record type 
And don't warn about animated nodes without textkeys
 2013-04-06 05:00:19 -07:00
Chris Robinson
99b915e652 Fix some material warnings 2013-04-06 00:54:53 -07:00
Chris Robinson
af756bfa9c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-06 00:22:31 -07:00
Chris Robinson
b5017e0543 Implement NiParticleGrowFade 2013-04-06 00:19:05 -07:00
Chris Robinson
aa9df818a5 Add support for NiVisController 2013-04-05 10:38:27 -07:00
Chris Robinson
0631b28646 Prepare for supporting controller objects 2013-04-05 10:13:54 -07:00
scrawl
75b462b974 If alpha rejection was forced, we also need to force depth_write and depth_check 2013-04-05 18:24:12 +02:00
Chris Robinson
bf0ae3ae72 Read NiVisData info 2013-04-05 06:29:14 -07:00
Chris Robinson
12fada2862 Don't offset the animation time to 0 2013-04-05 05:34:59 -07:00
Chris Robinson
dc9f5f93e7 Use a helper function to get node properties 2013-04-05 05:14:24 -07:00
Marc Zinnschlag
73da794d77 added basic race table 2013-04-04 14:34:39 +02:00
Chris Robinson
b5719e0ec7 Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes 
Very incomplete, but it's something to work with.
 2013-04-04 05:10:53 -07:00
Chris Robinson
77ba0fbe73 Prepare for creating particles 
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
 2013-04-04 05:10:52 -07:00
Chris Robinson
ac10c5f05c Even more particle information 2013-04-04 05:10:52 -07:00
Chris Robinson
2f6ae4a915 Read more particle information 2013-04-04 05:10:51 -07:00
Chris Robinson
ee0a20f9ce Read some missing particle data from NIFs 2013-04-04 05:10:50 -07:00
Chris Robinson
97d617d43f Use more appropriate VBO settings 
Unskinned meshes don't need dynamic VBOs; they aren't rewritten since their
transformations are handled by the modelview matrix. They also don't need the
local RAM copy (the "shadow buffer") since it's really only useful for skinning
purposes (though this means the VBO has to be readable for static geometry to
work).
 2013-04-04 05:10:49 -07:00
Marc Zinnschlag
18e046e628 cleaned up race record struct 2013-04-04 13:50:36 +02:00
Marc Zinnschlag
8c7d578ddc moved the CellRef struct to its own header 2013-04-04 12:13:15 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +02:00
scrawl
a9b56eedc3 Support NIF "glow maps", which are basically an emissive channel. 2013-04-03 18:51:40 +02:00
scrawl
5625d73d84 Bump texture support 2013-04-03 17:16:34 +02:00
Chris Robinson
095daca058 Create entities when iterating through the NIF 2013-04-03 03:27:41 -07:00
Chris Robinson
512534be11 Read the correct texture resource for other layers 2013-04-02 22:58:07 -07:00
Chris Robinson
f6f165852d Better handle material texture layers 2013-04-02 21:09:44 -07:00
Marc Zinnschlag
384c88182d dealing with unset attribute fields 2013-04-02 14:15:22 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d added faction table 2013-04-02 12:00:45 +02:00
Marc Zinnschlag
fd0aa1a4b8 Issue #685: Treat : as a whitespace 2013-03-31 14:46:46 +02:00
Marc Zinnschlag
607435aaf2 Merge branch 'class' 2013-03-31 10:49:56 +02:00
scrawl
e27e53f607 Fix not playable body parts appearing in the race selection menu. 2013-03-30 20:04:05 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
Marc Zinnschlag
ea3b14f2d2 added skill columns to class 2013-03-26 09:43:13 +01:00
Marc Zinnschlag
c7275965b8 added basic class record table 2013-03-25 13:22:06 +01:00
Marc Zinnschlag
1078386fd7 Merge branch 'skills' into next 2013-03-25 11:07:14 +01:00
Marc Zinnschlag
114f99ddbf add skill records when creating a new base file 2013-03-24 15:10:03 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
7df0f6aaee prepared skill record for use in editor 2013-03-21 14:30:27 +01:00
Marc Zinnschlag
1d1471b81c fixed a bug in ESM::Variant::write (was affecting string values) 2013-03-21 12:57:10 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
Marc Zinnschlag
4711135e7f workaround for faulty endif in Morrowind scripts 2013-03-18 12:05:54 +01:00
Marc Zinnschlag
6ef754c451 Merge remote-tracking branch 'scrawl/armorrating' into next 2013-03-18 07:53:20 +01:00
Marc Zinnschlag
46bde604f9 Issue #601: unary minus was interpreted as binary minus when used in an argument list without comma 2013-03-17 17:13:25 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
e30af28860 Markers should still have collision if they have a NiRootCollisionNode 2013-03-14 19:03:42 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
Marc Zinnschlag
1a809b1cec Merge remote-tracking branch 'scrawl/master' 2013-03-13 08:32:44 +01:00
scrawl
599207a92d Transparency sorting should be enabled only when alpha blending is enabled 2013-03-13 01:00:47 +01:00
Marc Zinnschlag
170451cb79 Merge remote-tracking branch 'graffy76/saveOnClose' into next 2013-03-12 14:47:42 +01:00
Marc Zinnschlag
75bd30844d added optional format sub-record to tes3 record 2013-03-12 14:33:35 +01:00
graffy76
50abb22162 Fix to allow application closing from multiple views and a single view. 2013-03-12 06:28:13 -05:00
Marc Zinnschlag
16570ce87b moved header record struct to separate file 2013-03-12 09:16:03 +01:00
Marc Zinnschlag
731ac6a160 removed redundant copy of Header::Data 2013-03-12 08:30:51 +01:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
pvdk
b2d522aa4d Added support for non-latin characters in esx metadata 2013-03-12 04:01:05 +01:00
Marc Zinnschlag
b085c4f749 removing more leftovers 2013-03-11 16:53:42 +01:00
Marc Zinnschlag
2e1a1fd11a removing some remains of the removed GMST fixing feature 2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79 removed unused file type information from esm component 2013-03-11 14:42:49 +01:00
Emanuel Guevel
289bbc64f7 Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +01:00
Marc Zinnschlag
b255472cc6 fixed a spelling mistake 2013-03-09 15:39:49 +01:00
Marc Zinnschlag
2cc20c67cb Merge remote-tracking branch 'scrawl/raycasting' 2013-03-09 14:34:29 +01:00
scrawl
14964e9fcd Only build a box shape for collision nodes; use StringUtils 2013-03-09 10:28:10 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
Emanuel Guevel
3adf3f5121 Revive bsatool 2013-03-07 21:13:10 +01:00
Pieter van der Kloet
9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
Marc Zinnschlag
e7e8bd655f Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 17:44:28 +01:00
greye
9133182f2f restore loading CELL records in esmtool 2013-03-05 20:25:20 +04:00
scrawl
7f8d659f3c Fix transparency sorting 2013-03-05 17:09:20 +01:00
Marc Zinnschlag
d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 16:31:22 +01:00
scrawl
c9f7f1b994 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-05 14:37:38 +01:00
scrawl
2486ec6cb9 Material fixes (vertex colors, alpha) 2013-03-05 13:51:48 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09 change variant in info record to new type 2013-03-05 10:34:03 +01:00
Marc Zinnschlag
1b19ab6028 fixed gmst integers 2013-03-05 08:15:03 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
ce49ad54a1 some cleanup and fixing 2013-03-05 08:02:05 +01:00
Pieter van der Kloet
4c9d0563fe WIP: Implementing the .ui for the DataFilesPage 2013-03-05 03:13:39 +01:00
Chris Robinson
2f14f26b96 Use the full unique mesh name for the material instead of the NIF name 2013-03-04 10:35:13 -08:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520 added variant class 2013-03-04 14:32:23 +01:00
Chris Robinson
4e1e0eaf62 Merge remote-tracking branch 'zini/master' into material-fix 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 2013-03-03 14:24:05 -08:00
Chris Robinson
5e50436a94 Convert some BooleanValues to StringValues 2013-03-03 14:19:02 -08:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
scrawl
0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 2013-03-03 11:02:38 +01:00
Chris Robinson
21e2c287eb Fix/workaround specular issues 
The glossiness should not be multiplied by 255, however the values set in many
of Bloodmoon's meshes would look horrible otherwise. Now we can let the
NiSpecularProperty specify when to enable specular (which is supposed to
default to on, but due to the aforementioned meshes, we default to off).
 2013-03-02 19:30:23 -08:00
Chris Robinson
7930aa82b2 Add missing depthFlags to the hash 2013-03-02 19:09:15 -08:00
Chris Robinson
8e35159ad4 Handle NiSpecularProperty 2013-03-02 19:06:28 -08:00
Chris Robinson
8c0326a49c Handle NiZBufferProperty 2013-03-02 18:30:28 -08:00
Chris Robinson
03785f3ecd Handle NiVertexColorProperty 2013-03-02 16:28:32 -08:00
Pieter van der Kloet
a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 2013-03-02 23:01:53 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
Chris Robinson
fdfcd5bb47 Material properties are accumulative along the node tree 2013-03-02 12:23:29 -08:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
Nathan Jeffords
0ed2015319 refactored NIFFile parse to get better code/data seperation 2013-03-02 10:07:57 -08:00
Nathan Jeffords
6de6d9ff6e Factored a NIFStream class out of the NIFFile class. 
Split NIFFile into two parts, NIFFile which is cached and is a container
for a parsed NIF, and NIFStream which is a class specialized for parsing
NIFs. This required a semi-sweeping change to make all record classes
accept a NIFStream instead of a NIFFile as an agurment to their read
functions.
 2013-03-02 09:56:41 -08:00
Chris Robinson
e3fd4b8429 Fix restoring the original texture name when the DDS check fails 2013-03-01 17:57:34 -08:00
Chris Robinson
e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 2013-03-01 13:32:30 -08:00
Chris Robinson
166d529c50 Ensure the material is properly built after creating it 2013-03-01 13:26:31 -08:00
Chris Robinson
2c05a7477c Improve checks for texture resource names that include the "textures\" prefix 2013-02-28 17:16:28 -08:00
Chris Robinson
ae5c0663f5 Merge remote-tracking branch 'zini/master' into nif-fixes 2013-02-28 14:04:41 -08:00
Chris Robinson
eaa6813917 Workaround for meshes without any vertices 2013-02-28 13:54:53 -08:00
Chris Robinson
2786cc67f6 Fix loading empty NiTriShapeData records 2013-02-28 13:38:48 -08:00
Marc Zinnschlag
230136438b minor cleanup 2013-02-28 22:17:07 +01:00
lazydev
60f2219450 fixed zini's norices 2013-03-01 00:46:05 +04:00
Chris Robinson
1168f15361 Don't disable depth writes when blending is enabled 2013-02-28 12:17:58 -08:00
lazydev
169a1ff1ce Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-02-28 23:02:19 +04:00
Marc Zinnschlag
1f24763881 Merge remote-tracking branch 'vorenon/licensefix' 2013-02-28 19:48:35 +01:00
vorenon
06e077c07c Removing all traces of "Open Morrowind". 
pvdk said it was ok to remove the header entirely
 2013-02-28 19:36:10 +01:00
scrawl
6683e43efc Removed commented code 2013-02-28 12:35:18 +01:00
scrawl
f75681d89b Ignore ESX header version 2013-02-28 12:12:51 +01:00
Marc Zinnschlag
3bd228f71b fix for global variables of type short 2013-02-28 11:50:29 +01:00
lazydev
b93eb84401 fix for https://bugs.openmw.org/issues/573 2013-02-28 02:43:03 +04:00
Chris Robinson
a7220518b6 Merge remote-tracking branch 'zini/master' into skeleton-fixes 2013-02-27 13:22:33 -08:00
Chris Robinson
3ed0bf97a8 Share the space with the parent entity only when there's real skinned meshes 
The existence of a base skeleton doesn't mean it shares the same bone
structure. If there isn't an actual skinned entity besides the base, simply
attach it to the bone like unskinned meshes should be.
 2013-02-27 13:16:27 -08:00
Chris Robinson
bfe80bb8dc Avoid duplicating skeletons due to casing issues 
Manually created resource names are apparently always case sensitive, causing
some skeletons to get loaded multiple times.
 2013-02-27 12:33:36 -08:00
Sergey Shambir
03ca7f6123 NIF: added NiStencilProperty record handling 
NiStencilProperty appears in Better Clothes plugin. If it not handled,
some parts of NPCs bodies will be not rendered.
 2013-02-27 23:45:09 +04:00
scrawl
b82ee4872d Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-02-27 12:25:34 +01:00
Marc Zinnschlag
53953b23f9 Merge remote-tracking branch 'chris/materials' 2013-02-27 10:04:42 +01:00
Marc Zinnschlag
f175f8327f Merge remote-tracking branch 'lazydev/master' 2013-02-27 10:01:50 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
Chris Robinson
b4b20622c6 Properly handle NiAlphaProperty values 2013-02-26 15:24:20 -08:00
lazydev
f717fe0254 Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-02-27 01:47:30 +04:00
Marc Zinnschlag
70b6b68005 Merge remote-tracking branch 'sergeyshambir/BBfix' 2013-02-26 22:37:45 +01:00
lazydev
759b2e96bf fix for https://bugs.openmw.org/issues/577 2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
Chris Robinson
aefd12dfe0 Don't create meshes for collision shapes 2013-02-25 15:44:59 -08:00
Chris Robinson
9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 13:10:21 -08:00
Chris Robinson
429bc23cf6 Convert the 0-1 glossiness parameter to 0-255 for shininess 2013-02-25 13:08:40 -08:00
Pieter van der Kloet
469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 21:26:54 +01:00
Marc Zinnschlag
a535d51cbf Merge branch 'brokenendfix' 2013-02-25 19:52:22 +01:00
Chris Robinson
5f2c897001 Better handle which collision shapes to load 2013-02-25 10:29:48 -08:00
Chris Robinson
ff1ecb85c6 Don't bother storing the shape name for the submesh name 
The submesh name Ogre has is completely useless to us
 2013-02-25 08:22:57 -08:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
Marc Zinnschlag
151ecaad04 workaround for garbage after an end statement 2013-02-25 10:32:38 +01:00
Chris Robinson
53eb553c57 Be a little more aggressive when looking to skip generating a skeleton 
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
 2013-02-24 18:12:15 -08:00
Sergey Shambir
b1381ddd69 Nif loader: workaround for missed textures in BB/BH 
Works for Better Bodies / Better Heads addons.
 2013-02-25 04:12:41 +04:00
Pieter van der Kloet
6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 00:56:23 +01:00
Chris Robinson
c60e858b02 Create bones for NiTriShape nodes, and attach the entities to them 
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
 2013-02-24 12:42:32 -08:00
scrawl
2e6c63d9cd Disable specular on NIF's 2013-02-24 17:18:22 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01:00
Chris Robinson
3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 2013-02-22 01:34:22 -08:00
greye
82595e66b2 another missing header for #576 2013-02-21 22:47:18 +04:00
Marc Zinnschlag
9b7957cf20 fixed a missing inlcude 2013-02-21 19:27:07 +01:00
Chris Robinson
6ae00be8a3 Fix nifbullet shape transformation 2013-02-19 22:28:15 -08:00
scrawl
f4749f10da NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this) 2013-02-20 05:35:52 +01:00
Pieter van der Kloet
35b68a3c40 Fixed accidental profile deletion and added sorting by date 2013-02-19 15:58:01 +01:00
Pieter van der Kloet
37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Pieter van der Kloet
178cf2154e Made checking/unchecking work with the new datafiles model 2013-02-18 17:59:08 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5 Use `signed char' explicitly where needed. It is important because: 
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
 2013-02-15 20:28:14 +01:00
Pieter van der Kloet
fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
 2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
 2013-02-15 15:21:14 +01:00
Chris Robinson
da5f11700f Warn about unhandled node types before the controllers 2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d Don't complain about RootCollisionNode, it's handled in nifbullet 2013-02-13 00:43:29 -08:00
Michal Sciubidlo
f4d60ae7b2 Files sorting (masters then plugins). 
Remove unneeded includes.
 2013-02-10 19:59:25 +01:00
Michal Sciubidlo
0df7c7e5c1 Rename mPlugins* to mFiles* 2013-02-10 14:08:54 +01:00
Michal Sciubidlo
e4ed397b2d Merge plugins and masters list view in openDialog. Simplify datafilesmodel. 2013-02-10 14:02:06 +01:00
Chris Robinson
f4e587c72c Always create a skeleton from a NIF when there's more than one NiNode 2013-02-09 17:48:23 -08:00
Chris Robinson
f197c67e95 Fix a circular include 2013-02-09 12:46:20 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Mark Siewert
eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +01:00
Chris Robinson
8b1e7b95ba Attempt to load the skeleton source if it doesn't yet exist 2013-02-05 17:55:12 -08:00
Michal Sciubidlo
347a734364 Move OpenDialog to editor and use it in startup dialogue. 
Remove debug output from DataFilesList.
 2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2013-02-05 02:27:57 -08:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Chris Robinson
bec538bfa1 Always declare operator<< for using a TextKeyMap with Ogre::Any 2013-02-04 09:19:59 -08:00
scrawl
109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-03 19:02:57 +01:00
Mark Siewert
3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-03 16:14:41 +01:00
Chris Robinson
c45b4d6072 Clean up some NIF warning reports 2013-02-02 22:27:08 -08:00
Michal Sciubidlo
155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 2013-02-02 18:36:01 +01:00
Chris Robinson
e6e7c69013 Fix handling of filtered entities 2013-02-02 05:26:52 -08:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
scrawl
3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-01 16:25:54 +01:00
Michal Sciubidlo
492482de7f Add "open" option in opencs. 2013-02-01 00:42:03 +01:00
Chris Robinson
c6a9ea5007 Use the skeleton as defined in the NIF model 
The avoids having to duplicate models that get attached to different character
skeletons.
 2013-01-30 22:37:39 -08:00
Michal Sciubidlo
ac62dd050d Rename datafilespage to datafileslist 2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01:00
Chris Robinson
b6354c6282 Don't share skeleton instances between bounded parts on an NPC 
However, a skeleton instance will still be shared between entities in an entity
list.
 2013-01-30 09:29:16 -08:00
Chris Robinson
0853fa335c Avoid redundant string concatenations 2013-01-29 01:36:17 -08:00
Chris Robinson
487c83e943 Rename nonaccum to animroot 2013-01-28 22:09:41 -08:00
Chris Robinson
e1d3933145 Remove an unused struct 2013-01-28 01:27:12 -08:00
Chris Robinson
b1ffdf855f Reset the initial state of animated nodes on the skeleton instances 
This is so the animation specifies node keyframe data based on the node's
parent. This will also be necessary for applying animations from different
skeleton sources, as they can have different binding positions (even native
.skeleton resources will need to specify animation data this way).
 2013-01-26 04:48:53 -08:00
Mark Siewert
dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
 2013-01-25 18:22:01 +01:00
Chris Robinson
d836b3d0ff Don't try to create animations if there's no text keys and nonaccum node. 
Such meshes apparently use NiBSAnimationNode, a Bethesda-specific extension
which has animation-related info in its flags (values currently unknown).
 2013-01-22 00:24:57 -08:00
Chris Robinson
6905bd18ba Filter out the group name from the text keys 
It's already in the animation name, and the text keys are animation-specific
anyway.
 2013-01-21 02:59:12 -08:00
Chris Robinson
8e8900e422 Use the first bone with text keys as the nonaccum root. 2013-01-20 22:51:39 -08:00
Chris Robinson
536f8104e6 Do not create an 'all' animation. 2013-01-20 17:24:43 -08:00
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01:00
Mark Siewert
a8e02779b2 - Add support for multiple plugins trying to modify the same reference 
- Fix a small signed/unsigned warning
 2013-01-19 23:33:18 +01: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
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
Chris Robinson
e5f040a06f Improve filename pattern matching 2013-01-15 14:10:52 -08:00
scrawl
6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-14 00:10:57 +01:00
Chris Robinson
b23fcb260c Use the record index for finding the NiTriShape instead of the name 2013-01-13 08:00:04 -08:00
Chris Robinson
660d73fd88 Store the NIF index in the Record object 2013-01-13 06:56:58 -08:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
scrawl
3f4d8c08e4 Merge branch 'nif_file' into graphics 2013-01-12 06:41:13 +01:00
scrawl
31e6d28b19 Close NIF file resource after loading it into memory 2013-01-12 06:37:43 +01:00
scrawl
52516ca4b4 Merge branch 'master' into graphics 2013-01-12 01:22:01 +01:00
Marc Zinnschlag
db48017c36 Merge remote-tracking branch 'blunted2night/nif_cache_v6' 2013-01-11 11:07:45 +01:00
Michal Sciubidlo
85bdb49d1b Mix debug and release if necessary under non Windows systems. 2013-01-11 09:10:48 +01:00
Nathan Jeffords
d5ebd6654d cache loaded NIF files to eliminate reloads 
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
 2013-01-10 21:47:02 -08:00
Nathan Jeffords
0989b44b41 spread some const around NIF loading 2013-01-10 21:32:47 -08:00
Nathan Jeffords
9d4f8c6722 changed bullet_nif_loader to not modifiy NIF file 
The code in bullet_nif_loader was modifing the loaded NIF file as part of
processing. Currently this is OK since the NIF file will be thrown away
immediately, but it causes problems when trying to share loaded NIF files.
 2013-01-10 21:32:32 -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
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
455ec0996d Shaders & textures are now loaded upon loading the NIF, instead of when the object becomes visible in the camera frustum. Should improve responsiveness. 2013-01-09 22:27:58 +01:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2013-01-09 22:13:59 +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
Chris Robinson
c4c8295e0b Rename NIFLoader to Loader, and update some comments 2013-01-09 09:10:59 -08:00
Nathan Jeffords
44031ec3d7 fleshed out BSAArchive and DirArchive. 
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
 2013-01-09 08:53:27 -08:00
Chris Robinson
4b7cc1372f Some cleanup 2013-01-09 06:32:31 -08:00
Chris Robinson
a9bcbfd8d3 Use Node::_getFullTransform instead of building the matrix manually 2013-01-09 05:11:32 -08:00
Chris Robinson
015bb0bf1f Use the calculated max time for the "all" animation 2013-01-09 04:30:32 -08:00
Chris Robinson
465fd9c8af Offset animation times to start at 0 2013-01-09 04:21:56 -08:00
Marc Zinnschlag
d1e51ebf42 silenced some warnings 2013-01-09 12:25:45 +01:00
Chris Robinson
4054934f16 Store text keys for each animation 2013-01-09 02:51:25 -08:00