Commit Graph

1786 Commits

Author SHA1 Message Date
Shyotl
ee5a9c97be Removing some shader warnings under gl 3.x context. 2011-11-07 16:43:30 -06:00
Shyotl
2126654979 Nuked some old redundant camera code. 2011-11-07 16:42:41 -06:00
Shyotl
df40a8c5cf Fade 'Press ESC to leave mouselook' away after a while. 2011-11-07 16:42:22 -06:00
Shyotl
40689f7d1e Fixed silly movement bug after taking high-res snapshots. 2011-11-06 16:29:43 -06:00
Shyotl
b64cb8d339 Lineending fixup 2011-10-31 20:44:43 -05:00
Shyotl
3891928092 vary_texture_index only needed in shaders when batching. 2011-10-31 20:44:33 -05:00
Shyotl
f5983208eb Hide the mouse cursor a bit better when grabbing items in mouselook. 2011-10-31 20:44:27 -05:00
Shyotl
0ef5931212 Added a bit of debug output for viewer tool states. 2011-10-31 20:43:56 -05:00
Shyotl
6964cec6f1 Merge branch 'master' of git://github.com/siana/SingularityViewer.git into future 2011-10-31 20:41:36 -05:00
Siana Gearz
f386fc75df Did SELinux complain about THIS? 2011-10-31 05:24:00 +01:00
Siana Gearz
cc45a24aff Darwin doesn't use extension function pointer mechanism 2011-10-28 02:05:09 +02:00
Siana Gearz
e06d0b2e70 Whoopsie! 2011-10-27 23:02:35 +02:00
Siana Gearz
0281ac4afe There is no glext prebuilt on OS X 2011-10-27 22:39:28 +02:00
Brett Murphy
7227c01d79 updated install.xml with correct freetype package for mac-osx 2011-10-27 22:35:38 +02:00
Brett Murphy
c5abde1616 added ctrl-alt-p option for phantom avatar 2011-10-27 22:32:38 +02:00
Siana Gearz
c2a4951f20 Fix grid info fetch ignoring certificates 2011-10-26 21:35:19 +02:00
Shyotl
0fde15246b Moved some settings out of the main settings.xml and into settings_sh.xml where they belong. 2011-10-22 01:57:39 -05:00
Shyotl
b3423de80a Shaders dumped to logs/shader_dump directory if 'ShyotlDumpRawShaders' is true, or a shader throws an error of some sort. 2011-10-22 01:55:08 -05:00
Siana Gearz
743449e635 Tinies, custom OpenAL on Linux 2011-10-22 05:09:49 +02:00
Shyotl
405182025d Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too. 2011-10-21 21:46:35 -05:00
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