Commit Graph

2766 Commits (openmw-38)

Author SHA1 Message Date
scrawl 36e91617c9 Revert "NifOsg::Emitter: ignore psToWorld scale"
This reverts commit 7c16630874.

Fixes #3022
9 years ago
scrawl 9b96fcc224 Set the particle scaleReferenceFrame to local space 9 years ago
scrawl 3bd2aaddea Adjust PulseSlow light controller (Fixes #1963) 9 years ago
scrawl 0bdfd1b0d7 Ignore Creature INDX subrecords
Found in some .ess files, not sure what they mean.
9 years ago
scrawl d68ea994d5 Deal with empty meshes 9 years ago
scrawl 83e9a649e5 Cleanup 9 years ago
scrawl e62470d674 Auto-generate the collision shape for native mesh formats 9 years ago
scrawl 8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 9 years ago
scrawl eb2f16d682 Support for loading .osg mesh format 9 years ago
scrawl 21e25f4756 Use the traversalNumber as frame number 9 years ago
scrawl 52901ec10c Do not create terrain geodes when built with OSG 3.4 9 years ago
Marc Zinnschlag de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 9 years ago
scrawl 38c155c579 Tests: add dialogue_merging_test (requires some data files) 9 years ago
scrawl 054c3eb24e Do not deep copy PrimitiveSets when build with OSG 3.5 9 years ago
scrawl fc8e40889d Move common subrecord definitions (NAME, DELE) to defs.hpp 9 years ago
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 0965a9059d Handle NiLODNode using osg::LOD (Fixes #3008) 9 years ago
scrawl 626281977e Read NiLODNode (Bug #3008) 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
Marc Zinnschlag b04a23bf43 Merge remote-tracking branch 'origin/openmw-37' into openmw-37 9 years ago
scrawl 1edcb219a7 Leak fix 9 years ago
scrawl fc93dc6195 Remove a stray method declaration 9 years ago
MatthewRock a662a00c62 Fixing bug for merchant 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
Alexander "Ace" Olofsson 37158df339 Update scalinglayer.cpp
MSVC Explicitly requires <algorithm> for std::min and/or max
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 64abdbabe3 Small refactor of controllers handling, print warning messages for unhandled controllers 9 years ago
scrawl 35f5be680b Support for NiVisController on trishape nodes 9 years ago
Marc Zinnschlag af5a1bc16b Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag b61b732207 fixed an interference with script warning mode and error downgrading (Fixes #2990) 9 years ago
scrawl 79b3f1e6a8 Small cleanup 9 years ago
scrawl 59aee04ddb Implement ScalingLayer, for layouting of widgets in screen-relative coordinates 9 years ago
scrawl 57b9eafa0f osgMyGUI: implement AdditiveLayer 9 years ago
scrawl 51f3a8fec6 osgMyGUI: move Platform methods to the .cpp file 9 years ago
scrawl 7ff168b787 osgMyGUI: add support for layers to insert custom rendering state 9 years ago
scrawl 0210b87ffc Revert "Fix LightSource crash"
This reverts commit f336c6db87.

Root cause should be fixed in next commit.
9 years ago
scrawl 72252d4f32 Terrain: restore IncrementalCompileOperation 9 years ago
scrawl 7ca8e45d5d Terrain: remove debug code 9 years ago
scrawl ef18f4217f Terrain: create 4x4 terrain chunks per ESM::Cell to improve performance
Improves performance because the number of splatting layers per chunk is reduced, and finer grained frustum culling can be done.
9 years ago
scrawl 95cf13e3f2 Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable 9 years ago
Marc Zinnschlag e081eb2c34 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag 7239481672 Merge remote-tracking branch 'scrawl/scrawl-patch-2' 9 years ago
scrawl c996702b56 Fix some uninitialised variables found by static analysis 9 years ago
scrawl f7d0d06134 Compiler: remove unused mNameStartingWithDigit 9 years ago
scrawl c23609e22b Cache the light list in LightListCallback
When multiple cameras are rendering, the later cameras can reuse the light lists from the first camera.
9 years ago
scrawl fd1ccd21ff Disable freezeOnCull for weather particles 9 years ago
scrawl 5ca0ae5232 Don't add the same AlphaFader to multiple nodes 9 years ago
scrawl f336c6db87 Fix LightSource crash 9 years ago
scrawl 49df6b7450 LightManager: fix incorrect view matrix for RELATIVE_RF cameras 9 years ago
scrawl 6dff11f847 Duplicate code fix 9 years ago
scrawl 8552a9d82c Add multiple camera support to LightManager 9 years ago
scrawl 2ee6b41887 Handle NiAlphaProperty on a drawable basis
Removes the RenderBin nesting complication. Also results in leaner StateSets, so the cull phase should be a bit faster.
9 years ago
Marc Zinnschlag 8eb6d337d5 deal with script execution from within a script (Fixes #2964) 9 years ago
Emmanuel Anne b911abd7d8 add a few more possible arguments to choice
this fixes some travel dialogs for "Antares Big Mod"
9 years ago
Marc Zinnschlag 435e52306a adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces 9 years ago
Marc Zinnschlag ae54f34f25 removed a redundant else and made unary + work also in the console 9 years ago
Marc Zinnschlag 2158bfe285 Merge remote-tracking branch 'zelurker/scripts_unary_plus' 9 years ago
scrawl 8e69c80bf6 Add framenumber checks in various cull callbacks, so we don't update more than once per frame when multiple cameras are used 9 years ago
Emmanuel Anne dace7ab706 scripts: recognize '+' also as a unary operator
it fixes the armor sorter in "Blades safe house.esp"
9 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
scrawl f7e5a40143 Fix typo 9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
Marc Zinnschlag 4d94f38f4b replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation (Fixes #1730) 9 years ago
cc9cii 192f01e3ac Set default creature scale to 1. Partially resolves bug #2880. (no creature verifier yet) 9 years ago
cc9cii 45aee1b508 Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. 9 years ago
scrawl 5252dbcf1f Add some comments to ESM::Land 9 years ago
Marc Zinnschlag a445683312 Merge branch 'mergetool'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
9 years ago
scrawl 76fb68a9c0 Handle particle systems that don't have emitters
Fixes a crash in the Magic Diversity mod.
9 years ago
Marc Zinnschlag a8dc1c1198 merge land tables 9 years ago
Marc Zinnschlag 69b9eadb52 refactored loading of land data 9 years ago
Marc Zinnschlag febf611c82 made return type of ESMTerrain::Storage::getLand const 9 years ago
Marc Zinnschlag b0641934d4 added copy constructor and assignment operator for Land record struct 9 years ago
Marc Zinnschlag 7a96a04b75 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl e9acd135a6 Update todo comment 9 years ago
scrawl cda8a88f0d Use DEEP_COPY_PRIMITIVES to work around problem in osg::Geometry copy constructor (Bug #2754) 9 years ago
slothlife 7817c52cbb Discard old save game weather records 9 years ago
slothlife 54fa5273dc Refactor weather transitions to act more like MW
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
9 years ago
scrawl af3b0cd883 Improve some error messages 9 years ago
Nikolay Kasyanov 166df28906 OS X cursor workaround build fix 10 years ago
scrawl 4a68ceaeb7 Restrict the OS X cursor workaround to Intel graphics systems 10 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl af5ffa5548 Don't warn about SDL touch events 10 years ago
scrawl 47ac20af40 Workaround flipped cursor on OS X 10 years ago
Marc Zinnschlag cbf9f83b85 allow use of IDs as function arguments, even if the ID matches a keyword (Fixes #2830) 10 years ago
scrawl 16b8ef3164 Don't use a shared Material in MaterialColorController 10 years ago
scrawl de479e35c8 Fix AlphaController affecting all instances of the StateSet 10 years ago
Alexander "Ace" Olofsson 1f78ebd3c9 Oops? 10 years ago
Alexander "Ace" Olofsson 77a3a52b4e What's wrong with this statement? 10 years ago
Alexander "Ace" Olofsson e9ffbcc1b0 OSG 3.3.3 moves GL extensions out of osg::Texture 10 years ago
scrawl 5d3ad13868 Merge pull request #696 from EmperorArthur/verbose_errors
Be more descriptive when the NIF loader does not handle something.
10 years ago
Marc Zinnschlag be1692f218 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 20106bb90f allow keywords in quotes (Fixes #2794) 10 years ago
Arthur Moore 2d93a6f6cb Be more verbose when dealing with unhandled nif texture properties 10 years ago
scrawl d7ad0ee148 Print a sensible error message when S3TC support is missing (Fixes #2800) 10 years ago
scrawl 3a7d0d8dc8 Remove a file that isn't in use yet from build 10 years ago
Stanislav Bas f9b0b7ede5 Make saving of deleted ESM records more consistent 10 years ago
scrawl 26656707dd Use marker_error.nif as replacement when a mesh fails to load 10 years ago
scrawl ac1f64b559 Fix StencilProperty front face mixup (Fixes #2802) 10 years ago
Stanislav Bas 9a8ca81907 Fix missing break in switch statement 10 years ago
scrawl b3f5ac5dbb Include cleanup 10 years ago
Stanislav Bas daaff1284e Remove unused includes 10 years ago
Stanislav Bas 4a16eba716 Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records 10 years ago
Stanislav Bas 1e8182220a Fix build errors & warnings 10 years ago
Stanislav Bas f5745749a6 Remove <cstdint> include file from loaddial.cpp 10 years ago
Koncord 7924ecef3e Fix definition conflict 10 years ago
Stanislav Bas 5fd48efd28 Some refactoring. Remove unused code 10 years ago
Stanislav Bas e65ff723ce More ESM records have DELE handling.
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
10 years ago
Stanislav Bas ad353e6dd0 Refine DELE handling in ESM records. Add position-independent DELE search 10 years ago
Marc Zinnschlag b3ad983f1f Merge remote-tracking branch 'scrawl/version'
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
Marc Zinnschlag edde1fb727 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
slothlife 420789baa9 Remove an unused include 10 years ago
slothlife 1b3cc957f8 Move some OSG static library setup code 10 years ago
scrawl 41bed4c7d9 Use multimap to speed up custom map marker code 10 years ago
slothlife df99d5a59d Move setup code for OSG when statically linked 10 years ago
slothlife 43b1f15af9 Merge remote-tracking branch 'upstream/master' into static-deps-build 10 years ago
slothlife 83ef1f7eea Add support for linking OpenSceneGraph statically
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
10 years ago
Stanislav Bas e8a9567be3 Move DELE handling to CellRef record 10 years ago
Koncord 73731d27e9 Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt 10 years ago
scrawl de6dc21552 Create hardware cursors in advance (Fixes #2660) 10 years ago
Stanislav Bas b55a4999ca Add NAME handling to DebugProfile and Filter records 10 years ago
scrawl c4866bdfc6 Disable mipmaps for GUI textures
For some reason, the mipmap generator seems to be broken on Linux Intel graphics (works on Nvidia). This was breaking the scrollbar arrows, which are minified enough to show using a mipmap.
10 years ago
Stanislav Bas c8c79dc1ef Move ID loading into a separate method for Dialogue and DialInfo records 10 years ago
Stanislav Bas 74a055f3cc Remove NAME and DELE handling from IdCollection 10 years ago
Stanislav Bas c266315a35 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 10 years ago
Stanislav Bas 2ed182b144 Update to upstream/master. Resolve merge conflicts in MWWorld::Store 10 years ago
Stanislav Bas adec0cb61d Add removing of deleted Infos to Dialogue::clearDeletedInfos() 10 years ago
Stanislav Bas e0983c815c Some fixes for ESM Dialogues and Infos 10 years ago
scrawl 24ae1d5ace Fix some issues found by coverity 10 years ago
Marc Zinnschlag 08d2b196bd Merge remote-tracking branch 'ace/explicit-instantiation' 10 years ago
scrawl 72686c32ae Fix runtime exceptions on MyGUI debug builds 10 years ago
Stanislav Bas 7ecb54a776 Set Deleted flag to false when initializing ESM records 10 years ago
Stanislav Bas 89e44c8f1f Remove explicit record ID in load/read methods of MWWorld::Store 10 years ago
Stanislav Bas b2f3ccb080 Add NAME handling to GameSetting record 10 years ago
Stanislav Bas 09a3358017 Add NAME and DELE handling to Global record 10 years ago
Stanislav Bas 30b42bf4c0 Remove redundant code 10 years ago
Stanislav Bas 8c3654af11 Add NAME handling to Race record 10 years ago
Stanislav Bas b667338a8f Add NAME and DELE handling to Cell record 10 years ago
Stanislav Bas 847614c26f Add DELE handling to Info record 10 years ago
Stanislav Bas 0b537186e5 Add NAME and DELE handling to Dialogue record 10 years ago
Stanislav Bas 19ac4e942a Change DELE sub-record value to 0 (4 bytes) 10 years ago
Stanislav Bas d2c15647a3 Add NAME and DELE handling to Script record 10 years ago