mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
Code Issues Releases Wiki Activity
15240 commits 38 branches 54 tags 122 MiB
Commit graph

15240 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
5de9a5e840 Merge remote-tracking branch 'origin/openmw-37' into openmw-37 2015-11-17 09:04:07 +01:00
scrawl
d68ea994d5 Deal with empty meshes 2015-11-17 01:51:21 +01:00
scrawl
83e9a649e5 Cleanup 2015-11-17 01:45:38 +01:00
scrawl
e62470d674 Auto-generate the collision shape for native mesh formats 2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
21e25f4756 Use the traversalNumber as frame number 2015-11-16 20:03:45 +01:00
scrawl
52901ec10c Do not create terrain geodes when built with OSG 3.4 2015-11-16 15:11:20 +01:00
scrawl
71d9e7dc52 Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file 2015-11-16 02:21:45 +01:00
scrawl
e9e12d396d Merge remote-tracking branch 'upstream/openmw-37' into HEAD 2015-11-15 21:37:32 +01:00
scrawl
0f347eccbf Flip the origin of global map texture 
Now it's consistent with the overlay texture.
 2015-11-15 21:36:41 +01:00
scrawl
8b7bdcd127 Fix the global map overlay viewport (Bug #3018) 2015-11-15 21:32:34 +01:00
scrawl
af4923577b Fix double writing of Dialogue NAME in OpenCS 2015-11-15 16:04:52 +01:00
scrawl
0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 2015-11-14 17:17:22 +01:00
scrawl
cfec5a3f5d Merge pull request #807 from ace13/patch-3 
Add FFMPEG to include path for OpenMW
 2015-11-14 17:16:18 +01:00
Alexander "Ace" Olofsson
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?
 2015-11-14 16:02:42 +01:00
Marc Zinnschlag
de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
63c47a78d6 OS X: fixup Qt plugin during packaging 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449 OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f OS X: use less ambiguous variable names in packaging code 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
014a2fc0e9 OS X: do not override Qt plugin path 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17 OS X: remove QPlastiqueStyle usage 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d OS X: always copy Cocoa platform plugin into OpenMW bundle 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4e3bbe01b6 OS X: disable glTexStorage2D because of OSG/driver issue 
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
 2015-11-14 13:50:01 +01:00
scrawl
0ec56d321a Remove unneeded using namespace 2015-11-14 03:01:40 +01:00
scrawl
05498ad592 Refactor: InputManager no longer depends on Engine 2015-11-14 03:01:24 +01:00
scrawl
aae1aa3708 Adjust tests to work with esm_rewrite branch. 2015-11-14 00:27:59 +01:00
scrawl
f91aae2350 Tests: add record overwrite test 2015-11-14 00:27:59 +01:00
scrawl
1e817a976f Tests: add record deletion test 2015-11-14 00:27:59 +01:00
scrawl
771193bae8 Tests: add content_diagnostics_test (requires some data files) 2015-11-14 00:27:59 +01:00
scrawl
38c155c579 Tests: add dialogue_merging_test (requires some data files) 2015-11-14 00:27:59 +01:00
scrawl
d0d8c2eded Delete empty test 2015-11-14 00:27:59 +01:00
scrawl
9116c701d5 esmtool fix 2015-11-14 00:27:59 +01:00
scrawl
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.
 2015-11-13 21:00:51 +01:00
scrawl
054c3eb24e Do not deep copy PrimitiveSets when build with OSG 3.5 2015-11-13 20:39:44 +01:00
scrawl
fc8e40889d Move common subrecord definitions (NAME, DELE) to defs.hpp 2015-11-13 18:07:18 +01:00
Marc Zinnschlag
c312162b57 Merge branch 'openmw-37' 2015-11-13 14:24:57 +01:00
Marc Zinnschlag
692a15a3df updated changelog again 2015-11-13 14:20:55 +01:00
Marc Zinnschlag
fa9ebc50a2 Merge remote-tracking branch 'origin/master' 2015-11-13 13:34:03 +01:00
Marc Zinnschlag
b0d79ee790 Merge branch 'tooltip' 2015-11-13 11:40:10 +01:00
Marc Zinnschlag
63ee37d914 added 3D scene tooltips 2015-11-13 11:39:57 +01:00
scrawl
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
 2015-11-13 01:34:36 +01:00
scrawl
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.
 2015-11-13 00:23:00 +01:00
scrawl
a29d1ace2b Read NiSpotLight 2015-11-12 23:45:12 +01:00
scrawl
ba211ad9ad Read NiPointLight (Fixes #3011) 2015-11-12 23:42:17 +01:00
scrawl
8cd41f0ed4 Increase the ray distance for dropObjectOnGround (Fixes #3010) 2015-11-12 23:05:44 +01:00
scrawl
0965a9059d Handle NiLODNode using osg::LOD (Fixes #3008) 2015-11-12 19:52:36 +01:00
scrawl
626281977e Read NiLODNode (Bug #3008) 2015-11-12 19:52:32 +01:00
scrawl
9897400d97 Restore the previous key focus widget after playing video 2015-11-12 19:03:24 +01:00