Commit Graph

4241 Commits

Author SHA1 Message Date
Drake Arconis
7fa5abd4d1 Added NVAPI support on windows 2013-11-16 14:01:09 -05:00
Drake Arconis
924908f2ad Imported new revoke anim perms code and refactored related bits 2013-11-15 19:51:21 -05:00
Latif Khalifa
14c43aa9a2 Fixed camera pan 2013-11-14 20:36:07 +01:00
Latif Khalifa
f273d3ff59 Singularity 1.8.4 2013-11-14 12:51:41 +01:00
Latif Khalifa
1bd78c5398 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-14 02:51:36 +01:00
Shyotl
fc4f0eaa82 Particle glow tweak excluded more faces from glow than intended. 2013-11-13 19:39:14 -06:00
Salvatore La Bua
8ad3b87c0e Fix a render issue with Hightlight Transparent
The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
2013-11-13 21:16:58 +01: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
Shyotl
f03376cd2a Remove hack for nvidia on osx. 2013-11-13 12:53:43 -06:00
Inusaito Sayori
6bd9649277 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-11-13 13:03:27 -05:00
Damian Zhaoying
6e05e49a45 update spanish translations in strings.xml and floater_model_preview.xml files 2013-11-13 12:56:38 -03:00
Latif Khalifa
fcf061d06b Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-13 13:01:21 +01:00
Latif Khalifa
a3b232f389 Merge remote-tracking branch 'lightdrake/master' 2013-11-13 12:51:31 +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
ba84bf1461 Avoid needless second pass on non-glow particles. 2013-11-13 02:27:01 -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
Damian Zhaoying
899a21ca24 Merge remote-tracking branch 'Liru/master' 2013-11-12 16:09:05 -03:00
Inusaito Sayori
29a07f4b5c Actually fix the french translations (codepage borks yay) Thanks Nomade 2013-11-12 03:03:20 -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
Latif Khalifa
f10402cbdb Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-12 01:01:01 +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
3430a31e9d Fixed fetching inventory when UseHTTPInventory is disabled 2013-11-11 11:50:07 +01:00
Inusaito Sayori
943f77eed0 Fix the UI Warnings in LLFloaterModelPreview
Adds the green check and red x icons
Adds Price Breakdown text to the mesh upload floater, quite useful!

Removes useless ui element references in only code
Comments out ui element references in only code that we don't have and don't have a clear place
2013-11-10 19:12:20 -05:00
Damian Zhaoying
801723813a update spanish traslation to reflect new materials feature options 2013-11-10 17:39:51 -03:00
Inusaito Sayori
69f2203d11 The rest of the french updates from Nomade Zhao 2013-11-10 13:05:58 -05:00
Latif Khalifa
7879509727 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-10 11:14:08 +01:00
Shyotl
297cd58295 Revert upstream change to particle index accounting. (Fixes flicker issues) 2013-11-09 22:23:48 -06: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
c629d2625c Fixed Mac build 2013-11-07 04:35:39 +01:00
Latif Khalifa
27322c07db Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-11-07 02:01:35 +01:00
Aleric Inglewood
ee1ca0ed99 Compile fixes for windows(?) 2013-11-07 01:44:57 +01:00
Latif Khalifa
a7a2b0c227 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-11-07 01:07:21 +01:00
Latif Khalifa
1ab5c6a32a Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2013-11-07 01:07:14 +01: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
06186e6c7e [VarRegions] Pseudosupport for region_size_y. 2013-11-06 15:53:15 -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
Aleric Inglewood
254396596c Merge remote-tracking branch 'singu/master' 2013-11-05 22:40:08 +01:00
Aleric Inglewood
c516a71804 Move AIAlert* into namespace AIAlert and rename classes.
Instead of having several AI* classes, it turned out to be easier to
have a namespace: this allows me to define the classes in llcommon but
add (new) 'add' and 'add_modal' functions to 'AIAlert' in llui.
This is needed to avoid a collision with the 'add' functions in
LLNotificationsUtil.

The new add/add_modal makes it a lot easier to just show a caught
alert, prepending or appending new text: it turns out that that is
way more common then a re-throw.

Adjusted code as appropriate.
2013-11-05 22:30:02 +01:00
Aleric Inglewood
8ab9039ff6 Use " and ' instead of " and ' for new msgs in strings.xml.
Since it works... this might actually be better readable and therefore
easier to work with for the translators.
2013-11-05 18:10:05 +01: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
Inusaito Sayori
5a2ec28ddf Refactor panel_tools_texture.xml file in preparation to merge (nothing changed yet)
Pulled out defaulted/dead attributes, switched to v3 markup stylings.  Merged in some norspec comments.
2013-11-04 23:00:15 -05:00
Aleric Inglewood
1a9cf9b013 Bug fix for 54b43f1ad7
Initialize mLastSimAccess.
2013-11-05 03:55:40 +01:00