Commit Graph

1853 Commits

Author SHA1 Message Date
Siana Gearz
10bc483305 Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer 2011-12-24 09:00:03 +01:00
Siana Gearz
f55fa45b73 No more spammy spam from inventory view, mini update to V3 2011-12-24 08:56:58 +01:00
Siana Gearz
acb24dd3e1 Some Resident scrubbing from IM headers, a-la V3 2011-12-24 08:56:20 +01:00
Siana Gearz
a57ac5a954 Make OpenJPEG respect our build settings 2011-12-23 23:23:55 +01:00
Siana Gearz
29045609a3 Attempt to fix linking on newer linux 2011-12-23 18:31:47 +01:00
TighMacFanatic
6b1f44ed6d Fix for a rare error involving llSetPayPrice being used on a child prim. 2011-12-16 18:59:53 -05:00
TighMacFanatic
ab8cd3e5d5 #endif location fix 2011-12-16 18:44:51 -05:00
TighMacFanatic
e08e8cf131 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-12-03 13:03:39 -05:00
Siana Gearz
40b4b47023 Silly build fix 2011-12-03 18:52:04 +01:00
TighMacFanatic
2565caf62a Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-12-03 11:52:29 -05:00
Siana Gearz
d63df79b85 Adding Neck and Root attachment points 2011-12-03 03:51:15 +01:00
Siana Gearz
697dd7e929 Preparing to add mesh upload. 2011-12-03 03:43:23 +01:00
TighMacFanatic
f613be9276 Added new water windlight 2011-12-02 10:41:53 -05:00
TighMacFanatic
f5a08b1c12 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-12-01 12:13:56 -05:00
TighMacFanatic
f40bbb1602 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2011-12-01 12:13:42 -05:00
Siana Gearz
aeb766ee37 Attempt at work around OS X VBO slowness 2011-12-01 17:51:30 +01:00
Siana Gearz
cd67046b33 Silly way to clear stringstream on GCC 2011-12-01 17:41:50 +01:00
Siana Gearz
66f4c170cb Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32 2011-12-01 16:51:43 +01:00
Siana Gearz
a485760028 Skipping first time dialogs enabled 2011-12-01 16:51:27 +01:00
Shyotl
0b5a2cd6a3 Un-break for compilers that don't yet support stringstream copying ala C++0x's MoveConstructible 2011-12-01 02:21:23 -06:00
Shyotl
8e7733b2ce Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy) 2011-11-24 01:03:03 -06:00
Shyotl
08d2c17c65 Alphamask detection tweakage. 2011-11-24 00:31:45 -06:00
Shyotl
09f7136cf4 'Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.' https://bitbucket.org/davep/shining-fixes/changeset/db8a3f49c250 2011-11-23 23:44:04 -06:00
Shyotl
c4b77e247e LLInstanceTracker v3 merge 2011-11-23 23:40:31 -06:00
Shyotl
9f9daba33d Missed some glRotatef -> gGL.rotatef conversions. 2011-11-23 23:39:42 -06:00
Shyotl
dc3831c86b llmath v3 merge. 2011-11-23 23:04:54 -06:00
Siana Gearz
ab14f1908c Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32 2011-11-24 04:43:47 +01:00
Shyotl
bf6e1d6c75 Unbork shadows. Apparently texture/texturProj do not return a vector for shadow samplers. 2011-11-23 21:30:32 -06:00
Shyotl
5d8d402403 Fix shader error dumping. (the error file was not being written to.) Also catch exceptions if shader log dir is inaccessable or otherwise unable to be cleared. 2011-11-23 21:29:42 -06:00
Siana Gearz
b8eb3076ce Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32 2011-11-23 23:21:14 +01:00
TighMacFanatic
d16e48e128 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-11-22 00:04:40 -05:00
Shyotl
e46c906a8b Invalid texure indexes now display as pink to better assist debugging. 2011-11-21 15:56:24 -06:00
Shyotl
83e8a9076b Several gl calls now wrapped via LLRender (gGL) as prep for future changes:
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
2011-11-21 15:55:44 -06:00
TighMacFanatic
56b28756ad Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-11-19 21:36:41 -05:00
TighMacFanatic
13fad75811 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-11-19 21:36:32 -05:00
Shyotl
1cf367aae5 A little vectorization. gluProject replaced with vectorized glProjectf. Added LLMatrix4a::rotate4. Tweaked LLMatrix4a::rotate. Removed extra _mm_movehl_ps call in LLMatrix3a::setTranspose 2011-11-19 20:02:31 -06:00
Shyotl
70909f86c8 Changed some GL matricies to single precision. 2011-11-19 19:05:19 -06:00
Shyotl
1fd908b2c4 Removed maximum_alpha uniform (as it's always 1.0 anyhow) 2011-11-19 15:13:16 -06:00
Siana Gearz
f0108c17b9 Build floater fixes by Cale Flanagan +tinies 2011-11-14 06:36:46 +01:00
Siana Gearz
0566bde61b Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2011-11-14 06:13:47 +01:00
TighMacFanatic
a31fc8a612 Issue 14 - unlimited message lengths resolved. 2011-11-11 01:58:43 -05:00
TighMacFanatic
2ba9e16a6c Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-11-10 12:27:02 -05:00
Siana Gearz
e6dce6ad7b #9 - region restart delay 2011-11-10 03:45:29 +01:00
TighMacFanatic
c87caebcf7 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-11-08 21:13:30 -05:00
Siana Gearz
121a557fe5 Fixes bug #79 2011-11-08 21:54:26 +01:00
Drake Arconis
6aa7f219cd Merge remote-tracking branch 'upstream/master' 2011-11-08 05:22:47 -05:00
TighMacFanatic
e9e05bec90 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-11-07 19:31:53 -05:00
Siana Gearz
8421661a89 Version 1.6.0(3) 1.6.0.3 2011-11-08 01:27:12 +01:00
Siana Gearz
7fea7c589d Make floating text draw distance tunable 2011-11-08 01:26:51 +01:00
TighMacFanatic
0e3b735a60 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-11-07 18:44:33 -05:00