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
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
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
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
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
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
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
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
51e40cf1b8
Water: minor shader cleanup
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
700a0099c3
Remove debug code
2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
2015-10-29 00:25:23 +01:00
Alexander "Ace" Olofsson
4ddb2feebb
Let's try building everything, see how far we get
2015-10-28 17:35:16 +01:00
Alexander "Ace" Olofsson
0d2bd31f8b
Merge branch 'master' into appveyor
2015-10-28 14:50:20 +01:00
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
2015-10-28 23:33:24 +11:00
