eroen
886bc7e2f6
libc++ fixes: don't rely on tr1
...
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.
Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
2013-05-26 12:44:30 +02:00
Miroslav Puda
7149439ace
Replacement of empty() method by assertion.
2013-05-22 13:23:49 +02:00
Miroslav Puda
cd57523601
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 14:01:47 +02:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Miroslav Puda
d5689730eb
Removal of unnecessary variable.
...
empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.
2013-05-18 22:57:27 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
scrawl
ca81335319
Fix bug loading attribute values
2013-05-16 21:45:49 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
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
