Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,513 Commits 20 Branches 51 Tags
e2c8e4950dad60df6f7928452aa032cbcdb59016
Commit Graph

746 Commits

Author SHA1 Message Date
Latif Khalifa
e2c8e4950d Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-26 11:15:48 +01:00
Inusaito Sayori
4c1880acac Default legacy log launch to on, and limit it to platforms it works on(windows) at compile time. 2013-11-26 04:49:37 -05:00
Siana Gearz
f23dc157be Prevent accidental modification of vital stock grid 2013-11-20 05:49:43 +01:00
Latif Khalifa
594eacb480 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-19 04:44:55 +01:00
Shyotl
030588caaf Underwater shadows. 2013-11-18 09:57:35 -06:00
Siana Gearz
a5103a1fc1 Sprinkle some Intel GPU support on Linux 2013-11-18 04:22:21 +01:00
Siana Gearz
749d0eec28 Merge https://github.com/abaph/SingularityViewer 
Brings in support for MESA accelerators.
 2013-11-17 16:38:06 +01:00
Drake Arconis
924908f2ad Imported new revoke anim perms code and refactored related bits 2013-11-15 19:51:21 -05:00
Latif Khalifa
133dffb326 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-13 20:12:25 +01:00
Shyotl
d4a3cb168c Altered the deferred alpha fragment shader to handle alphamasking when drawing avatar hair/skirts. (Special handling for these two seems weird, considering all other mesh parts are also alphamasked.. It also prevents skirts from casting shadows. Future alteration may be desired.) 2013-11-13 12:59:21 -06:00
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
Shyotl
3ed249cba5 Retain cubemap reflection on shiny faces while in shadowed, but don't bloom the sun reflection. 2013-11-13 01:35:31 -06:00
Shyotl
584e5176a4 Err closer to LL regarding shadows, however also fixed alpha face shadows to look like all other shadows. 2013-11-13 01:30:45 -06:00
Drake Arconis
e5fcd54c92 Add option to disable scroll offset changing modifier 2013-11-12 23:47:28 -05:00
Latif Khalifa
6b5875c008 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-12 02:00:53 +01:00
Shyotl
203ae9dfa3 Fix uninitialized variable warning in alphaF.glsl. Also made USE_VERTEX_COLOR actually work if FOR_IMPOSTOR is set. 2013-11-11 18:56:16 -06:00
Latif Khalifa
00b57dd40e Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-12 01:01:10 +01:00
Shyotl
32ecf444bd Attempt to resolve shader compilation errors on osx since it's particularly picky. 2013-11-11 17:48:54 -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
Latif Khalifa
2234e95d5c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-07 01:06:53 +01:00
Inusaito Sayori
511b0cfb9c ContextMenu Support! 
LLContextMenu functionality pulled out of LLPieMenu, PieMenu is now derived from LLContextMenu
- The more attribute boolean of pie_menu element determines whether or not to have an actual submenu if it's not a pie, defaults to false which means actual submenu..
-- in the future we may want to have more more="true" depending on feedback
- Pie menu labels now dynamically get " >" appended to them (avoids stupid looking context menus)
- Positioning logic combined in part, mostly conditional still, in the future we could probably combine it more.
- handleHoverOver function combines common functionality between context and pies given an item and hover mouse coords.

LiruUseContextMenus debug setting determines which to use, default is pie, of course
- Context(/Pie) Menus are rebuilt when the setting changes value
-- this is safe at any point because all startup states have been accounted for
- "Use context menus instead of pie menus" added to System->General preferences (it's close to the bottom)
 2013-11-06 18:47:02 -05: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
Inusaito Sayori
659874dce0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-06 01:10:47 -05:00
Shyotl
322ceceb60 Added shaders needed to display texture 'edit' overlay using the specular/normalmap texcoords. 2013-11-05 23:51:09 -06:00
Latif Khalifa
d8db37f3fb Simplify tag decoding, 
Disable showing other's tags by default as it appears broken in most viewers
 2013-11-05 07:25:11 +01:00
Latif Khalifa
7ffb751ead In preparation to release, change defalt for crash reporting to 'Ask' 2013-11-05 02:35:08 +01:00
Andros Baphomet
997fdebb9f Re-fix shader compilation errors 2013-11-03 13:12:27 -05:00
Andros Baphomet
fe0a761ce6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
	indra/newview/app_settings/shaders/class1/deferred/giF.glsl
	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
 2013-11-03 12:17:50 -05:00
Latif Khalifa
232b1cf28c Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-03 04:56:31 +01:00
Shyotl
827bbc9b89 Fix up a few glowies. 2013-11-02 19:15:28 -05:00
Latif Khalifa
8ed527af24 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-02 12:46:16 +01:00
Shyotl
378dd14ade Return to our nice ssao. 2013-11-02 03:29:32 -05:00
Shyotl
e5d71560e8 Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes. 2013-11-02 02:38:23 -05:00
Latif Khalifa
824f23082b Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-02 07:25:36 +01:00
Shyotl
af8f8bb040 Mats. 2013-11-02 01:20:05 -05:00
Andros Baphomet
c009866d86 Merge remote-tracking branch 'upstream/master' 2013-10-30 09:42:58 -04:00
Latif Khalifa
bdcc4189be Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-28 22:22:29 +01:00
Shyotl
8e55d5499e Occlusion FBOs in deferred. 2013-10-26 18:07:56 -05:00
Shyotl
574022ed2c Made a few more fullbright face types occlude any glow behind them. 2013-10-26 18:01:36 -05:00
Inusaito Sayori
9ec10cf246 Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature 
Switches to exodus implementation
Includes relicensing of LLViewerCamera and LLToolComp
Maintains use of the old saved zoomed setting
 2013-10-22 07:47:43 -04:00
Inusaito Sayori
dde18dfc0f Added a setting, LiruMouselookMenu, in case people don't want this feature. 2013-10-21 16:01:31 -04:00
Andros Baphomet
c264607207 Merge remote-tracking branch 'upstream/master' 2013-10-19 10:03:17 -04:00
Latif Khalifa
897392f7e0 Don't log debug level info during shader loading 2013-10-15 07:23:23 +02:00
Andros Baphomet
12abca8954 Merge remote-tracking branch 'upstream/master' 2013-10-12 01:50:26 -04:00
Inusaito Sayori
d503662b58 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-10-10 04:41:08 -04:00
Inusaito Sayori
13e25cfe6a Feature Request: Add MiniMapPrimMaxAltitudeDelta and MiniMapPrimMaxAltitudeDeltaOwn to debug settings for users to configure how much altitude difference prims can have to be shown on the minimap 2013-10-10 04:29:12 -04:00
Inusaito Sayori
9e312a3808 [LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls 2013-10-10 02:27:26 -04:00
Latif Khalifa
d98402b13f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvotree.h
 2013-10-10 00:03:36 +02:00