scrawl
50b8260a39
Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d
2016-03-11 18:21:55 +01:00
scrawl
aae43dbff5
Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:10:39 +01:00
scrawl
4eb090a8d0
Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:09:48 +01:00
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).
2016-03-11 15:43:20 +01:00
scrawl
58e0e8bd4e
Enable vertex buffer objects in RigGeometry
2016-03-11 01:39:09 +01:00
scrawl
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
2016-03-11 01:35:57 +01:00
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.
2016-03-11 01:08:53 +01:00
scrawl
84b8da7a09
Share the osg::Material on drawables
...
Reduces the number of GL calls / frame by ~4%.
2016-03-11 01:06:54 +01:00
scrawl
abcfe9bcee
Don't add empty text key objects
2016-03-10 17:01:14 +01:00
scrawl
02d23564dc
Include cleanup
2016-03-10 14:29:45 +01:00
scrawl
f898bf493f
Don't use Geodes
2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8
Include cleanup
2016-03-10 12:59:17 +01:00
scrawl
121bdd3e39
Update comment
2016-03-07 22:46:15 +01:00
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
2016-03-07 22:44:03 +01:00
scrawl
0df975a4d7
Properly detach nodes in CopyRigVisitor ( Fixes #3234 )
2016-03-06 11:33:07 +01:00
scrawl
82b792f808
Eliminate dynamic_cast in BillboardCallback
2016-03-05 20:02:33 +01:00
scrawl
2eaf96e3bf
Make ResourceManager destructor virtual
2016-03-02 21:58:11 +01:00
scrawl
dd2fbfc0a2
Fix windows build
2016-03-02 21:57:25 +01:00
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
2016-03-02 17:02:30 +01:00
scrawl
563807ee53
Share the StateSet used to invert front face
2016-03-02 13:33:44 +01:00
scrawl
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
2016-03-01 18:41:36 +01:00
scrawl
30d06bfe0e
Add comment
2016-03-01 17:27:54 +01:00
scrawl
64636bd85a
Improve error reporting
2016-03-01 17:05:02 +01:00
scrawl
2821f46a18
Corpse clearing fix
2016-03-01 11:31:08 +01:00
scrawl
8791063110
Fix "RigGeometry rendering with no skeleton" warnings in rare cases
2016-02-29 18:20:56 +01:00
scrawl
1e5b4bea0a
Don't create an unnecessary osg::Group when copying over a rig
2016-02-29 17:50:18 +01:00
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
2016-02-28 16:49:18 +01:00
Marc Zinnschlag
ebaeabc962
Merge remote-tracking branch 'scrawl/respawn'
2016-02-28 10:19:14 +01:00
scrawl
3a2dccad4b
Implement 'Show' script instruction
2016-02-27 13:40:53 +01:00
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
2016-02-27 12:53:07 +01:00
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
2016-02-26 13:08:35 +01:00
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
2016-02-25 21:39:25 +01:00
scrawl
cdccf03228
Fix mismatched delete
2016-02-25 21:32:42 +01:00
sandstranger
a7b78b37f5
disable opengles for Android by default
2016-02-25 22:39:18 +03:00
scrawl
5f4ace1bc2
Implement support for sphere map NiTextureEffects ( Fixes #1827 )
2016-02-24 21:06:41 +01:00
scrawl
062410bd8c
Don't incorrectly remove TexEnv state
2016-02-23 10:56:18 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a
Don't compute the world matrix multiple times
2016-02-22 18:58:19 +01:00
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
2016-02-22 18:10:25 +01:00
scrawl
1667c807be
Warn about particle emitters that have multiple parent node paths
2016-02-22 15:21:06 +01:00
Marc Zinnschlag
f9f91d5386
Merge remote-tracking branch 'origin/master'
2016-02-21 09:01:17 +01:00
scrawl
cee608e31b
Make it work with appveyor's outdated OSG build
2016-02-21 01:41:50 +01:00
scrawl
8e826eefe6
Add missing initialization
2016-02-21 01:26:45 +01:00
scrawl
e25e0a0600
ShaderVisitor: assume the first texture unit is the diffuseMap
2016-02-20 23:47:32 +01:00
scrawl
e7682e04ae
Cleanup
2016-02-20 22:09:41 +01:00
scrawl
cdefee3e64
Add call to MultiObjectCache::releaseGLObjects
2016-02-20 20:38:37 +01:00
scrawl
4ca6e91292
Fix in-code default settings so that we don't attempt to use shaders in OpenCS
2016-02-20 20:36:29 +01:00
scrawl
8f81df2bd3
Cleanup
2016-02-20 20:34:56 +01:00
scrawl
0db7163363
Add specular mapping for terrain
2016-02-20 19:55:08 +01:00
scrawl
171e293641
ShaderManager: insert #line directives when including files
2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950
Add specular mapping for objects
2016-02-20 19:55:08 +01:00
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'
2016-02-20 18:00:43 +01:00
scrawl
6a0ac824bd
Fix terrain error in OpenCS
2016-02-19 15:00:58 +01:00
scrawl
7071d286e8
Fix inverted check for 16-bit indices
2016-02-19 14:59:47 +01:00
scrawl
4e5462bc19
Don't attempt to create a collision shape for an empty TriShape
2016-02-19 14:23:55 +01:00
scrawl
ca0e1fe0e0
Set the osg::Material on the terrain root node
2016-02-19 01:45:28 +01:00
scrawl
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
2016-02-19 01:37:30 +01:00
scrawl
5e12a1b4ef
Add enchanted item glow to the shader
2016-02-18 23:05:44 +01:00
scrawl
268594dcf1
Recreate shader in NpcAnimation::setAlpha
2016-02-18 22:48:53 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
21c4dffed2
Add #include support in shaders
2016-02-18 19:37:58 +01:00
scrawl
22cc5c0965
Cache the Program
2016-02-18 19:37:58 +01:00
scrawl
456816f707
Use diffuse.a / vertex.a, use material emission
2016-02-18 19:37:58 +01:00
scrawl
3e854a84a2
Slightly more efficient applying of light state
2016-02-18 19:37:57 +01:00
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. :(
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
e647ee5424
Support RGB and RGBA embedded textures in NIF files ( Fixes #2295 )
2016-02-18 19:37:56 +01:00
scrawl
a9ac108382
Fully read NiPixelData
2016-02-18 19:37:56 +01:00
scrawl
606758d72f
NifLoader: create the BumpTexture slot, but don't use it yet
2016-02-18 19:37:56 +01:00
scrawl
4cd4131da9
NifLoader: assign a name to created textures
...
This name will tell the shader visitor how to handle that texture.
2016-02-18 19:37:56 +01:00
scrawl
50e92c8136
NifLoader: move texture property handling to a separate function
2016-02-18 19:37:56 +01:00
scrawl
acf44fd9e5
NifLoader: handleTextureControllers outside of the NumTextures loop
2016-02-18 19:37:55 +01:00
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
2016-02-18 19:37:55 +01:00
scrawl
a94029267f
Fix an inverted condition (Bug #3209 )
2016-02-18 01:25:52 +01:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
scrawl
ed57293e54
Allow '^' escape characters in books
...
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
2016-02-16 14:55:13 +01:00
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
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 ).
2016-02-15 00:33:17 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
6fc6913424
Do not set the cursor when creating it
2016-02-13 03:34:09 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
be6ea3d607
Account for UV coordinate flip in UVController ( Fixes #3203 )
2016-02-11 16:22:54 +01:00
Marc Zinnschlag
da6dcfc49e
Merge remote-tracking branch 'scrawl/resource'
2016-02-10 16:23:38 +01:00
scrawl
5e876b1379
Add missing include
2016-02-10 15:34:06 +01:00
scrawl
98c5e072f2
Swap the terrain cache update order to make more sense
2016-02-09 21:17:10 +01:00
scrawl
9f729667fb
Remove debug output
2016-02-09 21:16:11 +01:00
scrawl
0865cea211
Preload terrain
2016-02-09 21:16:11 +01:00
scrawl
98848c752a
Make getLayerInfo thread safe
2016-02-09 20:26:58 +01:00
scrawl
8aba74e6ee
Remove GridElement
2016-02-09 20:23:53 +01:00
scrawl
596fe56bfd
Make Land::loadData thread safe
2016-02-09 20:21:56 +01:00
scrawl
afe533e670
Accept a const Object in UnrefQueue
2016-02-09 19:00:30 +01:00
scrawl
246566cef4
Preload instances in BulletShapeManager
2016-02-09 18:48:49 +01:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00
scrawl
2e62298bd3
Clean up ObjectCache includes
2016-02-09 18:11:07 +01:00
scrawl
40a6e05e17
Use a deque instead of vector in UnrefQueue
2016-02-09 16:09:55 +01:00
scrawl
d11c2864df
Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread
2016-02-09 15:45:35 +01:00
scrawl
84f01b7527
Remove unneeded forward declaration
2016-02-08 16:27:28 +01:00
scrawl
b2019d31c7
Mark thread safe methods in BsaFile
2016-02-08 15:55:05 +01:00
scrawl
e4e313fe12
Remove outdated comment
2016-02-08 14:41:21 +01:00
scrawl
c8054424c9
Preload items equipped by NPCs
2016-02-07 22:37:52 +01:00
scrawl
a81b10b415
Make the cache expiryDelay configurable
2016-02-07 19:05:55 +01:00
scrawl
41233fc8e5
Keep a reference to the original scene template for as long as the instance is used
2016-02-07 18:56:21 +01:00
scrawl
778bce3ae9
Remove unused ObjectCache functions
2016-02-07 18:27:12 +01:00
scrawl
49ecac4ced
Add a mutex lock around the SharedStateManager
2016-02-07 07:37:35 -08:00
scrawl
c3ad4dad75
Fix applying of filter settings on terrain textures
2016-02-07 05:53:56 -08:00
scrawl
8b981ab507
Crash fix
2016-02-07 05:53:42 -08:00
scrawl
c155680d3c
Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache
2016-02-07 00:43:37 +01:00
scrawl
d855a13b44
Clear the resource cache from the worker thread
2016-02-07 00:36:31 +01:00
scrawl
6f9ca0f68f
Add basic cell preloader class
...
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
e055ae094a
Improve const-correctness in BulletShapeManager
...
Sadly, two const_cast's are needed to work around Bullet API quirks.
2016-02-07 00:14:13 +01:00
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.
2016-02-06 22:42:45 +01:00
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.
2016-02-06 17:22:17 +01:00
scrawl
e02f35264f
Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag ( Fixes #3183 )
2016-02-06 15:08:12 +01:00
scrawl
ea1efaac0c
Use the osgDB::ObjectCache in SceneManager, cleanup
2016-02-06 00:15:12 +01:00
scrawl
909c4d96b6
Use the osgDB::ObjectCache in BulletShapeManager
2016-02-05 23:59:37 +01:00
scrawl
6c1c653cba
Use the osgDB::ObjectCache in ImageManager
...
Should be thread safe now.
2016-02-05 23:31:59 +01:00
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
2016-02-05 23:21:54 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f
Remove getWarningTexture in favor of getWarningImage
2016-02-05 23:05:43 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
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.
2016-02-05 23:01:11 +01:00
scrawl
fbd4ad9b0c
Flip terrain textures
2016-02-05 22:46:15 +01:00
scrawl
71401aafe7
Handle multipass techniques in SetFilterSettingsVisitor
2016-02-05 21:08:32 +01:00
scrawl
31988ca4cc
Add a dont_override_filter description for textures that should be left alone
2016-02-05 21:07:08 +01:00
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.
2016-02-05 21:03:11 +01:00
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.
2016-02-05 21:03:11 +01:00
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.
2016-02-05 21:03:10 +01:00
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.
2016-02-05 21:03:10 +01:00
scrawl
b06730ac61
Fix terrain textureCompileDummy
2016-02-05 21:02:16 +01:00
scrawl
2eda495f89
Build fix for OSG 3.2
2016-02-03 19:05:15 +01:00
scrawl
06ed20abf8
Use the initial pose of a MorphGeometry for object placement ( Fixes #3136 )
2016-02-03 18:53:38 +01:00
scrawl
8360cccce7
Don't clone Drawable UpdateCallbacks twice
...
The Drawable copy constructor takes care of that already.
2016-02-01 21:02:48 +01:00
scrawl
6b48acaf0e
Don't optimize TriShapes with controllers ( Fixes #3143 )
2016-02-01 21:01:17 +01:00
scrawl
d9290b0ee0
Array fix
2016-01-25 21:13:38 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
48f53e23bf
Allow alternate mesh formats for marker_error
2016-01-25 17:15:54 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
62fe47b144
Load default terrain if there is none defined
2016-01-14 16:41:50 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
e1c7165bfb
Fix bounds calculation for addLight to a transform node
2016-01-11 23:14:43 +01:00
scrawl
93cc08a09c
Lighting fix for LightListCallbacks attached to a Transform node
2016-01-11 23:10:16 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
ece40b1e96
improved the remaining handling of extra arguments
2016-01-07 16:07:49 +01:00
Marc Zinnschlag
46e32de350
improved handling of extra arguments in DiscardParser
2016-01-07 16:01:01 +01:00
Marc Zinnschlag
f9607a47b3
improved handling of extra arguments in StringParser
2016-01-07 15:54:22 +01:00
Marc Zinnschlag
210c77968a
Don't report warning about extra arguments, if there are no extra arguments ( Fixes #3133 )
2016-01-07 15:38:23 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
scrawl
0597c8fd9c
Pass a Vec4f by reference
2016-01-03 16:43:20 +01:00
scrawl
ea0be6e737
Update ScriptArgs documentation
2016-01-03 00:13:01 +01:00
scrawl
23cd2056bf
Ignore extra arguments in playSound and playSound3D.
...
A common mistake in mods is to use playSound with volume/pitch arguments, which only playSoundVP supports. Previously these extra arguments raised a parser error, making the respective mod unusable.
2016-01-03 00:13:01 +01:00
scrawl
e695619aa5
ExprParser: Warn about ignored arguments
2016-01-03 00:02:58 +01:00
scrawl
3ebfb47983
Do not discard root node transformations if the root node is named 'bip01' (Bug #3118 )
2016-01-02 01:30:06 +01:00
Alexander "Ace" Olofsson
0efb8e2949
osgDB::ObjectCache was added in 3.3.3, not 3.4.0
...
Fixes redefinition error on builds with OSG >3.3.3 <3.4.0
2015-12-24 17:18:32 +01:00
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
2015-12-17 20:17:38 +01:00
scrawl
723c392a73
NifLoader: fall back to the first UV set when encountering invalid UV set references
2015-12-17 04:05:39 +01:00
scrawl
0731595c2b
Wrap a Texture2D in a ref_ptr
2015-12-17 03:38:38 +01:00
scrawl
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
2015-12-17 03:38:26 +01:00
scrawl
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
2015-12-15 21:16:20 +01:00
scrawl
625644e917
LoadingScreen: documentation updates
2015-12-15 21:03:56 +01:00
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
2015-12-15 20:52:23 +01:00
scrawl
78a733a12c
Fix initialization of InputWrapper::mWindowHasFocus
2015-12-15 20:13:41 +01:00
scrawl
c70790ecb7
Remove outdated comment
2015-12-14 15:50:30 +01:00
scrawl
076dc539bc
KeyframeManager fix
2015-12-14 15:11:06 +01:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
Chris Robinson
5c0a847eaf
Combine some duplicate code
2015-12-13 16:51:27 -08:00
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
2015-12-13 15:31:07 +01:00
scrawl
295563ba65
Minor fix
2015-12-13 15:31:07 +01:00
scrawl
6f966b8434
Don't use osg::notify
2015-12-11 16:18:08 +01:00
Paul Cercueil
06719df868
Use the standard cursor if the custom cursor can't be used
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-11 15:59:59 +01:00
scrawl
0efce6cd4c
Fix typo in a comment
2015-12-10 00:15:55 +01:00
scrawl
eb92b853fe
BulletNifLoader: preallocate the btTriangleMesh's vertices/indices
2015-12-10 00:05:35 +01:00
scrawl
293f3f30b5
Indentation fix
2015-12-09 23:30:24 +01:00
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
2015-12-09 20:12:45 +01:00
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
2015-12-09 18:24:35 +01:00
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
2015-12-09 14:10:57 +01:00
cfcohen
d00d487c3d
Improved error reporting under POSIX using errno and strerror().
2015-12-08 23:35:03 -05:00
scrawl
de84452e5a
NifFile: close the stream after reading ( Fixes #3070 )
2015-12-09 04:52:00 +01:00
scrawl
39feb547a0
Broken lower casing fix ( Fixes #3068 )
2015-12-08 23:12:40 +01:00
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
2015-12-08 22:39:11 +01:00
scrawl
624809c8dc
Minor fix for error handling in skeleton.cpp
2015-12-08 16:50:54 +01:00
scrawl
07b064f616
Rename to lowerCaseInPlace
2015-12-07 22:49:15 +01:00
scrawl
e3d3380c8c
Remove return value for in-place toLowerStr
2015-12-07 22:43:08 +01:00
scrawl
e4751c68e9
Typo fix
2015-12-07 22:30:02 +01:00
scrawl
42d68eb7fb
Build fix
2015-12-07 22:29:57 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
2015-12-06 19:11:25 +01:00
scrawl
1d5af3c9c8
Remove unneeded cast
2015-12-06 15:44:27 +01:00
scrawl
e39f49a88f
OSG extensions namespace fixes
2015-12-06 15:27:43 +01:00
scrawl
c60f4ba7bd
Make RigGeometry bone references case-insensitive ( Fixes #3058 )
2015-12-05 15:02:35 +01:00
scrawl
258f7a2b42
LightController fixes
2015-12-05 00:38:06 +01:00
scrawl
4a9b37aa53
Fix copy constructor issue
2015-12-04 18:08:32 +01:00
scrawl
c442af09c5
Write more documentation for the lighting system
2015-12-04 18:08:32 +01:00
scrawl
462ef617ce
Don't read forward/backward values for Quaternion key lists
...
https://forum.openmw.org/viewtopic.php?f=8&t=3201&p=35867#p35867
2015-12-04 00:18:54 +01:00
scrawl
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
1f8ee9b8d1
StateSetUpdater: use the frameNumber
...
More robust in case a node is updated twice in the same frame (e.g. because it has multiple parents).
2015-12-03 23:46:25 +01:00
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
eb458bf9c8
Fix inactive RigGeometry not rendering correctly
2015-12-03 19:49:45 +01:00
sandstranger
7d374b36fd
change cmake variables
2015-12-03 21:29:50 +03:00
Marc Zinnschlag
06efd72a89
allow keywords as strings in messagebox instruction ( Fixes #2991 )
2015-12-03 11:14:58 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
647bed7f40
Do not read openmw.cfg from global path if one was found in the local path
2015-12-02 19:21:10 +01:00
scrawl
87e44bf627
Small fix
2015-12-02 15:21:13 +01:00
scrawl
d3fa8a8602
Add osgDB::ObjectCache to the repository to work around it not being available in OSG 3.2
2015-12-02 15:14:39 +01:00
scrawl
a29aef14f1
Eliminate a dynamic_cast in ParticleSystemController
2015-12-02 14:59:32 +01:00
scrawl
6cf2c35235
Don't rely on the _particles vector implementation details
...
This will allow compiling OpenMW with an osgParticle optimization to be pushed to OpenMW/osg.
2015-12-02 14:59:32 +01:00
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
2015-12-02 14:59:32 +01:00
scrawl
c9d710f334
Use a typedef to avoid conditional compiling
2015-12-01 16:18:19 +01:00
Alexander "Ace" Olofsson
cfcbd20d99
Let's put it as a MSVC-only fix for now
2015-12-01 04:19:30 +01:00
Alexander "Ace" Olofsson
e42f4999bd
Quick fix for building on MSVC
2015-12-01 04:06:34 +01:00
scrawl
e5ec4fe042
Add const specifier
2015-11-30 21:02:26 +01:00
scrawl
695fcf41c4
Optimize ValueInterpolator / KeyframeController
...
Cache the current position in the animation track and attempt to reuse it in the next frame.
Decent speed up for the Update phase, about 0.3 ms faster in Balmora.
2015-11-30 20:53:47 +01:00
scrawl
ac366f1603
Fix the rig bounds being updated twice per frame
...
Unlike what I expected, the osgUtil::UpdateVisitor is set to traverse all children (not only active children). The FrameSwitch was thus traversing both RigGeometries part of the double-buffering scheme, rather than only the one active in the current frame.
2015-11-30 05:42:31 +01:00
scrawl
e49bce7b40
Share the bvh of btBvhTriangleMeshShape's when possible
...
Results in decent cell-loading speed up. (only affects bullet versions < 2.83, since we use btScaledBvhTriangleMeshShape for >=2.83)
2015-11-30 02:06:29 +01:00
scrawl
d5a738bd39
Apply 27e669296e (locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
2015-11-29 19:56:43 +01:00
Marc Zinnschlag
2bef714d34
Merge remote-tracking branch 'emperorarthur/no_relative'
2015-11-28 10:01:05 +01:00
Arthur Moore
c66fd69c47
Fix #include error
2015-11-27 21:20:54 -05:00
Arthur Moore
4c0c20b1a0
Changed relative includes to library header format
2015-11-27 21:01:28 -05:00
scrawl
30cc633f2c
Missing include fix
2015-11-27 22:21:01 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
scrawl
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
2015-11-27 20:32:45 +01:00
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
2015-11-27 10:34:22 +01:00
scrawl
27e669296e
StringUtils: use the locale-unaware tolower function
...
There is no change in behaviour since we were using the C locale.
The locale-aware tolower is much slower than the locale-unaware one. At least on Linux/GCC it calls dynamic_cast's, and is overall slower by an order of magnitude.
2015-11-27 03:22:52 +01:00
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
2015-11-26 23:56:32 +01:00
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
2015-11-26 00:57:21 -05:00
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
2015-11-25 21:30:04 -05:00
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1da856eed95
2015-11-25 19:22:48 +01:00
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
2015-11-25 19:18:17 +01:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
scrawl
1b77428c59
Use const reference, thanks ace13
2015-11-24 03:42:35 +01:00
cfcohen
6882e6451a
Remove tabs. :-[
2015-11-23 20:18:39 -05:00
cfcohen
9a975a2e68
Substantial rewrite of code to save settings.cfg file, allowing
...
comments to persist, ordering of settings to be retained, additional
reporting of changed settings, preservation of the settings.cfg
timestamp when no changes are made, and foundational changes for
possible future features. Due to poor interaction with the
openmw-launcher settings code, the launcher will still discard all of
these benefits.
2015-11-23 20:17:26 -05:00
sandstranger
16c6816a6f
add forgotten file for building on opengles
2015-11-23 20:42:30 +03:00
sandstranger
69acacefff
openmw building on Android with Opengl es
2015-11-23 20:28:35 +03:00
scrawl
38510a56c2
GeomMorpherController: do not dirty the MorphGeometry unless necessary
2015-11-22 21:24:00 +01:00
scrawl
0d49c7fa51
GeomMorpherController: fix double update of MorphGeometry
2015-11-22 21:23:46 +01:00
scrawl
28b20428b9
Remove dynamic_cast in GeomMorpherController
2015-11-22 20:33:22 +01:00
scrawl
94e8560bf8
RigGeometry: do not allocate new NodePath every frame
2015-11-22 20:01:09 +01:00
scrawl
6d5aa272fc
RigGeometry: do not update the geomToSkelMatrix more than once per frame
2015-11-22 19:54:27 +01:00
scrawl
75a464f7ec
Fix a typo
2015-11-22 19:54:27 +01:00
scrawl
fc7456e0a1
Explicitely opt for float matrices in performance critical places
2015-11-22 19:54:27 +01:00
scrawl
ffea9ec2c4
Remove comment
...
SharedStateManager::prune is run automatically during the update traversal.
2015-11-22 19:54:26 +01:00
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
2015-11-22 19:54:26 +01:00
scrawl
36e91617c9
Revert "NifOsg::Emitter: ignore psToWorld scale"
...
This reverts commit 7c16630874Fixes #3022
2015-11-19 22:09:32 +01:00
scrawl
9b96fcc224
Set the particle scaleReferenceFrame to local space
2015-11-19 15:49:42 +01:00
scrawl
3bd2aaddea
Adjust PulseSlow light controller ( Fixes #1963 )
2015-11-18 23:14:01 +01:00
scrawl
0bdfd1b0d7
Ignore Creature INDX subrecords
...
Found in some .ess files, not sure what they mean.
2015-11-18 16:47:03 +01:00
scrawl
d68ea994d5
Deal with empty meshes
2015-11-17 01:51:21 +01:00
scrawl
83e9a649e5
Cleanup
2015-11-17 01:45:38 +01:00
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682
Support for loading .osg mesh format
2015-11-16 23:26:43 +01:00
scrawl
21e25f4756
Use the traversalNumber as frame number
2015-11-16 20:03:45 +01:00
scrawl
52901ec10c
Do not create terrain geodes when built with OSG 3.4
2015-11-16 15:11:20 +01:00
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
054c3eb24e
Do not deep copy PrimitiveSets when build with OSG 3.5
2015-11-13 20:39:44 +01:00
scrawl
fc8e40889d
Move common subrecord definitions (NAME, DELE) to defs.hpp
2015-11-13 18:07:18 +01:00
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
2015-11-13 01:34:36 +01:00
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.
2015-11-13 00:23:00 +01:00
scrawl
a29d1ace2b
Read NiSpotLight
2015-11-12 23:45:12 +01:00
scrawl
ba211ad9ad
Read NiPointLight ( Fixes #3011 )
2015-11-12 23:42:17 +01:00
scrawl
0965a9059d
Handle NiLODNode using osg::LOD ( Fixes #3008 )
2015-11-12 19:52:36 +01:00
scrawl
626281977e
Read NiLODNode (Bug #3008 )
2015-11-12 19:52:32 +01:00
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.
2015-11-12 01:16:37 +01:00
Marc Zinnschlag
b04a23bf43
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
2015-11-11 19:55:42 +01:00
scrawl
1edcb219a7
Leak fix
2015-11-11 16:27:17 +01:00
scrawl
fc93dc6195
Remove a stray method declaration
2015-11-11 01:32:31 +01:00
MatthewRock
a662a00c62
Fixing bug for merchant
2015-11-10 19:18:02 +01:00
scrawl
7776c49fc1
GraphicsWindowSDL2: adjust the log levels
2015-11-10 18:42:59 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
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.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
Alexander "Ace" Olofsson
37158df339
Update scalinglayer.cpp
...
MSVC Explicitly requires <algorithm> for std::min and/or max
2015-11-10 14:59:26 +01:00
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.
2015-11-09 18:57:17 +01:00
scrawl
1200ff9186
RigGeometry: fix incorrect bounding box in the first frame
...
The default computeBound() was overriding the manually set bounding box.
2015-11-09 18:31:41 +01:00
scrawl
64abdbabe3
Small refactor of controllers handling, print warning messages for unhandled controllers
2015-11-09 17:42:35 +01:00
scrawl
35f5be680b
Support for NiVisController on trishape nodes
2015-11-09 17:42:35 +01:00
Marc Zinnschlag
af5a1bc16b
Merge remote-tracking branch 'origin/master'
2015-11-09 09:07:37 +01:00
Marc Zinnschlag
b61b732207
fixed an interference with script warning mode and error downgrading ( Fixes #2990 )
2015-11-09 09:07:18 +01:00
scrawl
79b3f1e6a8
Small cleanup
2015-11-08 18:30:22 +01:00
scrawl
59aee04ddb
Implement ScalingLayer, for layouting of widgets in screen-relative coordinates
2015-11-08 18:30:21 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
7ff168b787
osgMyGUI: add support for layers to insert custom rendering state
2015-11-07 17:33:32 +01:00
scrawl
0210b87ffc
Revert "Fix LightSource crash"
...
This reverts commit f336c6db87
2015-11-06 23:14:27 +01:00
scrawl
72252d4f32
Terrain: restore IncrementalCompileOperation
2015-11-06 20:22:07 +01:00
scrawl
7ca8e45d5d
Terrain: remove debug code
2015-11-06 20:21:39 +01:00
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.
2015-11-06 20:14:57 +01:00
scrawl
95cf13e3f2
Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable
2015-11-06 15:23:37 +01:00
Marc Zinnschlag
e081eb2c34
Merge remote-tracking branch 'origin/master'
2015-11-05 07:56:57 +01:00
Marc Zinnschlag
7239481672
Merge remote-tracking branch 'scrawl/scrawl-patch-2'
2015-11-05 07:53:08 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
f7d0d06134
Compiler: remove unused mNameStartingWithDigit
2015-11-04 20:31:23 +01:00
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.
2015-11-04 00:19:15 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
scrawl
f336c6db87
Fix LightSource crash
2015-10-29 00:51:35 +01:00
scrawl
49df6b7450
LightManager: fix incorrect view matrix for RELATIVE_RF cameras
2015-10-23 21:25:56 +02:00
scrawl
6dff11f847
Duplicate code fix
2015-10-23 18:16:26 +02:00
scrawl
8552a9d82c
Add multiple camera support to LightManager
2015-10-23 01:58:22 +02:00
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.
2015-10-19 15:46:53 +02:00
Marc Zinnschlag
8eb6d337d5
deal with script execution from within a script ( Fixes #2964 )
2015-10-09 12:14:56 +02:00
Emmanuel Anne
b911abd7d8
add a few more possible arguments to choice
...
this fixes some travel dialogs for "Antares Big Mod"
2015-10-07 12:28:35 +02:00
Marc Zinnschlag
435e52306a
adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
2015-09-26 11:34:46 +02:00
Marc Zinnschlag
ae54f34f25
removed a redundant else and made unary + work also in the console
2015-09-26 11:30:35 +02:00
Marc Zinnschlag
2158bfe285
Merge remote-tracking branch 'zelurker/scripts_unary_plus'
2015-09-26 11:25:40 +02:00
scrawl
8e69c80bf6
Add framenumber checks in various cull callbacks, so we don't update more than once per frame when multiple cameras are used
2015-09-26 01:21:33 +02:00
Emmanuel Anne
dace7ab706
scripts: recognize '+' also as a unary operator
...
it fixes the armor sorter in "Blades safe house.esp"
2015-09-25 14:22:57 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
scrawl
f7e5a40143
Fix typo
2015-09-21 17:58:57 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Marc Zinnschlag
4d94f38f4b
replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation ( Fixes #1730 )
2015-09-15 14:57:07 +02:00
cc9cii
192f01e3ac
Set default creature scale to 1. Partially resolves bug #2880 . (no creature verifier yet)
2015-09-12 10:17:14 +10:00
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
2015-09-12 10:15:32 +10:00
scrawl
5252dbcf1f
Add some comments to ESM::Land
2015-09-11 21:09:54 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
scrawl
76fb68a9c0
Handle particle systems that don't have emitters
...
Fixes a crash in the Magic Diversity mod.
2015-09-07 22:07:09 +02:00
Marc Zinnschlag
a8dc1c1198
merge land tables
2015-09-03 16:15:00 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
b0641934d4
added copy constructor and assignment operator for Land record struct
2015-08-31 11:06:32 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
scrawl
e9acd135a6
Update todo comment
2015-08-30 20:43:39 +02:00
scrawl
cda8a88f0d
Use DEEP_COPY_PRIMITIVES to work around problem in osg::Geometry copy constructor (Bug #2754 )
2015-08-30 20:00:37 +02:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
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
2015-08-26 22:59:21 -05:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
Nikolay Kasyanov
166df28906
OS X cursor workaround build fix
2015-08-19 21:23:16 +02:00
scrawl
4a68ceaeb7
Restrict the OS X cursor workaround to Intel graphics systems
2015-08-19 19:06:24 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
af5ffa5548
Don't warn about SDL touch events
2015-08-15 22:53:29 +02:00
scrawl
47ac20af40
Workaround flipped cursor on OS X
2015-08-15 22:28:59 +02:00
Marc Zinnschlag
cbf9f83b85
allow use of IDs as function arguments, even if the ID matches a keyword ( Fixes #2830 )
2015-08-05 17:20:01 +02:00
scrawl
16b8ef3164
Don't use a shared Material in MaterialColorController
2015-07-31 00:01:55 +02:00
scrawl
de479e35c8
Fix AlphaController affecting all instances of the StateSet
2015-07-30 23:51:37 +02:00
Alexander "Ace" Olofsson
1f78ebd3c9
Oops?
2015-07-30 12:22:51 +02:00
Alexander "Ace" Olofsson
77a3a52b4e
What's wrong with this statement?
2015-07-30 12:16:15 +02:00
Alexander "Ace" Olofsson
e9ffbcc1b0
OSG 3.3.3 moves GL extensions out of osg::Texture
2015-07-30 11:45:10 +02:00
scrawl
5d3ad13868
Merge pull request #696 from EmperorArthur/verbose_errors
...
Be more descriptive when the NIF loader does not handle something.
2015-07-29 15:32:01 +02:00
Marc Zinnschlag
be1692f218
Merge remote-tracking branch 'origin/master'
2015-07-29 14:46:23 +02:00
Marc Zinnschlag
20106bb90f
allow keywords in quotes ( Fixes #2794 )
2015-07-29 14:45:56 +02:00
Arthur Moore
2d93a6f6cb
Be more verbose when dealing with unhandled nif texture properties
2015-07-28 18:46:11 -04:00
scrawl
d7ad0ee148
Print a sensible error message when S3TC support is missing ( Fixes #2800 )
2015-07-28 23:35:10 +02:00
scrawl
3a7d0d8dc8
Remove a file that isn't in use yet from build
2015-07-28 23:34:55 +02:00
Stanislav Bas
f9b0b7ede5
Make saving of deleted ESM records more consistent
2015-07-28 21:37:21 +03:00
scrawl
26656707dd
Use marker_error.nif as replacement when a mesh fails to load
2015-07-28 03:21:44 +02:00
scrawl
ac1f64b559
Fix StencilProperty front face mixup ( Fixes #2802 )
2015-07-28 03:20:18 +02:00
Stanislav Bas
9a8ca81907
Fix missing break in switch statement
2015-07-26 13:54:36 +03:00
scrawl
b3f5ac5dbb
Include cleanup
2015-07-25 02:11:49 +02:00
Stanislav Bas
daaff1284e
Remove unused includes
2015-07-22 22:18:26 +03:00
Stanislav Bas
4a16eba716
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
2015-07-22 19:26:00 +03:00
Stanislav Bas
1e8182220a
Fix build errors & warnings
2015-07-19 23:44:16 +03:00
Stanislav Bas
f5745749a6
Remove <cstdint> include file from loaddial.cpp
2015-07-19 22:50:42 +03:00
Koncord
7924ecef3e
Fix definition conflict
2015-07-19 23:37:20 +09:00
Stanislav Bas
5fd48efd28
Some refactoring. Remove unused code
2015-07-19 14:58:14 +03:00
Stanislav Bas
e65ff723ce
More ESM records have DELE handling.
...
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
2015-07-19 14:58:13 +03:00
Stanislav Bas
ad353e6dd0
Refine DELE handling in ESM records. Add position-independent DELE search
2015-07-19 14:57:59 +03:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
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.
2015-07-18 03:09:04 +02:00
slothlife
420789baa9
Remove an unused include
2015-07-17 15:26:04 -05:00
slothlife
1b3cc957f8
Move some OSG static library setup code
2015-07-17 15:13:43 -05:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
slothlife
df99d5a59d
Move setup code for OSG when statically linked
2015-07-17 09:56:21 -05:00
slothlife
43b1f15af9
Merge remote-tracking branch 'upstream/master' into static-deps-build
2015-07-17 01:03:19 -05:00
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).
2015-07-17 00:56:15 -05:00
Stanislav Bas
e8a9567be3
Move DELE handling to CellRef record
2015-07-15 19:39:01 +03:00
Koncord
73731d27e9
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 23:54:47 +09:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
Stanislav Bas
b55a4999ca
Add NAME handling to DebugProfile and Filter records
2015-07-13 22:37:14 +03:00
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.
2015-07-13 19:13:26 +02:00
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
2015-07-13 11:26:23 +03:00
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
2015-07-13 10:40:11 +03:00
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
2015-07-12 12:01:18 +03:00
Stanislav Bas
adec0cb61d
Add removing of deleted Infos to Dialogue::clearDeletedInfos()
2015-07-12 00:19:04 +03:00
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
2015-07-11 22:17:53 +03:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
2015-07-10 08:58:53 +02:00
scrawl
72686c32ae
Fix runtime exceptions on MyGUI debug builds
2015-07-10 03:03:17 +02:00
Stanislav Bas
7ecb54a776
Set Deleted flag to false when initializing ESM records
2015-07-10 00:29:46 +03:00
Stanislav Bas
89e44c8f1f
Remove explicit record ID in load/read methods of MWWorld::Store
2015-07-10 00:29:36 +03:00
Stanislav Bas
b2f3ccb080
Add NAME handling to GameSetting record
2015-07-10 00:29:34 +03:00
Stanislav Bas
09a3358017
Add NAME and DELE handling to Global record
2015-07-10 00:29:32 +03:00
Stanislav Bas
30b42bf4c0
Remove redundant code
2015-07-10 00:29:30 +03:00
Stanislav Bas
8c3654af11
Add NAME handling to Race record
2015-07-10 00:29:28 +03:00
Stanislav Bas
b667338a8f
Add NAME and DELE handling to Cell record
2015-07-10 00:29:26 +03:00
