020b3add94
Merge branch 'openmw-37'
9 years ago
5de9a5e840
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
9 years ago
d68ea994d5
Deal with empty meshes
9 years ago
83e9a649e5
Cleanup
9 years ago
e62470d674
Auto-generate the collision shape for native mesh formats
9 years ago
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
9 years ago
eb2f16d682
Support for loading .osg mesh format
9 years ago
21e25f4756
Use the traversalNumber as frame number
9 years ago
52901ec10c
Do not create terrain geodes when built with OSG 3.4
9 years ago
71d9e7dc52
Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file
9 years ago
e9e12d396d
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
0f347eccbf
Flip the origin of global map texture
...
Now it's consistent with the overlay texture.
9 years ago
8b7bdcd127
Fix the global map overlay viewport (Bug #3018 )
9 years ago
af4923577b
Fix double writing of Dialogue NAME in OpenCS
9 years ago
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
cfec5a3f5d
Merge pull request #807 from ace13/patch-3
...
Add FFMPEG to include path for OpenMW
9 years ago
d2a4175804
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
9 years ago
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
9 years ago
63c47a78d6
OS X: fixup Qt plugin during packaging
9 years ago
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
9 years ago
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
9 years ago
5c4899580f
OS X: use less ambiguous variable names in packaging code
9 years ago
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
9 years ago
4e3bbe01b6
OS X: disable `glTexStorage2D` because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
9 years ago
0ec56d321a
Remove unneeded using namespace
9 years ago
05498ad592
Refactor: InputManager no longer depends on Engine
9 years ago
aae1aa3708
Adjust tests to work with esm_rewrite branch.
9 years ago
f91aae2350
Tests: add record overwrite test
9 years ago
1e817a976f
Tests: add record deletion test
9 years ago
771193bae8
Tests: add content_diagnostics_test (requires some data files)
9 years ago
38c155c579
Tests: add dialogue_merging_test (requires some data files)
9 years ago
d0d8c2eded
Delete empty test
9 years ago
9116c701d5
esmtool fix
9 years ago
1402a16702
SceneWidget: change the threading model to DrawThreadPerContext
...
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
9 years ago
054c3eb24e
Do not deep copy PrimitiveSets when build with OSG 3.5
9 years ago
fc8e40889d
Move common subrecord definitions (NAME, DELE) to defs.hpp
9 years ago
c312162b57
Merge branch 'openmw-37'
9 years ago
692a15a3df
updated changelog again
9 years ago
fa9ebc50a2
Merge remote-tracking branch 'origin/master'
9 years ago
b0d79ee790
Merge branch 'tooltip'
9 years ago
63ee37d914
added 3D scene tooltips
9 years ago
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
7c16630874
NifOsg::Emitter: ignore psToWorld scale
...
Seems wrong to me, but MW appears to do it that way. Without this fix, the light_de_candle_08_64 from http://www.nexusmods.com/morrowind/mods/41654/ has flame particles in the wrong spot.
9 years ago
a29d1ace2b
Read NiSpotLight
9 years ago
ba211ad9ad
Read NiPointLight ( Fixes #3011 )
9 years ago
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
9 years ago
0965a9059d
Handle NiLODNode using osg::LOD ( Fixes #3008 )
9 years ago
626281977e
Read NiLODNode (Bug #3008 )
9 years ago
Marc Zinnschlag
scrawl
Alexander "Ace" Olofsson
Nikolay Kasyanov