Marc Zinnschlag
01497ac8db
Merge remote-tracking branch 'origin/master'
2016-02-24 13:37:34 +01:00
Marc Zinnschlag
9f14247562
Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'
2016-02-24 13:37:16 +01:00
Aesylwinn
1ae402476d
Journal verifier
2016-02-22 17:01:15 -05:00
Aesylwinn
f4ed389496
InfoCondition autocompletion
2016-02-22 15:48:25 -05:00
scrawl
d05603c7fe
Directly apply On Target 'When Strikes' enchantments instead of launching a projectile ( Fixes #3212 )
2016-02-22 19:42:54 +01:00
scrawl
5cdee454ef
Fix degree/radians mixup ( Fixes #3213 )
2016-02-22 19:13:56 +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
a6621626aa
Don't use multiple parent node paths in CSVRender::Object
2016-02-22 15:22:37 +01:00
scrawl
c5d3e6c993
Disable preloading of levelled lists
2016-02-22 14:31:02 +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
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
Aesylwinn
20942e6658
Fixes to testing if condition is always or never true
2016-02-19 14:10:47 -05:00
scrawl
6a0ac824bd
Fix terrain error in OpenCS
2016-02-19 15:00:58 +01:00
Aesylwinn
5315866f61
Corrections to condition ranges and several other minor fixes
2016-02-19 03:03:10 -05:00
Aesylwinn
9d392487a9
Fix names to be unique and condition values to be set to 0
2016-02-19 02:59:19 -05:00
scrawl
17c4dfdb62
Use the lowest unused texture unit for the enchanted item glow texture
2016-02-18 23:10:58 +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
1232607385
Remove pointless widget names in settings layout file
2016-02-18 19:41:06 +01:00
scrawl
a73512afb7
Add shader settings to settings.cfg
2016-02-18 19:38:34 +01:00
scrawl
3969675afa
Remove unused settings
2016-02-18 19:38:34 +01:00
scrawl
553408949a
Fix character preview
2016-02-18 19:37:57 +01:00
scrawl
bd279c63f7
Fix fog on water
2016-02-18 19:37:57 +01:00
scrawl
9376811213
Vertex lighting shader
2016-02-18 19:37:57 +01:00
scrawl
044e0a829a
Add fog
2016-02-18 19:37:57 +01:00
scrawl
41e1fd407d
Disable shaders for the sky
2016-02-18 19:37:56 +01:00
scrawl
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
2016-02-18 19:37:55 +01:00
scrawl
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
2016-02-18 19:36:17 +01:00
scrawl
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'.
2016-02-18 17:47:10 +01:00
Aesylwinn
bdc99048bb
Missing header
2016-02-17 19:01:22 -05:00
Aesylwinn
8668eccd0b
Topic Info verifier with fixes to InfoSelectWrapper class
2016-02-17 15:38:30 -05:00
Aesylwinn
e89609e5b0
Changes to how Info Conditions are edited
2016-02-17 14:15:57 -05:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
Aesylwinn
3f40346636
Implemented a wrapper for DialInfo::SelectStruct
2016-02-15 19:49:54 -05:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +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
dad38d901c
Merge remote-tracking branch 'rcutmore/feature-3043'
2016-02-14 17:38:20 +01:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
Rob Cutmore
25744aaadd
Update cell marker appearance
...
- Added bounding box around marker text. Box is black when cell exists
otherwise it is red.
- Changed format of marker text.
- Changed marker text's pivot point to be at center of text.
2016-02-14 10:28:41 -05:00
Marc Zinnschlag
29c2a99316
Merge remote-tracking branch 'scrawl/physics'
2016-02-13 16:20:48 +01:00
Marc Zinnschlag
d1d7804620
Merge remote-tracking branch 'origin/master'
2016-02-13 10:13:25 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
796a4a795a
Avoid the 'spiral of death'
2016-02-13 03:09:28 +01:00
scrawl
383524c688
Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
...
Based on http://gafferongames.com/game-physics/fix-your-timestep/
2016-02-13 03:03:34 +01:00
scrawl
d1375cd3a3
Crashcatcher: limit backtrace to a sensible number of stack frames
...
When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
2016-02-13 01:35:53 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00