1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-08-15 09:14:06 +00:00
Commit graph

21258 commits

Author SHA1 Message Date
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
scrawl
c60388afb6 Add fudge factor to move the water mesh away from camera when the camera gets too close 2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc Render the water plane with GL_DEPTH_CLAMP if supported (Fixes #996) 2015-11-02 00:29:09 +01:00
scrawl
802620a86b Use TimeOfDayInterpolator for Land Fog Depth
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788 Create TimeOfDayInterpolator class to refactor time handling in WeatherManager 2015-11-01 22:59:26 +01:00
scrawl
8da4530957 Use INI-imported underwater fog settings (Fixes #2907, Fixes #1511) 2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 2015-11-01 21:45:58 +01:00
cc9cii
7f477e2fae Fix include file issue. 2015-11-02 06:57:24 +11:00
cc9cii
4af469511d Fix some sub-tables becoming uneditable since commit 80869d 2015-11-02 06:43:20 +11:00
cc9cii
0ec4af4210 Re-add mistakenly removed line and fix a silly typo.
(cherry picked from commit 77471d1592)
2015-11-02 06:25:46 +11:00
cc9cii
f08680ebcd Disable context menu for fixed size sub-tables. Should resolve bug #2932.
(cherry picked from commit 80869d9bae)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
2015-11-02 06:25:31 +11:00
cc9cii
b595f2641c Fix issue where mandatory effects field was allowed to be empty (and vice versa)
(cherry picked from commit 972193c7eb)
2015-11-01 23:09:06 +11:00
cc9cii
bb1a959c88 Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980.
(cherry picked from commit 1a64b40725)
2015-11-01 23:08:55 +11:00
cc9cii
30de5c1c59 Fix editing ingredient effects sub-table. Should resolve bug #2978.
(cherry picked from commit 9f0e059a15)
2015-11-01 23:08:42 +11:00
artemutin@yandex.ru
91c4afe78c Fixed filter reapplication on Description column change and on State
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.

(cherry picked from commit eae36f8005)
2015-11-01 22:50:37 +11:00
artemutin@yandex.ru
437cabf778 If table dont use any filter, filter update now dont cause a reapply of empty filter
(cherry picked from commit 33e12a99fa)
2015-11-01 22:50:21 +11:00
artemutin@yandex.ru
f44d7e97b0 Stream error handling, and other minor changes.
(cherry picked from commit 4ca7b26609)
2015-11-01 22:49:05 +11:00
artemutin@yandex.ru
ba9190ed5e Implemented line and col calculations in scriptsubview
(cherry picked from commit e7a3f059aa)
2015-11-01 22:48:53 +11:00
Marc Zinnschlag
aa31704d5d deal with script execution from within a script (Fixes #2964)
(cherry picked from commit 8eb6d337d5)
2015-11-01 22:48:38 +11:00
cc9cii
71077fda6a Disable toolbar context menu. Should resolve bug #2953.
(cherry picked from commit 64821b0785)
2015-11-01 22:48:01 +11:00
cc9cii
b3daa7d956 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930.
(cherry picked from commit 3bbcf6a916)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
2015-11-01 22:47:47 +11:00
cc9cii
9cc046ce4e Further rationalise the use of ColumnIds
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755

(cherry picked from commit 998348e606)
2015-11-01 22:46:18 +11:00
Marc Zinnschlag
8fffbb3f9b updated credits file
(cherry picked from commit 64902bf221)
2015-11-01 22:37:58 +11:00
artemutin@yandex.ru
c34d8c2a0d Add StartScriptCreator to a factory manager.
(cherry picked from commit ecce3a1975)

Conflicts:
	apps/opencs/view/world/subviews.cpp
2015-11-01 22:37:25 +11:00
artemutin@yandex.ru
7f46bc155a add getIdValidatorResult method to GenericCreator, for use in subclass
StartScriptCreator

(cherry picked from commit 903cd3322b)
2015-11-01 22:35:12 +11:00
artemutin@yandex.ru
b0018aa791 Fix namespace, add file to CMakeLists.txt
(cherry picked from commit e672880f64)
2015-11-01 22:34:49 +11:00
artemutin@yandex.ru
cb6198a843 Added StartScriptCreator class with redefined getErrors method.
(cherry picked from commit 3f27c85630)
2015-11-01 22:34:36 +11:00
Marc Zinnschlag
4677560859 adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
(cherry picked from commit 435e52306a)
2015-11-01 21:37:30 +11:00
Marc Zinnschlag
c5235ea794 removed a redundant else and made unary + work also in the console
(cherry picked from commit ae54f34f25)
2015-11-01 21:37:14 +11:00
Emmanuel Anne
890405bdb1 scripts: recognize '+' also as a unary operator
it fixes the armor sorter in "Blades safe house.esp"

(cherry picked from commit dace7ab706)
2015-11-01 21:37:01 +11:00
Marc Zinnschlag
69e6328507 fixed local variable caching issue in automatic error checking (Fixes #2927)
(cherry picked from commit 7bef97bf33)
2015-11-01 21:36:14 +11:00