Marc Zinnschlag
|
1784701b47
|
fixed a texture indexing bug (only affects the editor)
(cherry picked from commit 73f6efddcc)
|
2015-11-01 18:56:31 +11:00 |
|
Marc Zinnschlag
|
25952369ae
|
merge land tables
(cherry picked from commit a8dc1c1198)
|
2015-11-01 18:56:18 +11:00 |
|
Marc Zinnschlag
|
ce34daa64b
|
removed indirection in OpenMW-CS land record
(cherry picked from commit 85f6bb892b)
Conflicts:
apps/opencs/view/render/cell.cpp
|
2015-11-01 18:56:07 +11:00 |
|
Marc Zinnschlag
|
c4b34a077e
|
refactored loading of land data
(cherry picked from commit 69b9eadb52)
Conflicts:
apps/openmw/mwworld/scene.cpp
components/esmterrain/storage.cpp
|
2015-11-01 18:54:15 +11:00 |
|
cc9cii
|
4f24c6a7c8
|
more const-ness fixes
|
2015-11-01 17:07:40 +11:00 |
|
Marc Zinnschlag
|
44020df65f
|
made return type of ESMTerrain::Storage::getLand const
(cherry picked from commit febf611c82)
|
2015-11-01 13:40:56 +11:00 |
|
Marc Zinnschlag
|
8cb1f4ffe9
|
additional safety check for land texture listing merge stage
(cherry picked from commit 69045d7ec9)
|
2015-11-01 13:40:45 +11:00 |
|
Marc Zinnschlag
|
35c4af9476
|
added copy constructor and assignment operator for Land record struct
(cherry picked from commit b0641934d4)
|
2015-11-01 13:40:32 +11:00 |
|
Marc Zinnschlag
|
a2d4957d2a
|
merge land texture tables
(cherry picked from commit 890bbb6b11)
|
2015-11-01 13:40:21 +11:00 |
|
Marc Zinnschlag
|
e5038cbece
|
fixed merge stage order; added proper initialisation
(cherry picked from commit b7983d08ba)
|
2015-11-01 13:40:07 +11:00 |
|
Marc Zinnschlag
|
73ab89bf70
|
merge references tables
(cherry picked from commit a97a632aa7)
|
2015-11-01 13:39:56 +11:00 |
|
Marc Zinnschlag
|
62daecadf5
|
fixed record state issues after merge
(cherry picked from commit 845cafd61c)
|
2015-11-01 13:39:44 +11:00 |
|
Marc Zinnschlag
|
9230c62884
|
merge referenceables table
(cherry picked from commit f95950e8d8)
|
2015-11-01 13:39:30 +11:00 |
|
Marc Zinnschlag
|
81188a3456
|
silenced a warning
(cherry picked from commit 9cf793c0b5)
Conflicts:
apps/opencs/model/doc/document.cpp
|
2015-11-01 13:39:18 +11:00 |
|
Marc Zinnschlag
|
72aa998261
|
simplifying merge stage
(cherry picked from commit 40753aa9a3)
|
2015-11-01 13:37:41 +11:00 |
|
Marc Zinnschlag
|
e33314ad81
|
made merge operation more fluent
(cherry picked from commit 16dda281ce)
|
2015-11-01 13:37:26 +11:00 |
|
Marc Zinnschlag
|
98cac624a9
|
added info tables and pathgrid table to merge operation
(cherry picked from commit 103073150e)
|
2015-11-01 13:37:14 +11:00 |
|
Marc Zinnschlag
|
024a5405e0
|
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
(cherry picked from commit c92898a5bc)
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
|
2015-11-01 13:37:01 +11:00 |
|
Marc Zinnschlag
|
973c65bc82
|
merge id collections
(cherry picked from commit 3902513e65)
|
2015-11-01 13:35:15 +11:00 |
|
Marc Zinnschlag
|
55dfe48ef7
|
copy meta data from game file when merging
(cherry picked from commit 47dd9505a9)
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/data.cpp
|
2015-11-01 13:34:41 +11:00 |
|
Marc Zinnschlag
|
3eef192e4d
|
create merged document and open a view for it (document is still empty at this point)
(cherry picked from commit 1b663f01af)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/documentmanager.cpp
|
2015-11-01 13:31:28 +11:00 |
|
Marc Zinnschlag
|
0b8e04d6a8
|
forgot to connect merge operation signals
(cherry picked from commit d8655f2ff8)
|
2015-11-01 13:25:59 +11:00 |
|
Marc Zinnschlag
|
9423603e94
|
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
(cherry picked from commit e2377396a7)
|
2015-11-01 13:25:46 +11:00 |
|
Marc Zinnschlag
|
e4381c3ec8
|
added merge operation (doesn't do anything yet)
(cherry picked from commit 904ad94952)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
|
2015-11-01 13:25:34 +11:00 |
|
Marc Zinnschlag
|
c2ed475950
|
disable merge menu item when a merge is already in progress
(cherry picked from commit 708cacdec4)
|
2015-11-01 13:23:09 +11:00 |
|
Marc Zinnschlag
|
a5a0990d3c
|
improved adjuster widget problem reporting
(cherry picked from commit 4fd3097c1c)
|
2015-11-01 13:22:54 +11:00 |
|
Marc Zinnschlag
|
ef1e01639e
|
added UI for merge tool (merge tool itself is still missing)
(cherry picked from commit b83f9445a9)
Conflicts:
apps/opencs/editor.cpp
apps/opencs/editor.hpp
|
2015-11-01 13:22:42 +11:00 |
|
Marc Zinnschlag
|
6fb658daa4
|
replaced State_Compiling (not requried anymore) with State_Merging
(cherry picked from commit 6a9218ee07)
|
2015-11-01 13:19:56 +11:00 |
|
cc9cii
|
819fecd08e
|
Add a check for scale value of 0. Should resolve bug #2880.
|
2015-11-01 11:23:28 +11:00 |
|
cc9cii
|
7c007d9c6d
|
Rename a variable to make it less confusing.
|
2015-10-31 20:45:16 +11:00 |
|
cc9cii
|
78c735adc6
|
Fix saving when only topic info was modified (topic itself unchanged)
|
2015-10-31 20:42:42 +11:00 |
|
scrawl
|
7b817ba010
|
Fix the node masks of water cameras being reset (Bug #2984)
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
|
2015-10-31 03:14:05 +01:00 |
|
scrawl
|
93f4d31cf9
|
Raytest mask fix (Fixes #2984)
|
2015-10-31 01:30:02 +01:00 |
|
scrawl
|
b9b154a015
|
Minor cleanup
|
2015-10-31 00:01:12 +01:00 |
|
scrawl
|
d90fa977e8
|
GL_DEPTH_COMPONEN24 fix
|
2015-10-29 13:52:48 +01:00 |
|
Marc Zinnschlag
|
655b40267b
|
changed instance selection model (primary selects, secondary toggles selection)
|
2015-10-29 11:27:01 +01:00 |
|
Marc Zinnschlag
|
ad4e0e3b97
|
split virtual select button into two buttons (primary select and seconadry select)
|
2015-10-29 11:20:06 +01:00 |
|
Marc Zinnschlag
|
133e04a38e
|
Merge remote-tracking branch 'cc9cii/edit-ingredient'
|
2015-10-29 10:26:53 +01:00 |
|
scrawl
|
7692ae175a
|
Disable sun rendering on the reflection camera
Not needed, we have specular highlights.
|
2015-10-29 01:17:23 +01:00 |
|
scrawl
|
f336c6db87
|
Fix LightSource crash
|
2015-10-29 00:51:35 +01:00 |
|
scrawl
|
9b8e45fc01
|
Fix ripple particles z-fighting with the water surface
|
2015-10-29 00:28:09 +01:00 |
|
scrawl
|
d394b0793f
|
waterLevel fix
|
2015-10-29 00:27:42 +01:00 |
|
scrawl
|
c9d7078b4b
|
Water: add texture quality setting to the settings window
|
2015-10-29 00:27:42 +01:00 |
|
scrawl
|
60bc7dbabc
|
Improve MW_ComboBox skin
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
8cb2c7a9fb
|
Water: remove defunct "reflect <object type>" settings
Not really useful
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
8433e0679f
|
Water: connect to settings window
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
9f8d36b573
|
Water code cleanup
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
11c997d09d
|
Water: move reflection code to a new class
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
ebdf25ccb9
|
Water: move refraction code to a new class
|
2015-10-29 00:25:24 +01:00 |
|
scrawl
|
7bbdb13138
|
Remove debug code
|
2015-10-29 00:25:24 +01:00 |
|