b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
131887c981
Delete script.pwn
...
Not for this repo.
9 years ago
ff3b7de0e7
Update gamecontrollerdb.txt from upstream.
9 years ago
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
bc04989448
Remove unused uniforms
9 years ago
8e23c37668
Flip the parallax offset Y component based on tangent parity (Bug #3440 )
9 years ago
6f5b68859f
Comment out UV test that is not working
9 years ago
6a1fd05074
Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440 )
9 years ago
aa5a643e3b
Fix incorrect multiplication order of TBN matrix (Bug #3440 )
9 years ago
091e1bf25d
improved scene element visibility buttons
9 years ago
5c8756cb2c
Add composite icon for exterior cell controls in scene view, along with source SVG and a bash script that I used to assemble all possible status combinations
9 years ago
c2c81c6b1a
Reversed the location of original state and current state in scene view icon. This way it's much more obvious, assuming the icon stays on the left of the actual landscape view. See https://forum.openmw.org/viewtopic.php?p=38971#p38971 for more info
9 years ago
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
9 years ago
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
9 years ago
6f31b3d79f
Add parallax mapping for objects
9 years ago
b59b2c6d6d
Move to parallax.glsl
9 years ago
b4dda045a6
Pass the tangent in object space
9 years ago
157c11398d
Add terrain parallax mapping
9 years ago
563f44b823
Merge remote-tracking branch 'origin/master'
9 years ago
9d985d883b
added grid icon
9 years ago
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
9 years ago
414c19f717
Fix detailMapUV bug
9 years ago
5e105da3ba
Generate texture coordinates per-pixel when normal map + environment map are used
9 years ago
900b522d13
Rename viewPos to viewDirection
9 years ago
09684adeff
Update settings documentation
9 years ago
0db7163363
Add specular mapping for terrain
9 years ago
f01e8a6950
Add specular mapping for objects
9 years ago
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
e2dc46c92e
Update settings
9 years ago
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
9 years ago
5e12a1b4ef
Add enchanted item glow to the shader
9 years ago
1232607385
Remove pointless widget names in settings layout file
9 years ago
a73512afb7
Add shader settings to settings.cfg
9 years ago
3969675afa
Remove unused settings
9 years ago
e5a37a7023
Add normal map code
9 years ago
18e80d5627
Add per-pixel lighting code
9 years ago
1223bca3d4
Move doLighting to separate file
9 years ago
456816f707
Use diffuse.a / vertex.a, use material emission
9 years ago
5fd84074c5
Reimplement detailMap, darkMap and emissiveMap
9 years ago
e845c576d4
Use the texture matrix
9 years ago
3859c58a8a
Assign gl_ClipVertex in the vertex shader to make clip planes work
9 years ago
9376811213
Vertex lighting shader
9 years ago
044e0a829a
Add fog
9 years ago
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
9 years ago
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
9 years ago
6fb0022b35
Update preloading settings
...
Disable 'preload fast travel' by default.
Add 'min cache size' and 'max cache size' settings.
Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
9 years ago
6806741d9b
Add settings for disabling the individual preloading types
9 years ago
a81b10b415
Make the cache expiryDelay configurable
9 years ago
5efaa9817c
Add preloading settings
9 years ago
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
Aesylwinn
Stanislav Zhukov
Alexander Kurtz
scrawl
Marc Zinnschlag
Sergey "Shnatsel" Davidoff