Commit Graph

15140 Commits (b8e11cf1970dcf47a74f0f8807e1b2523283e5fb)
 

Author SHA1 Message Date
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
9 years ago
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.
9 years ago
scrawl a29d1ace2b Read NiSpotLight 9 years ago
scrawl ba211ad9ad Read NiPointLight (Fixes #3011) 9 years ago
scrawl 8cd41f0ed4 Increase the ray distance for dropObjectOnGround (Fixes #3010) 9 years ago
scrawl 0965a9059d Handle NiLODNode using osg::LOD (Fixes #3008) 9 years ago
scrawl 626281977e Read NiLODNode (Bug #3008) 9 years ago
scrawl 9897400d97 Restore the previous key focus widget after playing video 9 years ago
scrawl f5d90f7d98 Merge pull request #804 from zelurker/improves_interetercontext_updateptr_again_for_scrawl
improves InterpreterContext::updatePtr
9 years ago
Emmanuel Anne af7b5e636e improves InterpreterContext::updatePtr
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
9 years ago
scrawl 19cd987208 Fix Ptr updates in PositionCell
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
9 years ago
scrawl 9e3eb8291f Rotations: fix the rotation order for doors 9 years ago
scrawl 90b6fa5ef1 PlaceItem, PlaceItemCell angle should be treated as degrees (Fixes #3007) 9 years ago
scrawl 3647af8d73 Rotations: use different rotation order when object is rotated via script (Fixes #2062) 9 years ago
scrawl b4ce73f179 Rotations: remove LocalRotation
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
9 years ago
scrawl 666fbba1e0 Rotations: World::rotateObject takes radians instead of degrees
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
9 years ago
scrawl 6405049add Rotations: move doors via Rotation rather than LocalRotation
Now LocalRotation is unneeded, will remove in next commit.
9 years ago
scrawl 8aacbc398f Rotations: don't wrap the angle values for non-actors
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
9 years ago
Marc Zinnschlag a07c6b4364 Modified the changelog for the wrong version. Oops. 9 years ago
Marc Zinnschlag b04a23bf43 Merge remote-tracking branch 'origin/openmw-37' into openmw-37 9 years ago
Marc Zinnschlag fef0a40bee updated changelog 9 years ago
Marc Zinnschlag 77b325a1db Merge remote-tracking branch 'scrawl/master' into openmw-37 9 years ago
scrawl a68fd791c8 Remove a stray method declaration 9 years ago
scrawl 79c44d0bfe Style fix 9 years ago
scrawl 02148a43f5 Node mask fix 9 years ago
scrawl 9c503cbd8c Add build* to the gitignore
Allows one to have multiple build folders, e.g. a separate build for a different OSG versions, or for different OpenMW versions, or when you often switch between branches.
9 years ago
scrawl 0a52ee17c3 Fix Drawable removal issues 9 years ago
scrawl 1edcb219a7 Leak fix 9 years ago
scrawl afa590bddb Leak fix 9 years ago
scrawl c62c1693e9 Disable copy constructor and operator= in PartHolder 9 years ago
scrawl fc93dc6195 Remove a stray method declaration 9 years ago
scrawl 2e9805fa0e Leak fix 9 years ago
scrawl b840c68f0c Do not create a depth buffer for the global map 2d rendering 9 years ago
scrawl 8e3bc981a2 Fix self-referencing camera 9 years ago
scrawl 7776c49fc1 GraphicsWindowSDL2: adjust the log levels 9 years ago
scrawl 0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 9 years ago
scrawl f1ac408f35 Place Drawables directly in the scene graph when built with OSG 3.4
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.

There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
9 years ago
scrawl 35459f20d5 Refactor lighting mask 9 years ago
scrawl 91583fc027 Fix MWRender::Mask_ParticleSystem 9 years ago
scrawl 03bd3d7470 Merge pull request #799 from ace13/patch-3
Fix Windows builds
9 years ago
Alexander "Ace" Olofsson 37158df339 Update scalinglayer.cpp
MSVC Explicitly requires <algorithm> for std::min and/or max
9 years ago
scrawl 637cd3a628 Adjust the FirstPersonNeckController to follow the camera with a reduced factor (Fixes #1784) 9 years ago
scrawl 3c338b9da9 ObstacleCheck: tweak the stuck detection parameters
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
9 years ago
scrawl d233bc483d ObstacleCheck: fix evasion issue
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
9 years ago
scrawl caa523a959 ObstacleCheck: fix the framerate not being taken into account 9 years ago
scrawl 801dc8eee3 ObstacleCheck: fix weird distance calculation 9 years ago
scrawl bd8332d2b0 Remove default copyop argument for nodecallback copy constructors
Works around a compiler warning with OSG 3.4:

warning: base class 'class osg::Callback' should be explicitly initialized in the copy constructor [-Wextra]

With no default argument for osg::CopyOp&, the compiler no longer sees the function as a real copy constructor and stops warning about the missing virtual initializations.

We don't care about this warning because there is nothing interesting to initialize in the osg::NodeCallback base anyway.

A proper fix for the warning would require to inserting OSG_VERSION conditional compiling all over the place, that is as long as we are still supporting OSG 3.2.
9 years ago
scrawl 1200ff9186 RigGeometry: fix incorrect bounding box in the first frame
The default computeBound() was overriding the manually set bounding box.
9 years ago
scrawl 1b52749ae1 Adjust third person camera height based on character height 9 years ago
scrawl 64abdbabe3 Small refactor of controllers handling, print warning messages for unhandled controllers 9 years ago