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

..

dictionaries

Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc

2011-09-02 04:07:39 -05:00

shaders

Merge remote-tracking branch 'upstream/master'

2013-11-03 12:17:50 -05:00

windlight

Remove executable bit from xml

2013-03-05 10:17:08 -05:00

anim.ini

Imported existing code

2010-04-02 02:48:44 -03:00

ao_template.ini

Whoops, missing AO files

2011-03-01 06:21:21 +01:00

CA.pem

Certificate update

2012-07-03 07:51:03 +02:00

client_tags_sg1.xml

Add Voodoo to tags.

2012-07-16 19:33:44 -04:00

cmd_line.xml

Fix handle_secondlifeprotocol.sh, and sync with v-d.

2012-11-06 18:50:45 -05:00

default_grids.xml

Remove executable bit from xml

2013-03-05 10:17:08 -05:00

grass.xml

Fix the grass.xml so that they don't have odd names that show up in the UI.

2011-10-04 06:08:32 +02:00

high_graphics.xml

Enable Hardware Skinning by default for med/high/ultra settings.

2012-01-28 22:11:51 -06:00

keys.ini

Renewed support for / starting chat on linux.

2012-02-06 15:30:27 -05:00

keywords.ini

Bug fix? Prevent squares showing up on windows by only using spaces in keywords.ini

2013-09-29 13:33:44 -04:00

logcontrol.xml

Don't log debug level info during shader loading

2013-10-15 07:23:23 +02:00

low_graphics.xml

Reverted Objects LOD slider max value to 2 and fixed presets values for the Trees LOD slider according to the new maximum

2013-09-22 22:33:09 +02:00

lsl_functions_os.xml

Fix for WordFromTheWise's missing lsl strings issue.

2012-12-30 16:09:08 -05:00

lsl_functions_sl.xml

Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on)

2013-07-17 12:59:01 -04:00

mid_graphics.xml

Reverted Objects LOD slider max value to 2 and fixed presets values for the Trees LOD slider according to the new maximum

2013-09-22 22:33:09 +02:00

mime_types.xml

Apparently some of those is needed on Windows, and it was shoddy

2011-05-08 00:51:00 +02:00

settings_ascent_coa.xml

Feature Request: Make the map dot color for everyone else customizable

2013-08-28 03:29:57 -04:00

settings_ascent.xml

Feature request: Hang onto last values for Ease In and Ease Out for future animation uploads (Issue 984)

2013-08-20 06:09:07 -04:00

settings_crash_behavior.xml

Breaking pad: more cmake fun

2013-10-03 06:09:49 +02:00

settings_files.xml

This should fix the settings

2011-08-11 00:53:17 +02:00

settings_per_account_ascent.xml

Chat Frosting

2013-05-11 22:36:46 -04:00

settings_per_account.xml

User-configurable log filename date formatting (When using "Append date to log filename")

2013-08-15 23:25:00 -04:00

settings_rlv.xml

Moved RLVa menu back to advanced by default

2013-02-04 00:47:19 +01:00

settings_sh.xml

Temporary super-obsessive audioengine debugging/diagnostics.

2013-06-04 04:39:51 -05:00

settings.xml

Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature

2013-10-22 07:47:43 -04:00

static_data.db2

Static VFS from V2 - incl new walks!

2011-03-11 00:20:18 +01:00

static_index.db2

Static VFS from V2 - incl new walks!

2011-03-11 00:20:18 +01:00

std_bump.ini

Imported existing code

2010-04-02 02:48:44 -03:00

trees.xml

Played with trees!

2010-11-17 03:51:58 -06:00

ultra_graphics.xml

Reverted Objects LOD slider max value to 2 and fixed presets values for the Trees LOD slider according to the new maximum

2013-09-22 22:33:09 +02:00

viewerart.xml

Imported existing code

2010-04-02 02:48:44 -03:00