scrawl
|
47664e1370
|
Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding
|
2015-11-07 00:10:49 +01:00 |
|
scrawl
|
a41ebd6695
|
Comment out object shaders in the settings menu
|
2015-11-07 00:04:34 +01:00 |
|
scrawl
|
4cc200680c
|
Comment out shadows tab in settings menu
|
2015-11-06 23:59:06 +01:00 |
|
scrawl
|
2407f393ce
|
Fix double update traversal in screenshot function
|
2015-11-06 23:14:27 +01:00 |
|
scrawl
|
6e69808129
|
Fix the frameNumber not being incremented in certain frames
|
2015-11-06 23:14:27 +01:00 |
|
scrawl
|
0210b87ffc
|
Revert "Fix LightSource crash"
This reverts commit f336c6db87.
Root cause should be fixed in next commit.
|
2015-11-06 23:14:27 +01:00 |
|
cc9cii
|
5b1373f3fd
|
Merge pull request #11 from cc9cii/jump-to-modified
Feature #2554
|
2015-11-07 07:46:07 +11:00 |
|
cc9cii
|
007c733578
|
Resolve merge issues and add back user preference setting for auto selecting a modified record.
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)
Conflicts:
apps/opencs/model/settings/usersettings.cpp
|
2015-11-07 07:17:46 +11:00 |
|
cc9cii
|
fb3015c9b8
|
Merge branch 'cc9cii' into jump-to-modified
Conflicts:
apps/opencs/view/world/table.cpp
apps/opencs/view/world/table.hpp
apps/opencs/view/world/tablesubview.cpp
|
2015-11-07 06:30:46 +11: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 |
|
cc9cii
|
9f4ecc2f8e
|
Merge pull request #10 from cc9cii/master-cherry-pick-3
Merge master (cherry pick 3)
|
2015-11-05 20:35:10 +11: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
|
8e4e4e5e38
|
Fix infinite loop in addToLevList
|
2015-11-05 01:18:01 +01:00 |
|
scrawl
|
489addf772
|
Don't attempt to run openmw_test_suite on coverity scan branch, since it is not being built
|
2015-11-04 22:24:25 +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
|
6bf3932279
|
Fix the check_tabs.sh script choking on QT generated UI files when doing an in-source build
|
2015-11-04 20:25:03 +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
|
1cf1c944b7
|
Don't attempt to render weather particles on the refraction and reflection textures
|
2015-11-03 23:20:17 +01:00 |
|
scrawl
|
209fa52883
|
Hide weather particles underwater (Fixes #2701)
|
2015-11-03 23:15:43 +01:00 |
|
scrawl
|
e3b30baff9
|
clipFudge fix
|
2015-11-03 23:10:52 +01:00 |
|
scrawl
|
682f30ef9c
|
Fix incorrect uses of PhysicsSystem::getHalfExtents
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
|
2015-11-03 19:05:36 +01:00 |
|
scrawl
|
46e07e4b19
|
Head tracking: fall back to target collision box center if the target has no head node
|
2015-11-03 18:27:15 +01:00 |
|
scrawl
|
a5f8ffb83d
|
aimToTarget: Fix the collision box translation not being taken into account
|
2015-11-03 18:15:47 +01:00 |
|
scrawl
|
de97a8a3da
|
Do not allow disabling the player object
|
2015-11-03 17:53:57 +01:00 |
|
scrawl
|
b72d5c5190
|
Don't play idlestorm animation when swimming
|
2015-11-03 17:48:35 +01:00 |
|
scrawl
|
c0a81030bb
|
Make use of INI settings for the simple water
|
2015-11-03 02:24:50 +01:00 |
|
scrawl
|
30c828dff0
|
Include cleanup
|
2015-11-03 02:17:42 +01:00 |
|
scrawl
|
8e8f72408d
|
Use diffuse/ambient lighting for the simple water
|
2015-11-03 02:12:00 +01:00 |
|
scrawl
|
380256977b
|
Fix another renderBin issue with the weather particles
Depth sorting w.r.t. the rest of the scene was broken
|
2015-11-03 01:53:38 +01:00 |
|
scrawl
|
9902dfc9ef
|
Comment
|
2015-11-03 01:53:22 +01:00 |
|
scrawl
|
ad016da31d
|
Enable fog on weather particles
|
2015-11-03 01:42:37 +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
|
d6f45c3390
|
Fix the renderbin for weather particles
Regression from commit 2ee6b41887
|
2015-11-02 21:51:01 +01:00 |
|
scrawl
|
bd1f3493d7
|
Fix weather particles not being cleared when changing from one particle effect to another
|
2015-11-02 21:35:03 +01:00 |
|
cc9cii
|
12a8692cdb
|
Fix include file issue.
(cherry picked from commit 7f477e2fae)
|
2015-11-02 18:50:02 +11:00 |
|
cc9cii
|
6d38d97470
|
Fix some sub-tables becoming uneditable since commit 80869d
(cherry picked from commit 4af469511d)
Conflicts:
apps/opencs/model/world/refidadapterimp.hpp
|
2015-11-02 18:49:48 +11:00 |
|
cc9cii
|
a19a1dabe2
|
Add a check for scale value of 0. Should resolve bug #2880.
(cherry picked from commit 819fecd08e)
|
2015-11-02 18:46:34 +11:00 |
|
cc9cii
|
26195dc5fe
|
Rename a variable to make it less confusing.
(cherry picked from commit 7c007d9c6d)
|
2015-11-02 18:46:21 +11:00 |
|
cc9cii
|
894f3a9418
|
Fix saving when only topic info was modified (topic itself unchanged)
(cherry picked from commit 78c735adc6)
|
2015-11-02 18:46:04 +11:00 |
|
cc9cii
|
245357c9b2
|
Move TableEditModes enum inside a class scope.
(cherry picked from commit 107ccd84d4)
Conflicts:
apps/opencs/model/world/refidadapterimp.cpp
|
2015-11-02 18:45:17 +11:00 |
|
Marc Zinnschlag
|
ab2df963e9
|
Merge remote-tracking branch 'origin/master'
|
2015-11-02 08:40:40 +01:00 |
|
scrawl
|
0348b8df1c
|
Fix applying of plane height in ClipCullNode (Fixes #2985)
|
2015-11-02 01:23:21 +01:00 |
|
scrawl
|
3f988327c7
|
Destructor fix
|
2015-11-02 00:57:59 +01:00 |
|
scrawl
|
913bbe347b
|
Don't check the extension string every frame
|
2015-11-02 00:52:20 +01:00 |
|