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
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
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
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
lazydev
759b2e96bf
fix for https://bugs.openmw.org/issues/577
2013-02-27 01:37:40 +04:00
Chris Robinson
aefd12dfe0
Don't create meshes for collision shapes
2013-02-25 15:44:59 -08:00
Chris Robinson
9679daa6a4
Merge remote-tracking branch 'zini/master' into misc-cleanup
2013-02-25 13:10:21 -08:00
Chris Robinson
429bc23cf6
Convert the 0-1 glossiness parameter to 0-255 for shininess
2013-02-25 13:08:40 -08:00
Marc Zinnschlag
a535d51cbf
Merge branch 'brokenendfix'
2013-02-25 19:52:22 +01:00
Chris Robinson
5f2c897001
Better handle which collision shapes to load
2013-02-25 10:29:48 -08:00
Chris Robinson
ff1ecb85c6
Don't bother storing the shape name for the submesh name
...
The submesh name Ogre has is completely useless to us
2013-02-25 08:22:57 -08:00
Marc Zinnschlag
151ecaad04
workaround for garbage after an end statement
2013-02-25 10:32:38 +01:00
Chris Robinson
53eb553c57
Be a little more aggressive when looking to skip generating a skeleton
...
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
2013-02-24 18:12:15 -08:00
Sergey Shambir
b1381ddd69
Nif loader: workaround for missed textures in BB/BH
...
Works for Better Bodies / Better Heads addons.
2013-02-25 04:12:41 +04:00
Chris Robinson
c60e858b02
Create bones for NiTriShape nodes, and attach the entities to them
...
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
2013-02-24 12:42:32 -08:00
Chris Robinson
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 03:32:35 -08:00
Nathan Jeffords
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
Chris Robinson
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
2013-02-22 01:34:22 -08:00
greye
82595e66b2
another missing header for #576
2013-02-21 22:47:18 +04:00
Marc Zinnschlag
9b7957cf20
fixed a missing inlcude
2013-02-21 19:27:07 +01:00
Chris Robinson
6ae00be8a3
Fix nifbullet shape transformation
2013-02-19 22:28:15 -08:00
scrawl
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
2013-02-20 05:35:52 +01:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
Chris Robinson
da5f11700f
Warn about unhandled node types before the controllers
2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
2013-02-13 00:43:29 -08:00
Chris Robinson
f4e587c72c
Always create a skeleton from a NIF when there's more than one NiNode
2013-02-09 17:48:23 -08:00
Chris Robinson
f197c67e95
Fix a circular include
2013-02-09 12:46:20 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
