teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
16,771 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2311969f05'
${ noResults }
Commit Graph

3024 Commits (2311969f05f648e94182caf0e8cca98492ef9811)

Author SHA1 Message Date
scrawl d7c7bb850b ToggleAI cleanup 9 years ago
scrawl d986b1a48b Add comment 9 years ago
scrawl 1abb77f8a1 Cleanup 9 years ago
scrawl 9f03982e0b Use a dedicated VBO for RigGeometry's vertices and normals 
The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries.

The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.
 9 years ago
scrawl 50b8260a39 Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d 9 years ago
scrawl aae43dbff5 Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW 9 years ago
scrawl 4eb090a8d0 Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW 9 years ago
scrawl 174dd82894 Manually apply the osg::Light state 
Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).
 9 years ago
scrawl 58e0e8bd4e Enable vertex buffer objects in RigGeometry 9 years ago
scrawl 0dbf44b414 Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency 9 years ago
scrawl 3f08cbff71 Share the state attributes for terrain techniques 
Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
 9 years ago
scrawl 84b8da7a09 Share the osg::Material on drawables 
Reduces the number of GL calls / frame by ~4%.
 9 years ago
scrawl abcfe9bcee Don't add empty text key objects 9 years ago
scrawl 02d23564dc Include cleanup 9 years ago
scrawl f898bf493f Don't use Geodes 9 years ago
scrawl 137dde7cf8 Include cleanup 9 years ago
scrawl 121bdd3e39 Update comment 9 years ago
scrawl 3e6cf17665 Warn about cellrefs with an empty refId (Bug #3238) 9 years ago
scrawl 0df975a4d7 Properly detach nodes in CopyRigVisitor (Fixes #3234) 9 years ago
scrawl 82b792f808 Eliminate dynamic_cast in BillboardCallback 9 years ago
scrawl 2eaf96e3bf Make ResourceManager destructor virtual 9 years ago
scrawl dd2fbfc0a2 Fix windows build 9 years ago
scrawl 3d6323f13a Force-enable hasWater() for exterior cells (Fixes #3222) 9 years ago
scrawl 563807ee53 Share the StateSet used to invert front face 9 years ago
scrawl 6e7c6fdd7e Implement NiTexturingProperty::DecalTexture 9 years ago
scrawl 30d06bfe0e Add comment 9 years ago
scrawl 64636bd85a Improve error reporting 9 years ago
scrawl 2821f46a18 Corpse clearing fix 9 years ago
scrawl 8791063110 Fix "RigGeometry rendering with no skeleton" warnings in rare cases 9 years ago
scrawl 1e5b4bea0a Don't create an unnecessary osg::Group when copying over a rig 9 years ago
scrawl 27577ce765 Add ESM::Land::DEFAULT_HEIGHT 9 years ago
Marc Zinnschlag ebaeabc962 Merge remote-tracking branch 'scrawl/respawn' 9 years ago
scrawl 3a2dccad4b Implement 'Show' script instruction 9 years ago
scrawl c3ef387208 Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467) 9 years ago
scrawl f99cd15f00 Vanilla-compatible activate / onActivate (Fixes #1629) 
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
 9 years ago
scrawl 195c3b9967 Merge pull request #904 from sandstranger/disable_opengles_anddroid 
disable opengl es for Android by default
 9 years ago
scrawl cdccf03228 Fix mismatched delete 9 years ago
sandstranger a7b78b37f5 disable opengles for Android by default 9 years ago
scrawl 5f4ace1bc2 Implement support for sphere map NiTextureEffects (Fixes #1827) 9 years ago
scrawl 062410bd8c Don't incorrectly remove TexEnv state 9 years ago
scrawl 90a99991d1 Use empty() instead of !size() 9 years ago
scrawl 8bd16e4d5a Don't compute the world matrix multiple times 9 years ago
scrawl 055d35a2b0 Revert "Warn about particle emitters that have multiple parent node paths" 
Not working correctly because osg won't ignore camera nodes.

This reverts commit 1667c807be.
 9 years ago
scrawl 1667c807be Warn about particle emitters that have multiple parent node paths 9 years ago
Marc Zinnschlag f9f91d5386 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl cee608e31b Make it work with appveyor's outdated OSG build 9 years ago
scrawl 8e826eefe6 Add missing initialization 9 years ago
scrawl e25e0a0600 ShaderVisitor: assume the first texture unit is the diffuseMap 9 years ago
scrawl e7682e04ae Cleanup 9 years ago
scrawl cdefee3e64 Add call to MultiObjectCache::releaseGLObjects 9 years ago
scrawl 4ca6e91292 Fix in-code default settings so that we don't attempt to use shaders in OpenCS 9 years ago
scrawl 8f81df2bd3 Cleanup 9 years ago
scrawl 0db7163363 Add specular mapping for terrain 9 years ago
scrawl 171e293641 ShaderManager: insert #line directives when including files 9 years ago
scrawl f01e8a6950 Add specular mapping for objects 9 years ago
scrawl 5cf2441b10 ShaderVisitor: support automatic recognition of normal maps based on file pattern 
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
 9 years ago
scrawl 6a0ac824bd Fix terrain error in OpenCS 9 years ago
scrawl 7071d286e8 Fix inverted check for 16-bit indices 9 years ago
scrawl 4e5462bc19 Don't attempt to create a collision shape for an empty TriShape 9 years ago
scrawl ca0e1fe0e0 Set the osg::Material on the terrain root node 9 years ago
scrawl 6000e48bba Add terrain shaders and normal map support 
Textures with _n filename suffix are automatically recognized as terrain normal maps.
 9 years ago
scrawl 5e12a1b4ef Add enchanted item glow to the shader 9 years ago
scrawl 268594dcf1 Recreate shader in NpcAnimation::setAlpha 9 years ago
scrawl a73512afb7 Add shader settings to settings.cfg 9 years ago
scrawl 21c4dffed2 Add #include support in shaders 9 years ago
scrawl 22cc5c0965 Cache the Program 9 years ago
scrawl 456816f707 Use diffuse.a / vertex.a, use material emission 9 years ago
scrawl 3e854a84a2 Slightly more efficient applying of light state 9 years ago
scrawl f93b7ec943 Fix light state issue 
GLSL does not respect gl_Disable(GL_LIGHTX), so we have to set unused lights to zero.

Sadly, this change makes the applying of the modelView matrix less efficient. So far I couldn't find a better solution, osg's state tracker keeps getting in the way. :(
 9 years ago
scrawl 9376811213 Vertex lighting shader 9 years ago
scrawl a9ad1b09e2 Introduce ShaderManager & ShaderVisitor 
Actual shaders still to be written.
 9 years ago
scrawl e647ee5424 Support RGB and RGBA embedded textures in NIF files (Fixes #2295) 9 years ago
scrawl a9ac108382 Fully read NiPixelData 9 years ago
scrawl 606758d72f NifLoader: create the BumpTexture slot, but don't use it yet 9 years ago
scrawl 4cd4131da9 NifLoader: assign a name to created textures 
This name will tell the shader visitor how to handle that texture.
 9 years ago
scrawl 50e92c8136 NifLoader: move texture property handling to a separate function 9 years ago
scrawl acf44fd9e5 NifLoader: handleTextureControllers outside of the NumTextures loop 9 years ago
scrawl e05d975020 Change the way that texture filtering settings are applied at runtime 9 years ago
scrawl a94029267f Fix an inverted condition (Bug #3209) 9 years ago
scrawl c4d38bb42d Fix clang analyzer warnings 9 years ago
scrawl ed57293e54 Allow '^' escape characters in books 
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
 9 years ago
scrawl 9eb96b9cb6 Parse the bullet version in FindBullet.cmake 9 years ago
scrawl 83a9a164bc Raise the required bullet version to 2.83 
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587).
 9 years ago
Marc Zinnschlag 28e3fe837f Merge remote-tracking branch 'scrawl/osg_34' 9 years ago
scrawl eaf3f5a829 Remove unused arguments 9 years ago
scrawl 6fc6913424 Do not set the cursor when creating it 9 years ago
scrawl 5824619a95 Clean up includes 9 years ago
scrawl 8b596dfcbe Remove support for OSG 3.2 
Since commit e8662bea31, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
 9 years ago
scrawl be6ea3d607 Account for UV coordinate flip in UVController (Fixes #3203) 9 years ago
Marc Zinnschlag da6dcfc49e Merge remote-tracking branch 'scrawl/resource' 9 years ago
scrawl 5e876b1379 Add missing include 9 years ago
scrawl 98c5e072f2 Swap the terrain cache update order to make more sense 9 years ago
scrawl 9f729667fb Remove debug output 9 years ago
scrawl 0865cea211 Preload terrain 9 years ago
scrawl 98848c752a Make getLayerInfo thread safe 9 years ago
scrawl 8aba74e6ee Remove GridElement 9 years ago
scrawl 596fe56bfd Make Land::loadData thread safe 9 years ago
scrawl afe533e670 Accept a const Object in UnrefQueue 9 years ago
scrawl 246566cef4 Preload instances in BulletShapeManager 9 years ago
scrawl e28dc3e72f Preload instances in SceneManager 9 years ago
scrawl 2e62298bd3 Clean up ObjectCache includes 9 years ago
scrawl 40a6e05e17 Use a deque instead of vector in UnrefQueue 9 years ago
scrawl d11c2864df Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread 9 years ago
scrawl 84f01b7527 Remove unneeded forward declaration 9 years ago
scrawl b2019d31c7 Mark thread safe methods in BsaFile 9 years ago
scrawl e4e313fe12 Remove outdated comment 9 years ago
scrawl c8054424c9 Preload items equipped by NPCs 9 years ago
scrawl a81b10b415 Make the cache expiryDelay configurable 9 years ago
scrawl 41233fc8e5 Keep a reference to the original scene template for as long as the instance is used 9 years ago
scrawl 778bce3ae9 Remove unused ObjectCache functions 9 years ago
scrawl 49ecac4ced Add a mutex lock around the SharedStateManager 9 years ago
scrawl c3ad4dad75 Fix applying of filter settings on terrain textures 9 years ago
scrawl 8b981ab507 Crash fix 9 years ago
scrawl c155680d3c Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache 9 years ago
scrawl d855a13b44 Clear the resource cache from the worker thread 9 years ago
scrawl 6f9ca0f68f Add basic cell preloader class 
Not properly in use yet, but seems to be working.
 9 years ago
scrawl e055ae094a Improve const-correctness in BulletShapeManager 
Sadly, two const_cast's are needed to work around Bullet API quirks.
 9 years ago
scrawl b7e69cbc64 Refactor WorkQueue, merge WorkTicket and WorkItem 
Allow the caller to hold on to the WorkItem. This makes it possible for a derived WorkItem to store the result of the work within the WorkItem itself.
 9 years ago
scrawl df57d4bfba Use a common base class for resource managers 
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
 9 years ago
scrawl e02f35264f Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag (Fixes #3183) 9 years ago
scrawl ea1efaac0c Use the osgDB::ObjectCache in SceneManager, cleanup 9 years ago
scrawl 909c4d96b6 Use the osgDB::ObjectCache in BulletShapeManager 9 years ago
scrawl 6c1c653cba Use the osgDB::ObjectCache in ImageManager 
Should be thread safe now.
 9 years ago
scrawl 9e5225bb6f Do not unref a Texture's image data after applying it 9 years ago
scrawl 9e53e12c70 More renaming of TextureManager -> ImageManager 9 years ago
scrawl 5ee3d1698f Remove getWarningTexture in favor of getWarningImage 9 years ago
scrawl f99f403dda Rename TextureManager to ImageManager 9 years ago
scrawl 6ef848b7c5 Remove TextureManager::getTexture2D 
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.

This is closer to what the OSG serializer does.

Streamlines the TextureManager and will make it easier to multithread.
 9 years ago
scrawl fbd4ad9b0c Flip terrain textures 9 years ago
scrawl 71401aafe7 Handle multipass techniques in SetFilterSettingsVisitor 9 years ago
scrawl 31988ca4cc Add a dont_override_filter description for textures that should be left alone 9 years ago
scrawl e8662bea31 Change the way that image origin is converted to OpenGL's lower-left convention 
Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
 9 years ago
scrawl 6ac688c0e2 Change the way that texture filtering setting changes are applied at runtime to not require keeping a reference to textures 
The references would be difficult to clean up because there may or may not be another reference to the texture in the osgDB::SharedStateManager.
 9 years ago
scrawl e2ee1d5689 Use separate textures for the MyGUI RenderManager 
This means we can more reliably set the filter parameters.

I believe this commit creates a regression where non-DDS GUI textures would display upside down, which will be addressed by further refactoring in the next commits.
 9 years ago
scrawl 5b972ee777 Move texture filtering settings to SceneManager 
Practical benefits:

- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
 9 years ago
scrawl b06730ac61 Fix terrain textureCompileDummy 9 years ago
scrawl 2eda495f89 Build fix for OSG 3.2 9 years ago
scrawl 06ed20abf8 Use the initial pose of a MorphGeometry for object placement (Fixes #3136) 9 years ago
scrawl 8360cccce7 Don't clone Drawable UpdateCallbacks twice 
The Drawable copy constructor takes care of that already.
 9 years ago
scrawl 6b48acaf0e Don't optimize TriShapes with controllers (Fixes #3143) 9 years ago
scrawl d9290b0ee0 Array fix 9 years ago
scrawl aec8c38461 Move observer_ptr include where it belongs 9 years ago
scrawl 48f53e23bf Allow alternate mesh formats for marker_error 9 years ago
Tobias Kortkamp 0659687bfb Some fixes for building on FreeBSD 9 years ago
scrawl f0971ee8ad Implement Fixme script instruction 9 years ago
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 9 years ago
scrawl 62fe47b144 Load default terrain if there is none defined 9 years ago
scrawl 458a305bff OpenCS: add lighting mask 9 years ago
scrawl e1c7165bfb Fix bounds calculation for addLight to a transform node 9 years ago
scrawl 93cc08a09c Lighting fix for LightListCallbacks attached to a Transform node 9 years ago