Marc Zinnschlag
56a80da70c
Merge remote-tracking branch 'ace/win-fix'
2013-12-29 14:50:09 +01:00
Marc Zinnschlag
456b41f05b
Merge remote-tracking branch 'scrawl/master'
2013-12-29 14:45:22 +01:00
scrawl
c0dba2834b
Closes #855 : Don't try to look up bone if there's no skeleton
2013-12-29 01:20:57 +01:00
Alexander "Ace" Olofsson
b50151cb38
Quick build fix for windows
2013-12-28 18:16:01 +01:00
Marc Zinnschlag
f1be4656ec
Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding'
2013-12-28 17:14:41 +01:00
Marc Zinnschlag
60a8a9e684
Merge remote-tracking branch 'scrawl/master'
2013-12-28 17:03:54 +01:00
Lukasz Gromanowski
9b73d23139
Fix warning about uninitialized variable inside stream.peak():
...
openmw/mwgui/bookpage.cpp:394:13: warning: ‘*((void*)& stream +24)’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 13:55:54 +01:00
scrawl
6d47d710a0
Reimplement NiGeomMorpherController using Ogre's pose animation system
2013-12-28 00:51:09 +01:00
scrawl
a9526622b1
Particle improvements: particle systems now move with the particle bone, not the scene node. This difference is not noticable if the particle bone is static, but it makes the code *much* nicer and mirrors more closely what NifSkope does.
2013-12-27 18:58:24 +01:00
scrawl
9877db413c
Connect particle systems to the particle node, not the emitter node
2013-12-26 20:53:52 +01:00
scrawl
eab2c89346
Issue #983 : Fix controllers to affect objects attached to the base node
2013-12-26 20:53:52 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
aef0fd1460
Rename some path methods
2013-12-26 20:53:51 +01:00
scrawl
e68e2f82a2
Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.
2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b
Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.
2013-12-26 20:53:51 +01:00
scrawl
c5c3248376
Compile fixes for Ogre 1.10
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Lukasz Gromanowski
18a9878bdd
Fixes #1042 : TES3 header data wrong encoding
...
Changed loading of HEDR structure from all-in-once to field-by-field
so author and descryption could be converted to UTF-8.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-21 09:33:05 +01:00
scrawl
5fd98d7c3a
Add an assertion
2013-12-19 01:41:36 +01:00
scrawl
18c002a21d
Fix an awful typo.
2013-12-19 01:31:42 +01:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
530d06ab54
Remove unused code
2013-12-14 05:07:08 +01:00
scrawl
0c3c3ed8e9
Fix wind gravity affector
2013-12-11 15:15:30 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
57a33c957e
Add possibly missing include
2013-12-09 14:26:08 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
scrawl
9fcb4fad5c
Implement NiFlipController
2013-12-08 18:51:56 +01:00
scrawl
51a9f0111c
Implement NiAlphaController and NiMaterialColorController
2013-12-08 16:38:13 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
c5e543b91b
Implement NiGeomMorpherController
2013-12-07 14:10:33 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
062ea627b3
Add parallax mapping for objects
2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723
Add normal, specular & parallax mapping for terrain
2013-12-05 15:51:01 +01:00
Alexander "Ace" Olofsson
47c60a7037
Fix C4716 (Must return a value) error on Windows MSVC
2013-12-04 21:48:25 +01:00
scrawl
3a82f8c193
Fix incorrect log file name for launcherOgre.log
2013-12-03 15:56:00 +01:00
pvdk
1512ac11ad
Fixed the content selector checkboxes appearing as partially checked
2013-11-30 12:16:57 +01:00
scrawl
e7ad503e30
Merge branch 'particles' into projectiles
2013-11-28 17:16:59 +01:00
scrawl
9f5ff033d7
Handle the "GetLOS" alias for GetLineOfSight
2013-11-25 14:06:59 +01:00
scrawl
58dce88c7d
Handle the "tai" alias for ToggleAI
2013-11-25 14:03:51 +01:00
scrawl
6b81fd78f1
Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems.
2013-11-25 13:50:33 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
Marc Zinnschlag
11e254aac8
Merge remote-tracking branch 'gus/AICombat'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
gus
dff3cf162d
ToggleAI script instruction
2013-11-18 23:03:44 +01:00
scrawl
7fd5f1df83
Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX.
2013-11-17 23:31:08 +01:00
scrawl
aa84ce3f0d
Copy paste mistake (oops)
2013-11-16 14:44:31 +01:00
scrawl
c5f1bbcc5f
Add functions to get the effect affecting resistance and weakness for another effect
2013-11-15 19:43:25 +01:00
