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

5146 Commits

Author SHA1 Message Date
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
8ed527af24 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-02 12:46:16 +01:00
Shyotl
77eb928380 Add LLGLManager::mIsMobileGF 2013-11-02 03:33:21 -05: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
Latif Khalifa
b9c487a0c7 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-11-01 22:50:22 +01:00
Inusaito Sayori
96e8f37c81 The rest of some touchups to wlf xml for nicer alignment of elements 2013-11-01 17:43:32 -04:00
Inusaito Sayori
0fc9d540bf Feature Request: Add Camera preset switching functionality (part of quicksettings) 
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
 2013-11-01 17:35:12 -04:00
Latif Khalifa
1f587d1ad1 Don't crash when trying to export linked parts 
Fixes issue #1176
 2013-11-01 22:34:55 +01:00
Inusaito Sayori
2d421a27e1 Let Ctrl/Shift + scrollwheel changing the camera/focus offsets affect the current preset's setting, not the back preset. 2013-11-01 16:56:55 -04:00
Inusaito Sayori
3934e0c9d3 Fix Issue 1163: Mouselook zoom (silly control group confusion) 2013-11-01 11:18:12 -04:00
Inusaito Sayori
ba1a29aae2 French Translation updates! Provided by Nomade Zhao 2013-11-01 02:56:21 -04:00
Latif Khalifa
3d47d6f0dc Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-10-31 16:39:08 +01:00
Latif Khalifa
5583445c4d Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-31 16:38:40 +01:00
Latif Khalifa
78843493cc Syntax error fix 2013-10-31 03:31:12 +01:00
Latif Khalifa
fcfffbb322 breakpad filter signature is different on windows compated to other platforms 2013-10-31 02:51:58 +01:00
Aleric Inglewood
e4b35a050d This makes more sense 2013-10-31 02:38:23 +01:00
Aleric Inglewood
8506a16dcb Merge remote-tracking branch 'singu/master' 2013-10-31 02:19:37 +01:00
Latif Khalifa
8dab5df746 Revert "Prevent LLFace::getGeometryVolume from overwriting vbos past their end." 
This reverts commit 02067f973e.
 2013-10-31 02:10:57 +01:00
Aleric Inglewood
811191cc7c Merge remote-tracking branch 'singu/master' 2013-10-30 21:57:39 +01:00
Aleric Inglewood
a9972bbf02 Suppress spammy warning (debug mode) 2013-10-30 20:32:22 +01:00
Latif Khalifa
51d5984afa Allocate half a megabyte that is freed just before minidump is written in the breakpad exception handler (Siana) 2013-10-30 19:10:17 +01:00
Latif Khalifa
f1eab3f2c5 Added architecture fields to the crash report 2013-10-30 19:09:05 +01:00
Andros Baphomet
c009866d86 Merge remote-tracking branch 'upstream/master' 2013-10-30 09:42:58 -04:00
Inusaito Sayori
73cb43e71f [Warnings] Fix ..\..\libhacd\hacdRaycastMesh.cpp(109): warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) 
All the other involved types are of size_t, so static_cast 1 should work here.
 2013-10-30 08:40:47 -04:00
Inusaito Sayori
b34a8db34a Modernize constructor of LLPreviewSound and cure crash signature 314 2013-10-30 08:37:20 -04:00
Damian Zhaoying
9be72ffb47 add spanish translation for prefs editor open log in windows option 2013-10-30 05:01:12 -03:00
Latif Khalifa
e6f70a0864 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-10-30 05:24:53 +01:00
Latif Khalifa
0933b8c43d Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-10-30 05:24:31 +01:00
Melanie
dfc965954e Remove attachments from the avatar's attached list before destroying them. 
This should prevent the idle callbacks from accessing deleted attachments when looking for the CCS signature.
 2013-10-29 22:26:58 +01:00
Latif Khalifa
02067f973e Prevent LLFace::getGeometryVolume from overwriting vbos past their end. 
Possible fix for a crash in LLFace::getGeometryVolume()
Patch by NickyD/Firestorm
Crash signature: 14 and 20
 2013-10-29 16:29:59 +01:00
Inusaito Sayori
ec4679c2a8 Fix the bug in which right click and then delete key would no longer work to delete objects 
Navigation handling without a currently selected menu entry now only happens if key is up or down arrow
(mind the space changes)
 2013-10-29 06:25:22 -04:00
Latif Khalifa
bdcc4189be Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-28 22:22:29 +01:00
Latif Khalifa
6b2628db44 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-10-28 22:22:22 +01:00
Latif Khalifa
664d5ab7fc Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-28 22:22:14 +01:00
Latif Khalifa
2c1512dcbe Try finding FMOD Ex from registry intall path instead of hard coded location 2013-10-28 20:38:51 +01:00
Latif Khalifa
d8728f17ee Don't install 64 bit viewer on 32 bit OS 2013-10-28 20:23:35 +01:00
Inusaito Sayori
8670f45287 Fix mouselook crosshair drawing properly 2013-10-28 12:22:58 -04:00
Aleric Inglewood
aa5bc7bc25 Compile fix (libcwd) 2013-10-27 15:14:11 +01:00
Shyotl
5e8c7264da Fix artifacts from local stash merge. 2013-10-26 19:58:54 -05:00
Shyotl
6474568125 Call updateLOD when geom enters rigged state. 2013-10-26 19:09:43 -05:00
Shyotl
c1feb11d98 SH-3860. Cloud on first load issue. I'm sure the inaccessible jira has more details... 2013-10-26 18:56:39 -05:00
Shyotl
edf75a7174 setCommitOnReturn moved to from llbutton to lluictrl, cleanup some focus/key handling, avoid needless reshape calls. 2013-10-26 18:12:56 -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
574022ed2c Made a few more fullbright face types occlude any glow behind them. 2013-10-26 18:01:36 -05:00
Shyotl
fc04f6b2e1 Added handling of GL_LUMINANCE pixel format to setManualImage. Was missing, although GL_LUMINANCE_ALPHA and GL_ALPHA were handled. 
Also added missing file hurr.
 2013-10-26 16:42:41 -05:00
Shyotl
7c7c64bde3 Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw 2013-10-26 16:39:31 -05:00