mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity
6,194 Commits 18 Branches 66 Tags
Commit Graph

1050 Commits

Author SHA1 Message Date
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
lazydev
759b2e96bf fix for https://bugs.openmw.org/issues/577 2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01: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
Pieter van der Kloet
469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 21:26:54 +01: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
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01: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
Pieter van der Kloet
6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 00:56:23 +01: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
scrawl
2e6c63d9cd Disable specular on NIF's 2013-02-24 17:18:22 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01: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
Pieter van der Kloet
35b68a3c40 Fixed accidental profile deletion and added sorting by date 2013-02-19 15:58:01 +01:00
Pieter van der Kloet
37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Pieter van der Kloet
178cf2154e Made checking/unchecking work with the new datafiles model 2013-02-18 17:59:08 +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
Pieter van der Kloet
fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
 2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
 2013-02-15 15:21: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
Michal Sciubidlo
f4d60ae7b2 Files sorting (masters then plugins). 
Remove unneeded includes.
 2013-02-10 19:59:25 +01:00
Michal Sciubidlo
0df7c7e5c1 Rename mPlugins* to mFiles* 2013-02-10 14:08:54 +01:00
Michal Sciubidlo
e4ed397b2d Merge plugins and masters list view in openDialog. Simplify datafilesmodel. 2013-02-10 14:02:06 +01: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
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00