scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
2012-07-21 23:50:56 +02:00
Chris Robinson
81ce8dbe12
Combine animation handling into the base class
2012-07-21 14:41:26 -07:00
Chris Robinson
fcaa8aae06
Don't skip animation state updates for NPCs
2012-07-21 11:26:09 -07:00
scrawl
acc5c3bbbf
some fixes
2012-07-20 17:08:15 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
scrawl
21728020f6
fixed the water on local map
2012-07-20 14:45:42 +02:00
Chris Robinson
2db80a1504
Rename a couple methods to match their scripting counterparts
2012-07-20 00:53:12 -07:00
Chris Robinson
66860825cf
Remove some unused and unneeded bits from the Animation class
2012-07-20 00:36:52 -07:00
Chris Robinson
8b5b74f9ee
Add a quick hack to let "playgroup all" work on creatures and NPCs
2012-07-19 22:34:26 -07:00
scrawl
f5ffea4d4b
new button, water timescale
2012-07-19 23:30:41 +02:00
scrawl
e077814a8c
water
2012-07-19 22:23:07 +02:00
Chris Robinson
a86ed46ec4
Use the race ID specified in the ref base's record instead of the race record
...
The latter is localized and doesn't match with international versions.
2012-07-19 11:00:26 -07:00
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
2012-07-19 16:23:30 +02:00
Chris Robinson
6caa39629d
Reimplement the skirt part
2012-07-18 22:32:26 -07:00
Chris Robinson
b505d4ace0
Fix feet and entity part detachment
2012-07-18 21:39:50 -07:00
Chris Robinson
4af1bce659
Restore and fix some missing parts
2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec
Attach skinned parts to the scene node instead of the named bone
2012-07-18 18:38:55 -07:00
Chris Robinson
db948969c9
Attach NPC parts to the proper bone
2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca
Store the entity lists for NPC parts
2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317
Use an array instead of a bunch of nearly-identical if blocks
2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8
Destroy entities when they're done with.
2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923
Destroy entities removed from the NPC
2012-07-17 22:47:56 -07:00
Chris Robinson
92546ca18d
Move the last bits of code to createEntities
2012-07-17 20:23:09 -07:00
Chris Robinson
94f3e7a6c0
Store the entity list in the object
2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4
Create entities when loading NIFs for the NPC base
2012-07-17 15:43:40 -07:00
Chris Robinson
3efd2030e2
Create entities when loading NIFs for creatures
2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1
Create mesh entities for objects when loading the NIF
2012-07-17 13:40:03 -07:00
Chris Robinson
c6cc82a51a
Handle multiple entities per NPC part
2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0
Support multiple entities for the NPC base
2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e
Support multiple meshes for creatures
2012-07-17 11:23:34 -07:00
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
2012-07-17 10:57:15 -07:00
scrawl
4434fb640e
Merge branch 'master' into shadersystem
2012-07-17 19:12:02 +02:00
Marc Zinnschlag
0d3a7d482e
Merge remote branch 'modred11/master'
2012-07-17 10:21:46 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
a539e98274
Handle all meshes when inserting objects into the scene
2012-07-16 10:48:48 -07:00
scrawl
778e59ee37
terrain as it was before, with about 4x less code
2012-07-15 08:21:43 +02:00
scrawl
29f91753f7
correction
2012-07-14 18:44:03 +02:00
scrawl
93c641efa7
terrain albedo
2012-07-14 18:25:43 +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
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
d2fbb11475
temp commit
2012-07-13 11:26:36 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +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
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +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