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

..

aistatemachine

Compile fix (libcwd)

2013-10-27 15:14:11 +01:00

cmake

Try finding FMOD Ex from registry intall path instead of hard coded location

2013-10-28 20:38:51 +01:00

copy_win_scripts

…

cwdebug

Add AIStateMachine::mSMDebug

2013-10-15 22:29:52 +02:00

lib/python

WIP[win64]: installer

2013-10-22 00:59:26 +02:00

libhacd

[Warnings] Fix ..\..\libhacd\hacdRaycastMesh.cpp(109): warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)

2013-10-30 08:40:47 -04:00

libndhacd

Sanitize cmake, cleanup develop.py

2013-05-06 06:07:23 +02:00

libopenjpeg

…

libpathing

Compile fix for libcwd.

2013-05-25 03:19:33 +02:00

llappearance

MAINT-2968 disable client GL namegen, go spec

2013-10-13 17:07:45 +02:00

llaudio

Merge branch 'windows64' of github.com:lkalif/SingularityViewer

2013-10-24 01:37:45 +02:00

llcharacter

Fix for crash report 1272

2013-10-11 13:35:32 +02:00

llcommon

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2013-10-31 16:38:40 +01:00

llimage

Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw

2013-10-26 16:39:31 -05:00

llimagej2coj

Texfetch/cache changes:

2013-09-23 17:19:44 -05:00

llinventory

First attempt to deal with broken (pre multiwear) inventory items.

2013-08-18 02:50:31 +02:00

llmath

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2013-11-02 07:25:36 +01:00

llmessage

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2013-11-02 07:25:36 +01:00

llplugin

WIP[win64]: it builds, runs. webkit disabled in cmake for now

2013-10-20 17:03:48 +02:00

llprimitive

Mats.

2013-11-02 01:20:05 -05:00

llqtwebkit

…

llrender

Merge remote-tracking branch 'upstream/master'

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

llui

Fix the bug in which right click and then delete key would no longer work to delete objects

2013-10-29 06:25:22 -04:00

llvfs

Separate out the cache directory for windows 64

2013-10-24 10:24:18 +02:00

llwindow

WIP: native win64 support

2013-10-20 12:37:35 +02:00

llxml

Wearable export improvements.

2013-07-19 21:22:59 +02:00

lscript

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

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

newview

Merge remote-tracking branch 'upstream/master'

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

plugins

WIP[win64]: we haz 64 bit webkit

2013-10-21 20:42:31 +02:00

test

…

test_apps/llplugintest

…

tools/vstool

Added support for Visual Studio 2012 to develop.py and VSTool

2013-10-19 21:10:24 +02:00

CMakeLists.txt

Breakpad: Commence nuclear bombardment of the unused stuff

2013-10-01 23:41:38 +02:00

develop.py

WIP win64 support

2013-10-19 23:05:53 +02:00