Commit Graph

3720 Commits (experimental)

Author SHA1 Message Date
scrawl 45d9e38616 Fix check for default material 8 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
Allofich e095817ac2 Treat =< and => as == in scripts
(Fixes #3744)
8 years ago
Allofich ff3e307059 Pass parameters by const reference 8 years ago
David Cernat f2e8e14665 [General] Add shouldSend boolean to mwmp::Attack 8 years ago
David Cernat cc2250815d [General] Add packet data for attacks on and by Actors 8 years ago
David Cernat b1a394cd02 [General] Change chars into bools in mwmp::Attack for clarity 8 years ago
David Cernat a650683bae [General] Add and use Target struct in mwmp::Attack 8 years ago
David Cernat 9882ceedf3 [General] Remove attackerGuid from mwmp::Attack because it is redundant 8 years ago
David Cernat caf5428532 [General] Rename mwmp::Attack vars in preparation for Actor support 8 years ago
David Cernat 2397afc6ce [General] Move mwmp::Attack to BaseStructs 8 years ago
David Cernat 9f226253d4 [General] Rename mwmp::Attack's refid into refId for consistency 8 years ago
David Cernat f0f0b2dcc9 [General] Send and read ActorSpeech packets 8 years ago
David Cernat 1fb11dafef [General] Send and read ActorStatsDynamic packets 8 years ago
David Cernat 00aa8839d4 [General] Update CMakeLists in components folder 8 years ago
David Cernat 870886192b [General] Rename DYNAMICSTATS into STATS_DYNAMIC 8 years ago
David Cernat ca8fd1aa72 [General] Remove ActorHeadRotation packet because it would be too spammy 8 years ago
David Cernat 2872675f5e [General] Send and read ActorAnimPlay packets 8 years ago
David Cernat bf17464074 Merge pull request #198 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
8 years ago
scrawl 8f71b65d38 sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly 8 years ago
David Cernat e7960eee76 [General] Rename DrawState packets into AnimFlags ones for clarity 8 years ago
David Cernat d2fe777f89 [General] Send and read ActorDrawState packets 8 years ago
David Cernat 10ad5b2a99 [General] Remove BaseActor's AnimStates that are no longer needed 8 years ago
David Cernat 0d196af685 [General] Add placeholders for 7 new ActorPackets 8 years ago
David Cernat 7700b82952 [General] Clean up BaseEvent and BaseStructs 8 years ago
David Cernat 7662297334 [General] Use ESM::Position to store BaseActor's movement 8 years ago
David Cernat 742d6f653a [General] Add ActorPosition packet 8 years ago
David Cernat b6c3830ea0 [General] Rename WorldObject's pos into position for consistency 8 years ago
David Cernat 174f316787 [General] Rename PacketActorFrame into PacketActorTest 8 years ago
David Cernat a5d0486c82 [General] Set actor data correctly 8 years ago
David Cernat b9d68c0ab2 Merge pull request #195 from OpenMW/master
Add OpenMW commits up to 10 Apr 2017
8 years ago
MiroslavR c962b6dd6d Fix correctActorModelPath to work properly when both backward and forward slashes are used in the path (Fixes #3822) 8 years ago
David Cernat c52084a028 [General] Use BaseActorLists in ActorPackets 8 years ago
David Cernat 4f3d05eed2 [General] Add ActorList class 8 years ago
David Cernat 070c6a3bd4 [General] Add ActorPacketController & make controller var names clearer 8 years ago
David Cernat b8ca2382c7 [General] Remove variables that are not going to be used in ActorFrame 8 years ago
David Cernat d3f3fb5d05 [Client] Correctly implement movement animation sync for NPCs 8 years ago
David Cernat d829d219c3 [General] Add (very) partial animation sync for NPCs 8 years ago
David Cernat 67ec81ad0c [Client] Use utility function for converting strings in mwmp::Cell 8 years ago
David Cernat d24cde16dd [General] Add simple BaseActor and LocalActor classes 8 years ago
David Cernat 8f18dc87c4 [General] Model ActorList on Container more closely by including action 8 years ago
David Cernat 8c2469bf6d [General] Add placeholder ActorList, ActorAuthority & ActorFrame packets 8 years ago
David Cernat 2bd81c3de0 [Client] Use mpNum for every WorldObject 8 years ago
David Cernat ddedcac510 [General] Read and write mpNums in world packets 8 years ago
David Cernat 8cc61b6048 [General] Generate mpNums on the server when forwarding ID_OBJECT_PLACE 8 years ago
David Cernat 06acd3cbc4 [Client] Add a multiplayer object index and matching methods to CellRef 8 years ago
David Cernat 106c9edead Merge pull request #192 from OpenMW/master
Add OpenMW commits up to 3 Apr 2017
8 years ago
MiroslavR 395e97cf40 Remove evil "implicit GetJournalIndex" hack from expression parser 8 years ago
Koncord 1d2a6d9056 [Server] Rename dontRead to avoidReading 8 years ago
Koncord 4daf471874 [General] Add dontRead flag 8 years ago
David Cernat dff52d8fbe Merge pull request #191 from OpenMW/master
Add OpenMW commits up to 31 Mar 2017
8 years ago
Koncord 48a59cf9e9 [General] Add new class BasePacketProcessor 8 years ago
Allofich 3780d94214 Cast LAND_SIZE to integer to avoid linking error 8 years ago
Allofich 2a505b427d Remove second LAND_SIZE definition 8 years ago
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master
Add OpenMW commits up to 24 Mar 2017
8 years ago
scrawl f676b62711 Remove unused variable 8 years ago
David Cernat ab92b9f795 Merge pull request #187 from OpenMW/master
Add OpenMW commits up to 20 Mar 2017
8 years ago
scrawl c992cb6e82 Fix texture not being applied on rendering the composite map (Fixes #3791) 8 years ago
MiroslavR 06dc94552f Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing 8 years ago
David Cernat 5eb183bacf Merge pull request #186 from OpenMW/master
Add OpenMW commits up to 15 Mar 2017
8 years ago
scrawl a070551af3 Attempt to fix naming conflict on windows 8 years ago
scrawl 3d58ba7301 Fix boolean test 8 years ago
David Cernat 60037e4081 Merge pull request #185 from OpenMW/master
Add OpenMW commits up to 14 Mar 2017
8 years ago
scrawl fd215caa02 Add local LandCache to cut down on store searches 8 years ago
scrawl 088d5604bf Use a shader if required to display the composite map
Fixes composited terrain not respecting the 'clamp lighting' setting.
8 years ago
scrawl 7f5beb3172 Remove unused includes 8 years ago
scrawl 5044816770 Remove unused code 8 years ago
scrawl b66c2abfe3 Build the bounding sphere in the loading thread (only relevant for TerrainGrid) 8 years ago
scrawl 9e9c028f1d Skip light collection for far away terrain 8 years ago
scrawl 0782839a42 Avoid redundant culling tests on the transform/drawable 8 years ago
scrawl fb8ac06524 Reduce the minSize of quad tree nodes for better performance 8 years ago
scrawl a041546b54 Use the quad tree's minSize in the LodCallback 8 years ago
scrawl e4e8821902 Refactor update of lodFlags 8 years ago
scrawl 2aa09639a9 Re-enable terrain intersections 8 years ago
scrawl db00d47ca2 Hold a ref to the intersection visitor's view if possible 8 years ago
scrawl 11bee6ee35 Avoid compiling composite maps that are no longer referenced 8 years ago
scrawl 9eed7fa6f5 Fix composite map when force shaders is enabled 8 years ago
scrawl d055dc25bf Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell 8 years ago
scrawl 7d50b6c2e2 Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps 8 years ago
scrawl 6ccb6009ee Use the View-based preloading for TerrainGrid as well 8 years ago
scrawl 3c29e2dbeb Refactor ownership of terrain views 8 years ago
scrawl 28fd492711 Don't use terrain LOD for the map camera 8 years ago
scrawl e7a0878c10 Add CompositeMapRenderer info to the stats panel 8 years ago
scrawl c921620ef3 Compile the drawables of a composite map one by one to avoid frame drops for larger maps 8 years ago
scrawl 47ca8aeee5 Use the time elapsed instead of # compiled as limit 8 years ago
scrawl 8a6d909b22 Fix composite map being compiled twice 8 years ago
scrawl 683e625c6c Rewrite CompositeMapRenderer to be based on Drawable and share the FBO 8 years ago
scrawl 4baa795152 Add preloading implementation to QuadTreeWorld 8 years ago
scrawl 9db71e3f62 Recompute the LOD stitching when the view changes 8 years ago
scrawl ef704db877 Fix reset of changed flag 8 years ago
scrawl 1c15686353 Remove non required use of WorkQueue 8 years ago
scrawl 433900fca5 Fix waiting on initial quad tree build 8 years ago
scrawl 4dbd224249 Hide the terrain in non-exterior cells 8 years ago
scrawl 2580de11a4 Refactor ownership of ViewDataMap 8 years ago
scrawl 5a3c645c89 Enable lazy compiling of composite maps 8 years ago
scrawl 99e18f0d68 Clear the ViewData on exit 8 years ago
scrawl bb991850da Add LOD stitches 8 years ago
scrawl 6bd286d924 Fix unnecessary resizing in ViewData 8 years ago
scrawl 8c151364df Add special handling for CullVisitor to QuadTreeWorld.
- Cull only against bounding box, not bounding sphere, as this appears to perform better.
- Also traverse into non visible nodes to compute their LOD, this is to avoid nodes having to be loaded in when the player turns the view around, and will avoid unnecessary refs/unrefs of rendering data in the View. This should probably be turned off at some point for static cameras, such as the local maps.
8 years ago
scrawl f19a88be9d Reject QuadTreeNodes with invalid bounds 8 years ago
scrawl 7d004bf757 Preliminary rendering of QuadTreeWorld 8 years ago
scrawl e36bdb490e Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection 8 years ago
scrawl 0efc54c749 Subdivide the composite maps 8 years ago
scrawl 0756fc4ae6 Optimize getBlendmaps for the general case that most points are within the given cell 8 years ago
scrawl 81c9853fe9 Fix handling in getBlendmaps when the chunk is >1 ESM::Cell 8 years ago
scrawl b384087e28 Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell 8 years ago
scrawl 819860081f Remove custom bounding box 8 years ago
scrawl ce8c4ad4f5 Add quad tree implementation (no rendering yet) 8 years ago
scrawl 14225a42c6 Remove unused pointer to IncrementalCompileOperation 8 years ago
scrawl c487df0abb Move updateTextureFiltering and material into the base class 8 years ago
scrawl 5eff286c71 Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps. 8 years ago
scrawl 7e4450da55 Change the renderOrder of composite maps to ensure they are updated before water reflections or other cameras that may be using it. 8 years ago
scrawl b1d4bb5708 Add CompositeMapRenderer
Temporarily render all terrain using composite maps for testing purposes
8 years ago
scrawl e323b2fa7b Use the SceneManager's ShaderManager 8 years ago
scrawl 0fc465da59 Store the min/max height in LandData 8 years ago
scrawl 051c17a184 Make reportStats const 8 years ago
scrawl 80a0398f9d Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads 8 years ago
scrawl 20d30bb8d7 Move mDataLoaded into LandData 8 years ago
scrawl 16b5cadd9e Fix order of operations w.r.t clearing cache 8 years ago
scrawl 2c68ed4fb4 Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread 8 years ago
scrawl 35d53acc65 Factor out terrain chunk loading/caching into a new resource manager 8 years ago
scrawl 274690f790 Refactor BufferCache to allow caching buffers of different sizes 8 years ago
scrawl 9a3a64f0c4 Add resource manager for ESM::Land to allow data to be unloaded when no longer required 8 years ago
scrawl 804f873649 terrain: factor out texture caching into a separate class 8 years ago
scrawl 4cd4457d21 Add support for Functors to ObjectCache 8 years ago
scrawl 9d72d9f0c9 Change order of operations in SceneManager::updateCache to allow deleting of StateSets that just got unreferenced by the scene 8 years ago
scrawl eef63a880a terrain: use a custom drawable for multi-pass render instead of osgFX::Effect
osgFX::Effect is awkward to use because of the lazy-definition of passes, no support for compileGLObjects, useless 'Technique' abstraction and having to define silly methods like 'effectAuthor()'

Handling the multi-pass rendering inside the Drawable also avoids redundant culling tests against the same bounding box for each pass.
8 years ago
scrawl 34130fc5cc Fix handling in LightListCallback when the node is not a Group 8 years ago
scrawl b78a9f89af Refactor LightListCallback to allow for integration in custom Drawables. 8 years ago
scrawl c1fe9f2a89 Avoid warping the mouse cursor more than necessary
Apparently, the SDL_WarpMouseInWindow can be very expensive (anywhere from 0.1-5ms) due to XSync() in the implementation.

This was causing no-grab=1 configurations to suffer from terrible stuttering when turning the view.
8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
scrawl 928e2061f7 Remove redundant tolower 8 years ago
scrawl 13a6070629 Remove warning spam in skeleton.cpp
If the root bone is missing, that is caused by all bones being missing which will have been logged already.
8 years ago
Koncord 3d294500ba [General] Use std::replace() instead for-each in Utils::convertPath() 8 years ago
scrawl 21aad00612 Don't pass key events to the viewer when Alt modifier is held
Fixes the stats panel briefly showing up when using 'Alt+F4' to exit.
8 years ago
scrawl fc95a45cb6 Don't pass repeat key events to the viewer's eventQueue 8 years ago
Nikolay Kasyanov 7f429f26e1 Allow getting available version information even when clone is shallow 8 years ago
Koncord 435d9780a7 [General] Fix PacketPreInit 8 years ago
Koncord 690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions
Move Send and Read functions to BasePacket
8 years ago
Koncord 0c1905e842 [General] Add PreInit packet 8 years ago
Koncord 0d53a6916d [General] Move repeated code in Packet() to base class 8 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
8 years ago
scrawl c1b1d502ee Fix up commit 330e5fefd1 8 years ago
scrawl 4051018862 optimizer: fix FlattenStaticTransformsVisitor not respecting the is permissible callback 8 years ago
scrawl 5866f0f80b Add OPENMW_OPTIMIZE env variable to help debugging optimizer-related issues
Example:

OPENMW_OPTIMIZE=OFF
OPENMW_OPTIMIZE="~FLATTEN_STATIC_TRANSFORMS"
8 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
Koncord c353e18645 [General] Move Utils from server to components
Rewrite CRC32 functions to the Boost equivalent
8 years ago
David Cernat 0d32bf5943 [General] Add extra death debug, don't request data from player on death 8 years ago
David Cernat a2ef39c655 Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
8 years ago
scrawl 62cc091414 Fix incorrect setting of TexMat in terrain material 8 years ago
scrawl a759ef5d2e Leave the MyGUI::PixelFormat as Unknown when loading from file as its not required. 8 years ago
scrawl 8fc7942d64 Refactor osgMyGUI::OSGTexture to store width/height inside the object 8 years ago
David Cernat db8218545f Merge pull request #177 from OpenMW/master
Add OpenMW commits up to 1 Mar 2017
8 years ago
scrawl d8505e4f48 Fix a multithreading crash caused by modification of live Geometry 8 years ago
scrawl 4e0011bfc8 Improve NPC loading performance by caching the cleaned objectRoot 8 years ago
scrawl 058681ad73 ShaderVisitor: avoid reset of rig geometry when not required 8 years ago
David Cernat 5c269a5f8d [General] Rename ID_GAME_DIE and ID_GAME_RESURRECT 8 years ago
David Cernat 4aaa9ed694 [General] Update version to 0.5.2 8 years ago
David Cernat e6bc7ad463 [General] Make all flying players fly correctly, including TCL users 8 years ago
David Cernat 48125913c3 Merge pull request #175 from OpenMW/master
Add OpenMW commits up to 27 Feb 2017
8 years ago
scrawl 1402e0b872 Don't optimize billboard nodes (Fixes #3774) 8 years ago
David Cernat 4110fac629 Merge pull request #174 from OpenMW/master
Add OpenMW commits up to 26 Feb 2017, part 2
8 years ago
scrawl 706ac45c76 Fix missing particles caused by shallow copy of ParticleSystemController 8 years ago
scrawl 9b27ec4945 Remove redundant and ambiguous NiNode::makeBone()
Ambiguous because a skeleton can have multiple skinned meshes, with their own bone weights/bind matrix each.
8 years ago
scrawl aba3c471a9 nifloader: fix setting of dataVariance for non-controlled bones and refactor the code 8 years ago
David Cernat 5d30ba0abd Merge pull request #173 from OpenMW/master
Add OpenMW commits up to 26 Feb 2017
8 years ago
scrawl 5caf53b6a3 optimizer: avoid reordering nodes
Fixes an osgParticle cloning issue.

(Fixes #3773)
8 years ago
scrawl a95773beef Fix unnecessary copy of ParticleSystem in SceneUtil::CopyOp 8 years ago
scrawl 585524805f Add 'tri ' variant of part filters to optimizer ignore list 8 years ago
David Cernat 060e440ab2 [General] Update version to 0.5.1 8 years ago
David Cernat a94d1ed296 Merge pull request #169 from OpenMW/master
Add missing copy of callbacks when a Transform is replaced by Group
8 years ago
scrawl 48e0f098ff Add missing copy of callbacks when a Transform is replaced by Group
(Fixes #3770)
8 years ago
Koncord 715422aff6 [General] Fix memory leak in Log dtor 8 years ago
David Cernat 328e3b6618 Merge pull request #167 from OpenMW/master
Add OpenMW commits up to 24 Feb 2017
8 years ago
Koncord e3f4c63ea6 [General] Delete invalid & redundant code 8 years ago
scrawl 330e5fefd1 optimizer: consider a Group with more than one child redundant as well
While there could be some value in this hierarchy (i.e. improved culling), we don't know if this is being used sensibly; and using a 'flat' hierarchy helps other optimizations.
8 years ago
scrawl 75677f03e7 Remove SceneManager::notifyAttached 8 years ago
scrawl 3df7a8c4d8 Avoid FLATTEN_STATIC_TRANSFORMS optimization for non-Geometry drawables 8 years ago
scrawl e4c12e5e56 optimizer: don't merge Geometry that has transparency sorting enabled 8 years ago
scrawl ebfd845eae optimizer: run MERGE_GEOMETRY after removing redundant nodes 8 years ago
scrawl 43f31d6e54 optimizer: fix MERGE_GEOMETRY to work with Geometries not attached to a Geode 8 years ago
scrawl f2a323238f optimizer: merge groups as part of REMOVE_REDUNDANT_NODES 8 years ago
scrawl af716d4b61 optimizer: remove hardcoded condition in RemoveRedundantNodesVisitor 8 years ago
scrawl 698738c649 optimizer: use asXYZ() instead of dynamic_cast 8 years ago
scrawl f7cb4bd245 optimizer: remove some cruft 8 years ago
scrawl e33829d493 Add fork of osgUtil::Optimizer with backported fixes that have not been released yet
Remove optimizers that won't be used.
8 years ago
scrawl 5e2335f250 Use the osgUtil::Optimizer post loading in the SceneManager 8 years ago
scrawl 305cccd263 Don't print Geometry data (vertices, triangles, etc.) in showscenegraph 8 years ago
scrawl 4e5a1e6123 nifloader: improve setting of DataVariance 8 years ago
scrawl 1d6b5b2a52 Add StringUtils::CiComp operator 8 years ago
scrawl 6e996bf2a3 Create TriShapes with an identity transform as a Group 8 years ago
scrawl 6e5d9efa93 Remove NifLoader::optimize, to be replaced with something better 8 years ago
scrawl c231b06320 Remove boneOffset node after using it 8 years ago
scrawl d75a3fd0fb Add SharedStateManager to the stats panel 8 years ago
Koncord 059043fea9 [General] Change signature of BaseEvent::action 8 years ago
David Cernat 38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl 8f79fa3d72 Add resource statistics panel opened with F4 8 years ago
scrawl 3693f05ef5 Transform world-space particle systems in update callback so that animations are accounted for 8 years ago
scrawl c45013c983 Fix particle systems not being rendered in their first frame 8 years ago
David Cernat a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl 4aa40d16bc Increase the importance of light radius when sorting lights (Bug #2759) 8 years ago
scrawl 3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
8 years ago
Koncord 158e9b3b09 [Server] Add ability to set password to server from config & scripts 8 years ago
David Cernat 3e50cf60e7 [General] Update version to 0.5.0 8 years ago
David Cernat a4526605a6 [General] Remove goldValue from ContainerItem because it is never useful 8 years ago
David Cernat cdffbc05f7 Merge pull request #159 from OpenMW/master
Add OpenMW commits up to 19 Feb 2017
8 years ago
scrawl 3b24bb9a5e Use OS X cursor workaround for GL_VENDOR ATI and add an environment variable for control 8 years ago
David Cernat 4f2b88df8a [General] Remove owner var from ContainerItem because it is always empty 8 years ago
David Cernat d9a566f0f6 Merge pull request #156 from OpenMW/master
Add OpenMW commits up to 18 Feb 2017
8 years ago
scrawl aa8459b5c7 Revert "Remove redundant allocations for NIF meshes"
This reverts commit a7c5beb7c5.

Conflicts:
	components/nif/data.cpp
	components/nifbullet/bulletnifloader.cpp
	components/nifosg/nifloader.cpp
8 years ago
scrawl 6a37909ee7 Revert "Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580)"
This reverts commit 115e563a7a.
8 years ago
David Cernat 941d6269c1 [General] Slightly reorder variables in ID_OBJECT_PLACE 8 years ago
David Cernat 27c4015f50 [General] Remove unused packet placeholder ID_OBJECT_HEALTH 8 years ago
David Cernat c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
8 years ago
scrawl 57b585570a Preload magic effect visuals of the player's selected weapon/spell 8 years ago
David Cernat 3b604a432e [General] Restructure ID_CONTAINER to allow multiple containers at once 8 years ago
David Cernat c8cbfbef62 [General] Sketch out server requests to players for container data 8 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 8 years ago
scrawl e00b420f68 Move saving of LandData into Land::save 8 years ago
scrawl 325bf66653 Return const Land in ESMStore 8 years ago
David Cernat a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
8 years ago
Marc Zinnschlag 93c5630e02 Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents' 8 years ago
scrawl 892d1b162d nifloader: ignore nodes named 'bounding box' (Fixes #3650) 8 years ago
MAtahualpa b4ef9e2314 Update loadbook.cpp 8 years ago
MAtahualpa 5a58ab1837 Update loadbook.hpp 8 years ago
David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
8 years ago
scrawl bbcba57495 Disable hitAttemptActorId saving code for now 8 years ago
scrawl 2ea0db1d1a Merge pull request #1198 from Allofich/combat
Make combat engagement logic more like vanilla
8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl 67e4a7e37b Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead 8 years ago
scrawl d141b98f0c Add base animations to preloadCommonAssets 8 years ago
scrawl 839928e210 Fix light data being reset for the wrong light 8 years ago
scrawl a46593fa74 Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread 8 years ago
scrawl d3e1dbe920 Fix race conditions in terrain loader caused by static variables 8 years ago
scrawl 4d53ab6c32 nifloader: attempt to remove redundant root node when a Skeleton is added 8 years ago
scrawl 2a42c4781e nifloader: override animflags instead of accumulating them 8 years ago
scrawl 0187f2ce4c nifloader: combine animFlags and particleFlags (Bug #2100) 8 years ago
scrawl bccfd6cef8 nifloader: handle textures with no image that are later assigned in a FlipController
As found in vurt's trees (Bug #2100)
8 years ago
scrawl 792f505b2a Fix potential crash in ShaderVisitor for textures with no image assigned 8 years ago
scrawl 45ae8d5ffa Add support for GL_AMBIENT colorMode to shaders as required by particle systems 8 years ago
scrawl c00532d82d Add LightStateCache to avoid redundantly setting the same gl_Light
Normally, osg::State would do this for us (via lastAppliedAttribute), but since we're using a custom StateAttribute to apply all lights at once, we have to track ourselves.

Further reduction of GL calls in a typical scene by ~2%
8 years ago
scrawl 4d4dc1b9c1 Add specialized DisableLight state attribute for more efficient undoing of light state
Seems to reduce # of GL calls by 10-15% in a typical scene.
8 years ago
David Cernat 6144ca95d8 Set version to 0.4.2 8 years ago
David Cernat 5038353792 [General] Rename BaseEvent's state into doorState & adjust related funcs 8 years ago
David Cernat d8a9a5f6c9 [General] Send item owner in ID_CONTAINER 8 years ago
David Cernat 3614b21e10 [General] Send charge and goldValue in ID_CONTAINER 8 years ago
Allofich 5d2090684a Store mHitAttemptActorId in save files 8 years ago
David Cernat 182b238b5f [General] Rename WorldEvent into BaseEvent 8 years ago
David Cernat 75392297b5 [General] Use vector::at in most places 8 years ago