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

1766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
bd6d14d741 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-10-22 01:17:59 +02:00
Shyotl
0e190cadcd LLWorld::destroyClass() wasn't releasing water texture refs. 2011-10-21 15:26:59 -05:00
Shyotl
408f5a4a51 SH-2564. Testing region visibility driven by spatial partitions. 2011-10-21 15:26:27 -05:00
Shyotl
53f5957b92 Animated faces with bumpmapping now behave as expected. 2011-10-21 15:03:46 -05:00
Shyotl
fb32a0be5a Failed to start tracking a new icon. (Inv_Invalid.png) 2011-10-21 14:52:13 -05:00
Shyotl
474e1ec7cc Particles (including clouds) vectorized a bit more. 2011-10-21 14:50:55 -05:00
Siana Gearz
1e9d09b82e Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llinventoryicon.cpp
 2011-10-21 05:37:07 +02:00
Siana Gearz
c3b1bf4b76 Actually, tga loads more rapidly for some reason 2011-10-21 05:35:33 +02:00
Shyotl
e2d9c31f5e Fixed inventory icons for shirt and physic wearables. 2011-10-20 22:24:58 -05:00
Siana Gearz
7b81e9d248 Merge branch 'master' of github.com:siana/SingularityViewer 2011-10-21 04:56:21 +02:00
Siana Gearz
6e6c438e2a Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-10-21 04:55:08 +02:00
Siana Gearz
4606c7512e Icon mishaps, thx Cryo for spotting. +Standalone fix 2011-10-21 04:54:55 +02:00
Shyotl
88e373c960 The copy button in the face edit panel saves the texture params to a non-existant saved setting for some reason. This throws a crasloop prompt. Setting is never read back, so just commenting out this line. 2011-10-20 19:29:51 -05:00
Siana Gearz
f2deb39dac Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/lldrawpoolbump.cpp
 2011-10-21 01:42:12 +02:00
Shyotl
8a5793ce23 Selected face overlay no longer z-fights with the selected prim face. 2011-10-20 16:23:28 -05:00
Shyotl
c63bf31328 I don't trust this statement to work without the parentesis. 2011-10-20 13:46:56 -05:00
Shyotl
5d811163a6 gDeferredShadowAlphaMaskProgram should be unbound after renderpass 2011-10-20 13:45:28 -05:00
Shyotl
78a98cbf08 Bump shader needs to have texture0 sample assigned to index0, and texture1 as index1. Confirmed in LLDrawPoolBump::bindBumpMap. (This probably isn't required yet, but appears safe) 2011-10-20 13:45:00 -05:00
Shyotl
91348909b5 Shuffled gObjectSimpleWaterProgram and gObjectSimpleAlphaMaskProgram around 2011-10-20 13:43:25 -05:00
Shyotl
73f2543a6f Use LLGLShader::sIndexTextureChannels instead of mNumTextureImageUnits directly.. also check that channel value isn't invalid. Also make super-sure shaders are disabled on pre opengl 2.0 hardware. 2011-10-20 13:37:09 -05:00
Shyotl
22385c44c8 Make legacy renderpath a bit more strict. 2011-10-20 13:30:29 -05:00
Shyotl
40261d3472 Invalid texunit was still bound after bumpmapping finished 2011-10-20 13:26:08 -05:00
Siana Gearz
06ff562cd2 Added Mobility Radeon 6 series 2011-10-20 20:23:29 +02:00
Siana Gearz
3e12fe15bc Version 1.6.0(2) 1.6.0.2 2011-10-20 18:44:21 +02:00
Siana Gearz
95634e8276 Don't know why exactly this works, but fixes noshader and seems safe. 2011-10-20 13:10:11 +02:00
Siana Gearz
6c19346855 Bug fixing the repackager 2011-10-20 13:09:30 +02:00
Siana Gearz
68e143de1b Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-10-19 18:11:58 +02:00
Shyotl
5d6aadb268 Prevent estimated vram value from being clobbered if glGetIntegerv memory query returns something too small. 2011-10-19 09:53:44 -05:00
Shyotl
4368c57243 Disabled reserved attrib having reserved locations in shaders. Conflicted with attrib location assumptions elsewhere. 2011-10-19 09:43:28 -05:00
Siana Gearz
ef54491760 GCC 4.6.1 fix 2011-10-19 05:33:09 +02:00
Shyotl
d88f696604 Brought over LLInventoryIcon 2011-10-18 19:44:08 -05:00
Shyotl
82b0171a86 Workaround for mac startup hardlock. (STORM-1641) 2011-10-18 09:33:20 -05:00
Siana Gearz
142427b3e1 Version 1.6.0(1) 1.6.0.1 2011-10-18 04:17:31 +02:00
Siana Gearz
9c4d50eda3 Fix adding foreign grids 2011-10-18 04:16:17 +02:00
Siana Gearz
f3c8419de8 GCC 4.3 wasn't happy 2011-10-18 04:15:08 +02:00
Siana Gearz
d6524fbd26 Merge branch 'future' of git://github.com/Shyotl/SingularityViewer 2011-10-18 02:29:49 +02:00
Shyotl
4446b0fbad Give each reserved attribute a consistent index across all shaders. 2011-10-17 19:19:36 -05:00
Shyotl
58ea5f88dc Spew llinfos for opengl procs that aren't found. 2011-10-17 19:06:22 -05:00
Shyotl
8ce30e9ff7 Fixed a crash for hardware lacking ARB_shader_objects extension support. 2011-10-17 19:05:37 -05:00
Shyotl
67230a3290 Line-ending fixup. 2011-10-17 14:11:30 -05:00
Shyotl
c413d62536 Decouple RenderUseFBO from RenderDeferred, as toggling deferred would leave RenderUseFBO enabled regardless of previous setting. 2011-10-17 14:11:10 -05:00
Shyotl
d1b19aa389 Automatically disable new texture batching when using legacy renderpath. 2011-10-17 12:19:43 -05:00
Shyotl
06048ae818 Fixed avatars being invisible when using legacy path. Assumption of no shader use when LLGLSLShader::sNoFixedFunctionis false is not valid with Singularity. 2011-10-17 12:16:57 -05:00
Shyotl
18e5b94615 Shouldn't need this glFinish as SwapBuffers does the same thing. 2011-10-17 12:12:47 -05:00
Siana Gearz
df3d30acd9 Version 1.6.0.0 1.6.0 2011-10-17 03:56:47 +02:00
Shyotl
02b58694bb A required hack to LLMediaCtrl due to our LLPanel behaving far too differently right now. (Clicking isn't passed through like it should, and LLMediaCtrl is not currently parsing xml files so postBuild is not called.) 2011-10-15 01:21:10 -05:00
Shyotl
4987bceb61 Navigation buttons now using icons for 'showcase' and 'all' search panels. 2011-10-14 23:58:54 -05:00
Shyotl
ae0196e2c3 Inconsistent line endings in newview/llviewermessage.cpp 2011-10-14 23:15:28 -05:00
Shyotl
04828032f6 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into future 2011-10-14 22:59:03 -05:00
Shyotl
e432943781 Nullcheck in LLMenuItemBranchDownGL::setHighlight (getBranch()) 2011-10-14 22:58:27 -05:00