Chris Robinson
a576e9e430
Set the race selection character preview in a valid (idle) pose.
2013-02-25 16:40:08 -08: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
Chris Robinson
da575b181e
Use the correct GMST for the race menu
2013-02-25 13:04:17 -08:00
Pieter van der Kloet
b209b6a0e6
Added missing includes
2013-02-25 22:00:51 +01:00
Pieter van der Kloet
469d608f51
Merge remote-tracking branch 'upstream/master' into launchernext
2013-02-25 21:26:54 +01:00
Pieter van der Kloet
9cd8dd39de
Make the launcher code conform to the coding standards and cleanup
2013-02-25 21:22:07 +01:00
lazydev
7e689abdfb
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-26 00:01:50 +04:00
Marc Zinnschlag
a535d51cbf
Merge branch 'brokenendfix'
2013-02-25 19:52:22 +01:00
Marc Zinnschlag
bd9884b244
Merge remote-tracking branch 'chris/misc-cleanup'
2013-02-25 19:45:09 +01:00
Chris Robinson
000128d084
Merge remote-tracking branch 'zini/master' into misc-cleanup
2013-02-25 10:38:08 -08:00
Marc Zinnschlag
08f13ef5ab
Merge remote-tracking branch 'greye/master'
2013-02-25 19:34:03 +01:00
Marc Zinnschlag
fa45def475
Merge remote-tracking branch 'scrawl/master'
2013-02-25 19:30:30 +01:00
Chris Robinson
5f2c897001
Better handle which collision shapes to load
2013-02-25 10:29:48 -08:00
greye
661fd73c6e
fix rotation for objects in inactive cells and forced vanity mode
2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec
Properly update the Ptr object in the mechanics manager when moving across cells
2013-02-25 09:57:34 -08:00
scrawl
8aff033a0c
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
2013-02-25 18:29:11 +01:00
scrawl
b1fc68d44d
Merge branch 'master' into graphics
2013-02-25 17:36:33 +01:00
scrawl
355390429e
Fix World::isUnderwater to use dynamic waterlevel
2013-02-25 17:27:50 +01: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
88e8659a49
minor cleanup
2013-02-25 16:52:31 +01:00
Chris Robinson
5d5d28c06c
Increase the ID cache to 40
...
Helps improve performance with Tribunal and Bloodmoon's scripts
2013-02-25 07:43:56 -08:00
scrawl
73d48a95f6
Add message box when the player tries to move when being overencumbered.
2013-02-25 16:31:48 +01: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
cd40d167ce
Merge remote-tracking branch 'chris/animation2'
2013-02-25 14:56:03 +01:00
Marc Zinnschlag
151ecaad04
workaround for garbage after an end statement
2013-02-25 10:32:38 +01:00
scrawl
dfe29db9cb
Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)
2013-02-25 06:57:32 +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
Pieter van der Kloet
c4ebdc230c
Cleaned up strings and indentation
2013-02-25 01:28:13 +01:00
Pieter van der Kloet
a0007325ad
Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins
2013-02-25 01:22:14 +01: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
Pieter van der Kloet
17a0a201df
Various fixes and changes to the settings handling
2013-02-25 00:56:04 +01:00
Chris Robinson
000236ba80
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 15:30:46 -08:00
Chris Robinson
74b8095fc7
Use default parameters where appropriate
2013-02-24 14:43:20 -08:00
Chris Robinson
5267d17408
Revert "forgot to destroy child scene nodes"
...
This reverts commit f1a3309392
2013-02-24 14:14:08 -08:00
ChrisKCat
9e7b559b09
Merge pull request #6 from scrawl/lights
...
For light objects without an AttachLight bone, attach the light to the c...
2013-02-24 14:12:53 -08:00
lazydev
de93ed325d
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-25 01:43:11 +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
Marc Zinnschlag
e060713aa3
updated credits file
2013-02-24 20:37:29 +01:00
scrawl
f1a3309392
forgot to destroy child scene nodes
2013-02-24 19:03:25 +01:00
scrawl
1ae2d3c6ab
For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.
2013-02-24 19:00:06 +01:00
Nathan Jeffords
7ea1f6a02a
fixes for using FFMPEG on windows
2013-02-24 09:42:08 -08:00
scrawl
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-24 18:04:51 +01:00
scrawl
2e6c63d9cd
Disable specular on NIF's
2013-02-24 17:18:22 +01:00
Lars Söderberg
e32646ee50
Prettier repeated borders.
2013-02-24 16:57:40 +01:00
Lars Söderberg
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
2013-02-24 16:57:07 +01:00
lazydev
22862617d8
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-24 19:34:21 +04:00
Chris Robinson
94be45e07e
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 06:20:10 -08:00
