Commit Graph

2766 Commits (openmw-38)

Author SHA1 Message Date
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
Stanislav Bas 9ac20a3355 Add NAME and DELE handling to ESM records.
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.
10 years ago
Stanislav Bas 926c825d0c Add NAME and DELE handling to ESM records.
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.
10 years ago
Alexander "Ace" Olofsson 2bebfea38d Instantiate struct as a struct 10 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 10 years ago
scrawl 49c07de773 Merge pull request #643 from ace13/win-build-fix
Fix build error and a pair of warnings
10 years ago
Alexander "Ace" Olofsson aaaee74a4d Fix the comments 10 years ago
scrawl 631cec7304 Take the radius of lights into account when sorting 10 years ago
scrawl bf9c62fa42 Fix for some coverity scan defects 10 years ago
scrawl a1432b0255 Move attackingOrSpell flag to the CharacterController 10 years ago
scrawl a081d402c5 Use the format field instead of version field 10 years ago
scrawl 4637750601 Savegame loading optimization 10 years ago
scrawl 43f9c7f295 Skip the Update traversal for inactive skeletons 10 years ago
scrawl 1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
10 years ago
scrawl 502cc852da Handle encoding conversions when saving TES3 header (Fixes #2727) 10 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl 5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 10 years ago
scrawl 1d76607005 Add ORI (ObjectReferenceInfo) alias for BetaComment (Fixes #2723) 10 years ago
scrawl ea0339d471 Make the string argument to BetaComment optional 10 years ago
scrawl 5ac502d104 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
scrawl d3ef075952 Fix an uninitialized variable 10 years ago
scrawl a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
10 years ago
scrawl 2ce269c0fc Werewolf stats compatibility with old save files 10 years ago
scrawl d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 10 years ago
scrawl 44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves
Still need to deal with save files.
10 years ago
scrawl efad4efe19 Star fading (Bug #2693) 10 years ago
scrawl 7a5f220ac5 GlowTexture keeps the alpha channel from the previous texture stage 10 years ago
scrawl 39539603bf Re-enable a warning message 10 years ago
scrawl a7c5beb7c5 Remove redundant allocations for NIF meshes 10 years ago
scrawl 43384596d4 Style fix 10 years ago
scrawl fabc5126f3 Include cleanup 10 years ago
scrawl 81a4a6da6b Make better use of the available texture units (Bug #2702)
Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit.
10 years ago
scrawl 934166a853 Ignore the alpha value for particle materials (Bug #2699) 10 years ago
scrawl b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 10 years ago
scrawl 6199c0bbc5 Use osgDB::SharedStateManager for sharing of StateSets across NIF files 10 years ago
scrawl 3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cc9cii cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 10 years ago
scrawl aad8e7b6d0 Light culling fix 10 years ago
scrawl 18f4eaa8dc Preliminary handling for overflowing light lists 10 years ago
scrawl acf9fc2d37 Enable per-frame light list updates (Bug #2638, Bug #2654)
The performance impact isn't so big anymore since the last commit.
10 years ago
scrawl 1d198a5592 Keep the light list StateSet cache for more than one frame 10 years ago
Marc Zinnschlag 8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 10 years ago
scrawl d7a4a9fd66 Create NIF root nodes as Group instead of Transform when possible 10 years ago
cc9cii 6b28955f31 Fix attempt to erase using a const_iterator. 10 years ago
scrawl b79ab1a3b8 Fix InverseWorldMatrix bug introduced by last commit 10 years ago
scrawl ec25f1da95 Fix ParticleSystem bug introduced by last commit 10 years ago
scrawl ad46ff7a98 Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform 10 years ago
cc9cii 36aa4aa9bd If a removed 'content=' item has comments, keep them in config file for later use. 10 years ago
scrawl ab597f672e State the filename in NIF loader warning messages 10 years ago
scrawl 6a788c3462 Minor cleanup 10 years ago
scrawl a5b72a358b Prune empty nodes in RemoveDrawableVisitor
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
10 years ago
scrawl 9e049894e8 Reduce the number of StateSets created for NIF scene graphs
The Material state is now set on the NiTriShape's node rather than the Geode, thus merged with other state like NiTexturingProperties, etc that are typically attached to the NiTriShape.

Effectively cuts in half the number of StatSets for a NIF file, resulting in big speedup (~10%) in the Cull and Draw phases.
10 years ago
scrawl b204396b57 Minor fix 10 years ago
scrawl 98571148b0 Remove custom license for terrain code
Now that it's no longer a stand-alone component, there's not much point in custom licensing it.
10 years ago
scrawl cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
10 years ago
Marc Zinnschlag e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 10 years ago
cc9cii c22c9c271d Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535.
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
10 years ago
scrawl 28caeadef4 Improve error message for not found records 10 years ago
scrawl de98d991b4 Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
Breaks the saving of content= entry order.

This reverts commit 15fe5d88e2.

Conflicts:
	components/config/gamesettings.cpp
10 years ago
scrawl c54a225467 Revert "Allow space characters in front of comments."
This reverts commit 4902c66792.
10 years ago
scrawl 3bfe167bc0 Revert "Fix loop where there was a potential for double entry."
This reverts commit a439f49c4d.
10 years ago
scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cc9cii b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 10 years ago
scrawl 89c2a7e26b Fix for possibly missing library on windows 10 years ago
scrawl e13a938896 Add support to build with Qt5 (Task #2665)
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
scrawl c04f6cf167 Remove unused code 10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 10 years ago
scrawl 712cef36b0 Minor cleanup 10 years ago
scrawl cdc47fa874 Remove BulletNifLoader dependency on keyframe manager
This will make threaded loading easier.
10 years ago
scrawl 8d6620b074 Assign an initial bounding box to particle systems 10 years ago
scrawl b5099324d1 Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec 10 years ago
scrawl a1e74a35a2 Revert "Use the WorkQueue to update skinning"
This reverts commit d52d0d9640.

Moving to branch
10 years ago
scrawl 9c86d4f8bc Race condition fix 10 years ago
scrawl 35b2d91fb3 Throw error when failing to create graphics context 10 years ago
scrawl d52d0d9640 Use the WorkQueue to update skinning 10 years ago
scrawl cc71e894e1 Add WorkQueue class 10 years ago
cc9cii 8e8da724f5 Remove unnecessary comment entry in the config file. 10 years ago
scrawl c621d0400c Fix error handling for out-of-range NIF roots (found in Bosmora, TR) 10 years ago
scrawl db16cdad02 Add a comment 10 years ago
scrawl 5921e70625 Build a kdtree for terrain geometry
Improves intersection testing performance, shaving off ~2ms of frame time in exteriors.

Also increases terrain loading time by ~1ms per cell, so will have to look into background loading soon.
10 years ago
scrawl 93ee11c5e7 Fix particlesystem nested RenderBin issue (Bug #2631) 10 years ago
scrawl fc8e5dde3b Fix crash when OSG_STEREO is enabled 10 years ago
scrawl 347c9b57b8 Copy constructor signature fix 10 years ago
scrawl 10457c1b28 Include fix 10 years ago
scrawl 5edf457ab7 Build fix 10 years ago
scrawl 9c9b83f8e2 Changes to compile with osg-svn 3.3.8 10 years ago
scrawl ab626ca7b9 Improve MyGUI widget creation performance 10 years ago
scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
10 years ago
scrawl 0a411cbd7c Enable particle lighting 10 years ago
scrawl 68e322f969 Restore data directory verbose output that got lost 10 years ago
cc9cii a439f49c4d Fix loop where there was a potential for double entry. 10 years ago
cc9cii 4902c66792 Allow space characters in front of comments. 10 years ago
cc9cii 15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535.
- controlled via a checkbox in launcher settings
10 years ago
scrawl 0afc03b6b7 Build fix 10 years ago
scrawl d8d43f94b9 Fix a typo 10 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 10 years ago
scrawl 231b217664 Build fix for MyGUI 3.2.1 10 years ago
scrawl e046119487 Fix for unnecessary terrain texture coordinate arrays 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl b70383d127 Remove last remains of Ogre math 10 years ago