1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Commit graph

6699 commits

Author SHA1 Message Date
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
e85bc8b2cd Only load one Nif for Animation objects
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwmechanics/character.cpp
2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd rename IInterface to Interface 2013-05-06 16:05:56 +02:00
scrawl
b5071ced23 Removed using namespace 2013-05-06 16:04:28 +02:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a Remove unused file 2013-05-06 15:30:23 +02:00
scrawl
f1413ca56b Synced font code ranges. 2013-05-06 15:17:17 +02:00
scrawl
1315432322 Handle @# links in journal 2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 2013-05-06 13:13:14 +02:00
scrawl
166eac2e25 Cleanup 2013-05-06 11:31:34 +02:00
scrawl
ef9f0b2fc0 Fix size of quest index 2013-05-05 11:56:08 +02:00
Marc Zinnschlag
4894b3ec30 Merge remote-tracking branch 'scrawl/memory' 2013-05-05 11:19:17 +02:00
scrawl
38c399a698 Fix duplicate sounds 2013-05-05 10:51:17 +02:00
scrawl
d6e9cb114e Forgot to add directory 2013-05-04 23:12:05 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00
Marc Zinnschlag
5a177dcea5 Merge remote-tracking branch 'scrawl/master' 2013-05-04 20:37:51 +02:00
scrawl
2ccb779910 Fix member variable case problem 2013-05-04 19:15:29 +02:00
scrawl
f0354ea04c Fix member variable case problem 2013-05-04 19:14:19 +02:00
Marc Zinnschlag
5de0db9a28 updated credits file 2013-05-04 18:57:34 +02:00
scrawl
0f2866dc15 Text replace fix 2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79 Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly. 2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35 Fast forward to the last page in the journal when opening it 2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48 Added text colors, goodbye, message 2013-05-04 15:15:44 +02:00
scrawl
f07497bbde Fix lockup 2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156 Fix a bug in getPCNextRank 2013-05-04 12:28:12 +02:00
Lukasz Gromanowski
6fbd940a2f Fix warning issued by GCC 4.8 in oics/tinyxml.cpp
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:

openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
   TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
                                                  ^

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-05-04 07:53:03 +02:00
scrawl
03f4e91ceb Unrelated shadows fix 2013-05-03 23:08:46 +02:00
scrawl
0bb51fd91d Retrieve the correct case for topics in the journal 2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
gus
7fe7111c19 Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding... 2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 2013-05-03 14:55:00 +02:00
scrawl
75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75 Bugfix #732 part 2 2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
greye
a8b1706678 init pointer value to prevent segfault 2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22 Initialize values 2013-05-02 22:43:21 +04:00
Glorf
f1a659e2ac Bugfix #730 2013-05-02 14:49:30 +02:00
kpp
28ef4d97da Fixes Bug #734 'Book empty line problem'
Hides buttons 'Next' and 'Prev' at the last and at the first page
2013-05-02 07:35:25 +04:00
Chris Robinson
03a6190c5a Merge remote-tracking branch 'zini/master' into animations 2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38 Implement handling weapon states 2013-05-01 10:19:16 -07:00
Marc Zinnschlag
d5741c7141 Merge remote-tracking branch 'scrawl/master' 2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'"
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2 Fix a case folding bug 2013-05-01 16:38:16 +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
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00