Latif Khalifa
fcf061d06b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-13 13:01:21 +01:00
Shyotl
3416b837dc
Added setting 'SHAlwaysSoftenShadows' to soften shadows when ssao isn't enabled. Removed a couple dead settings.
2013-11-13 02:31:55 -06:00
Latif Khalifa
7879509727
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-10 11:14:08 +01:00
Shyotl
0d1c98b5f7
Fix shadow dithering. It's still pretty ugly tho, but looks okay if ssao is enabled. May add random kern in the future.
2013-11-08 02:03:21 -06:00
Inusaito Sayori
cb0cc571ee
Mats UI.
...
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter()
Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding)
Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors.
Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream.
Translators:
panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed.
strings.xml now has "use_texture" string.
notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
2013-11-06 17:39:04 -05:00
Shyotl
6bbb24b974
Revert occlusion changes to try and pinpoint flicker issue.
2013-11-02 22:43:11 -05:00
Shyotl
827bbc9b89
Fix up a few glowies.
2013-11-02 19:15:28 -05:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Shyotl
5e8c7264da
Fix artifacts from local stash merge.
2013-10-26 19:58:54 -05:00
Shyotl
30c5b9514e
Let the rendertarget dictate internal format when resizing.
2013-10-26 18:09:34 -05:00
Shyotl
8e55d5499e
Occlusion FBOs in deferred.
2013-10-26 18:07:56 -05:00
Shyotl
8441bc80a4
Use LLStaticHashedString for faster uniform lookup.
2013-10-26 16:26:46 -05:00
Shyotl
e2954fdbfd
Fixed a bug where multisampled renderbuffers were being attached to non-FBO-enabled LLRenderTargets.
2013-10-18 01:43:32 -05:00
Siana Gearz
19625ea6b8
MAINT-2968 disable client GL namegen, go spec
2013-10-13 17:07:45 +02:00
Shyotl
7a913af2c7
Use camera enums instead of magic numbers.
2013-10-09 16:09:09 -05:00
Shyotl
e96caa78a1
Removed a little bit of unnecessary code from pipeline.cpp
2013-10-09 15:45:33 -05:00
Shyotl
b6bf5545c9
Change lightfunc from GL_R8 to GL_R16F/R32F
2013-10-09 15:44:15 -05:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
Latif Khalifa
bde1ce7577
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-07-31 01:53:58 +02:00
Shyotl
8e40d6b52c
Added some missing drawpool determination logic pertaining to face materials.
2013-07-29 19:39:59 -05:00
Shyotl
44909af372
Removed CLEAR_INVISIBLE drawable flag.
2013-07-29 19:32:15 -05:00
Shyotl
45b85070f3
A bit of harmless cleanup, null checking, nan checking. Removed sphericalProjection and cylindricalProjection from llface (broken/dead).
2013-07-29 19:23:30 -05:00
Aleric Inglewood
1475832617
Crash fix in LLPipeline::renderDeferredLighting
2013-07-26 17:32:03 +02:00
Lirusaito
d4bed6382c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
2013-06-23 02:25:15 -04:00
Aleric Inglewood
e59cefa0cc
Bug fix of LLPipeline::setRenderDebugFeatureControl
...
This commit has no effect on how the viewer behaves currently.
2013-06-07 16:19:46 +02:00
Shyotl
ef3e918558
Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!
2013-05-31 05:33:41 -05:00
Shyotl
182b15aee5
Forgot to put changes to pipeline.cpp into the previous vbo commit. Oh well.
2013-05-16 01:59:15 -05:00
Shyotl
be29088103
Bad merge introduced superfluous drawable clearstate call.
2013-05-15 22:47:56 -05:00
Shyotl
e8ce35ebf8
Merge branch 'master' into UICleanup
...
Conflicts:
indra/llcommon/llstl.h
indra/newview/jcfloaterareasearch.cpp
indra/newview/jcfloaterareasearch.h
indra/newview/llfloateranimpreview.cpp
indra/newview/llfloateranimpreview.h
indra/newview/llfloaterperms.cpp
indra/newview/llfloaterproperties.cpp
indra/newview/llpanelpermissions.cpp
indra/newview/llviewermenu.cpp
2013-05-03 21:41:51 -05:00
Shyotl
532fc68657
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-05-03 15:36:05 -05:00
Shyotl
ef9fbe2193
Attempt to speed up agent idle update by optimizing wearable/visualparam related lookups/iterations a bit more.
...
Generalized several templates in llstl.h in order to support more containers.
Removed several instances of is_in_map/getWearableCount being followed immediately by another lookup with the same key. find is more efficient, as we get an iterator to use instead of a simple boolean.
2013-04-24 17:52:17 -05:00
Latif Khalifa
e0077b6941
Merge remote-tracking branch 'lirusaito/master'
...
Conflicts:
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
2013-04-23 12:17:08 +02:00
Shyotl
c9f93a82ce
Improved the logic in LLPipeline::updateDrawableGeom a bit.
2013-04-20 01:02:40 -05:00
Shyotl
7863484f10
Less prim peekaboo antics.
2013-04-18 17:25:27 -05:00
Shyotl
733b8e75ac
Less prim peekaboo antics.
2013-04-18 23:44:25 +02:00
Shyotl
d1e86e66d8
Less prim peekaboo antics.
2013-04-17 22:32:53 -05:00
Lirusaito
8c49716eae
Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
...
Conflicts:
indra/newview/llviewerwindow.cpp - Also two compile fixes.
2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f
Cleanup and Synchronization (pre-merge wrap-up commit)
2013-04-10 09:14:16 -04:00
Shyotl
b07ab02f54
Added blendfunc checks when RenderDebugGL is TRUE.
2013-03-30 01:26:07 -05:00
Shyotl
1965224912
Stabbed some blendfunc state issues. This fixes some ui flicker which popped up recently (perhaps after merging, or I just never noticed it before then)
2013-03-30 00:57:49 -05:00
Lirusaito
c2b3322594
Pathfinding UI: Hide Capsule doesn't seem to work without havok
2013-03-20 08:30:36 -04:00
Lirusaito
78e1804381
Add Pathfinding UI from v3
...
Added libpathing to LLPHYSICSEXTENSIONS_INCLUDE_DIRS
llviewermenu updated a bit to be closer to v-d/rlva. Best viewed without space changes.
Updated llresmgr.cpp from v-d to "handle special case of input value being zero"
pipeline update: hideObject, restoreHiddenObject, hideDrawable, and unhideDrawable added.
Thanks to Henri Beauchamp for some UI code touchups, thanks to Zi Ree for Rebake notification.
Thanks to Mobius Ryba and Ansariel Hiller for the V1-style pathfinding icons.
Note: When opening from pie menu object selection is lost, unless the floater is already open..
This provides a more reliable reproduction of the bug we've been having with inspect.
2013-03-08 03:17:11 -05:00
Drake Arconis
b800320a49
Remove LLMemType and related files
2013-03-04 12:02:01 -05:00
Shyotl
fd21197d2a
Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot
2013-02-25 12:59:17 -06:00
Shyotl
c92c68dee2
A few more preview-related changes.
2013-02-12 15:07:07 -06:00
Shyotl
1069d5dec4
Draw trees before sky. Z-cull may be beneficial. Also, was incorrectly setting alphawrite off for deferred wlsky pass.
2013-02-01 17:16:01 -06:00
Shyotl
26de17f2de
Avoid occasional DoF-related crash upon region disconnection.
2013-01-30 22:04:57 -06:00
Shyotl
e622e03d2a
Bulk of server-baking impelmentation and a bit of cleanup.
2013-01-13 02:37:12 -06:00
Shyotl
3750123e43
Obsessive excessive clearing of glow rendertargets, as they still occasionally act weird.
2012-12-19 19:08:10 -06:00
Shyotl
806abb1985
Reduce required number of glow rendertargets by 1...
2012-12-10 01:31:57 -06:00