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

160 Commits

Author SHA1 Message Date
Lirusaito
4e2af85770 Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
 2012-07-03 01:57:55 -04:00
Siana Gearz
cd2dc2f3ca Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/app_settings/settings.xml
	indra/newview/llface.cpp
 2012-07-03 07:49:22 +02:00
Drake Arconis
77948b8ce4 Fixed further warnings reported by clang. 2012-07-03 00:24:15 +00:00
Drake Arconis
8eb319d3ba Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:08:04 +00:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Aleric Inglewood
eb7615ad57 Merge branch 'master' into V2MultiWear 2012-06-27 04:26:44 +02:00
Aleric Inglewood
7234e63ce1 Merge remote-tracking branch 'siana/master' 
Conflicts:
	indra/llrender/llvertexbuffer.cpp

Resolved: needed two casts for 64bit warning.
 2012-06-27 04:10:20 +02:00
Lirusaito
c6120cd283 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-28 05:18:20 -04:00
Shyotl
51a4e4960f V3 merge. Added LLMainLoopRepeater repeater. Disabled FBOs for baking. Fixed typo in strings.xml. Setting ThrottleBandwidthKBPS was used in a few places that MainloopTimeoutDefault should have been. Better outdated driver detection for ATI hardware. 2012-05-28 03:59:19 -05:00
Lirusaito
58c58dc845 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-23 03:46:48 -04:00
Shyotl
eb562c2470 Updated deferred rendering (STORM-1819 Ternary/Graded shadows) 2012-05-22 23:36:38 -05:00
Shyotl
ae0804beea Trival V3 llmath merge. 2012-05-21 20:23:42 -05:00
Lirusaito
8e6063e7b9 Fixed compile errors for gcc4.7 (also reported by clang) 2012-04-28 21:29:52 -04:00
Shyotl
e1d243272f V3 merge part 1 / 2. 2012-04-13 22:39:39 -05:00
Shyotl
1d402bfe39 Verify vert attrib disable state if only running in non-fixed-function. 2012-04-12 10:37:37 -05:00
Shyotl
06068a0361 Disable FBOs on intel gpus running with pre-GL3.x drivers. 2012-04-12 10:36:28 -05:00
Shyotl
b49ad1cd34 RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater. 2012-04-12 10:29:45 -05:00
Siana Gearz
7774fe7f04 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/newview/lldynamictexture.cpp
 2012-03-31 01:54:53 +02:00
Shyotl
86c65e492d Use FBO for dynamic textures if possible. (https://bitbucket.org/simon_linden/viewmaster/changeset/24cdc2fee3d9) 2012-03-28 19:40:37 -05:00
Siana Gearz
be9f3178c0 Fixies, missed files 2012-03-28 01:45:10 +02:00
Siana Gearz
ce1607cf17 Plugging the mesh crash - thanks FS team! 2012-03-26 22:58:05 +02:00
Siana Gearz
caaba76921 Firestorm workaround for alloc failure 2012-03-26 15:05:35 +02:00
Siana Gearz
70438fa06f Catching up with Lindies part 3 2012-03-26 15:01:53 +02:00
Siana Gearz
3f0f955a76 Catching up with Lindies part 2 2012-03-25 10:47:20 +02:00
Siana Gearz
459751f206 Catching up with Lindies part 1 2012-03-25 09:31:03 +02:00
Aleric Inglewood
1023088c0d Fix 64-bit compile warning. 2012-03-13 16:34:45 +01:00
Siana Gearz
b67fa864ff First shot at fixing font fallback 2012-03-05 18:18:37 +01:00
Siana Gearz
28f73d1037 Fix large chat font being same as medium 2012-02-15 04:41:51 +01:00
Siana Gearz
c542c7bdbb Work around pink textures on ATI with 3.1<=GL<=3.2 2012-02-15 01:01:11 +01:00
Shyotl
d10724ae6f Remove some dead savedsettings. 2012-02-10 11:20:28 -06:00
Shyotl
f7b2139e81 Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge) 2012-02-09 14:26:21 -06:00
Shyotl
d15ed9ed34 I borked up the sUseStreamDraw logic earlier. When its a stream type, and sUseStreamDraw is false, don't use a vbo at all (I mistakenly had it use a dynamic vbo instead). Also, removed an unused (due to being renamed) setting from settings.xml 2012-01-31 02:54:42 -06:00
Shyotl
eaecc9a4d0 RenderVBOEnable was completely broken by ll, so I fixed it. 2012-01-30 19:50:41 -06:00
Shyotl
9453c2c2e9 Memory tracking system updated. 2012-01-29 01:33:14 -06:00
Shyotl
afed6dad84 Fix deferred on mac. VBO cleanup. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/853c76596bdb 2012-01-26 16:09:47 -06:00
Shyotl
f9d802f832 SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/56ac56c3cc9a 2012-01-26 12:55:24 -06:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
b338506229 VBO updates from Vir Lindens shining fixes. VBO mapping perf improvement. Alpha rigged attachments render fix, hopefully. Crashfix in void pushWireframe. 2012-01-19 19:01:44 -06:00
Shyotl
7805508e8d SH-2827 crashfix. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/806c10f621af 2012-01-19 10:36:56 -06:00
Shyotl
ad3a16fd3b Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2012-01-12 23:30:17 -06:00
Shyotl
21b6b89577 If this assert hits then I want your callstack, and so does Bao Linden. SH-2827 2012-01-12 23:28:38 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights 
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
 2012-01-09 05:40:03 -05:00
Siana Gearz
d66074d2ea Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-07 21:36:24 +01:00
Siana Gearz
b911e86b02 Merge branch 'future' of git://github.com/Shyotl/SingularityViewer 2012-01-06 10:40:05 +01:00
Shyotl
54bfdb7704 Stippling removed. Emulated with a texture and some texcoord manipluation. (looks identical, and works with and without shaders) 2012-01-06 00:53:18 -06:00
Shyotl
dff195d120 Several transparent ui-related components were writing to the depthbuffer for some silly reason. Don't do that since it messes with occlusion. 2011-12-30 19:15:21 -06:00
Shyotl
48552e3027 Set blendtype back to BT_ALPHA after postprocess, because ui assumes such [aka: glBlendFunc(GL_SOURCE_ALPHA, GL_ONE_MINUS_SOURCE_ALPHA)]. Also, line-ending fixup.. again. 2011-12-30 17:19:23 -06:00
Shyotl
ca96e00135 Enable gl sync fence. Missed a vertexbuffer flush. moved LLMultiFloater out of llfloater.(h|cpp) and into its own header and source file, matching v2. 2011-12-26 23:40:18 -06:00
Siana Gearz
fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
 2011-12-24 20:12:12 +01:00
Shyotl
1bfa72fa7c V3 merge. Slight update. Fixes lighting oddities. 2011-12-16 01:50:57 -06:00