scrawl
d41050fb79
merge
2012-07-14 11:21:40 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07:00
Chris Robinson
fdfe40a55a
Use a different loader object for each NIF mesh
2012-07-13 13:41:08 -07:00
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
2012-07-13 09:32:58 -07:00
Marc Zinnschlag
573d7e7e45
Issue #314 : fix to potion use function (was mixing up potion with potion user)
2012-07-13 15:51:57 +02:00
Marc Zinnschlag
c4f9bbdc8b
Merge remote branch 'scrawl/plugins_dbg'
2012-07-13 13:09:45 +02:00
Marc Zinnschlag
782d417d5b
Issue #314 : potion usage
2012-07-13 13:09:22 +02:00
Marc Zinnschlag
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
2012-07-13 13:08:48 +02:00
Carl Maxwell
e4d046f69c
Prepending m to the name of every member variable.
...
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
2012-07-13 03:51:58 -07:00
scrawl
1429c8d5cb
copy&paste mistake
2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2
use debug versions of ogre plugins in debug mode
2012-07-13 11:30:47 +02:00
scrawl
d2fbb11475
temp commit
2012-07-13 11:26:36 +02:00
Marc Zinnschlag
29b4a5e5f7
Issue #314 : added apply actions
2012-07-13 09:41:38 +02:00
Marc Zinnschlag
84d846cf07
Issue #314 : implemented apply and skillUsageSucceeded functions for MWClass::Npc
2012-07-13 09:16:27 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e
Issue #314 : added skillUsageSucceeded function to Class
2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043
Issue #314 : extended Class::apply function to cover the actor
2012-07-13 08:50:46 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
Chris Robinson
9995dff943
Use a key list for NiColorData
2012-07-12 14:33:50 -07:00
Chris Robinson
3f11b6b1ae
Cleanup a couple unneeded misc component references
2012-07-12 12:01:11 -07:00
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
2012-07-12 11:21:52 -07:00
Chris Robinson
b292665de9
Use key lists to store some NIF data types
2012-07-12 08:00:26 -07:00
Chris Robinson
b7b9f11333
Add generic classes to help deal with NIF keys
2012-07-12 06:47:38 -07:00
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
2012-07-12 05:37:56 -07:00
Chris Robinson
7e8c146de6
Constify some RecordListT methods
2012-07-11 06:39:03 -07:00
Chris Robinson
8e324c90dc
Constify some RecordPtrT methods
2012-07-11 06:37:17 -07:00
scrawl
cd6e9986b6
forgot to add files
2012-07-11 09:09:38 +02:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
Chris Robinson
395a7600fd
Initialize identify transform when declaring the identity object
2012-07-10 23:13:03 -07:00
scrawl
b2313be6d7
submodule update
2012-07-11 04:31:33 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
jvoisin
6c73f5e518
Add some translators/reversers to credits.txt
2012-07-10 22:25:19 +03:00
Marc Zinnschlag
089ee33588
some readme.txt improvements
2012-07-10 17:06:27 +02:00
Marc Zinnschlag
1fef4f2bc2
splitting off credits from readme file
2012-07-10 16:59:26 +02:00
Chris Robinson
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
2012-07-10 06:16:16 -07:00
Marc Zinnschlag
ec9ebe6b58
Merge branch 'skillgain' into potions
...
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
2012-07-10 14:08:30 +02:00
Chris Robinson
dddf1b4ee5
Rename getMatrix->getMatrix3 and getVector->getVector3
2012-07-10 04:45:14 -07:00
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
2012-07-10 13:23:41 +02:00
Chris Robinson
d30f64650a
Make the read_* methods private and remove the generic load() methods
2012-07-10 04:21:47 -07:00
Chris Robinson
930459365b
Rename getShort->getUShort and getByte->getChar
2012-07-10 03:52:01 -07:00
gugus
164a5c8fe4
rotation now also work with the physic representation
2012-07-10 12:10:50 +02:00
Chris Robinson
95b804a104
Remove NIFFile::getArrayLen
2012-07-10 03:02:37 -07:00
gugus
70c74ede05
changed rotation order
2012-07-10 11:53:12 +02:00
Chris Robinson
ca37706b34
Use Ogre types for Matrix and Vector objects
2012-07-10 02:38:35 -07:00