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
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
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