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

329 Commits

Author SHA1 Message Date
Lirusaito
af67342969 Merge branch 'master' of git://github.com/siana/SingularityViewer 
Conflicts:
	indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)
 2012-03-27 07:15:48 -04: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
Lirusaito
3d6733bed8 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-03-23 17:20:04 -04:00
Siana Gearz
80e53ebb2b Viewer tags kill adjustments 2012-03-22 05:37:38 +01:00
Siana Gearz
8b8fe82c8e Correct facepalm in llmessage port 2012-03-20 03:17:37 +01:00
Siana Gearz
2b833129c5 Merge branch 'master' of /cygdrive/c/git/SingularityViewer 2012-03-05 19:36:29 +01:00
Siana Gearz
5eb90ef9cd Preference button to clear settings 2012-03-05 19:05:30 +01:00
Siana Gearz
b67fa864ff First shot at fixing font fallback 2012-03-05 18:18:37 +01:00
Lirusaito
74a1ba0d1e Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-29 10:52:26 -05:00
Siana Gearz
a7d70878b7 Log threadcount together with memory 2012-02-29 16:03:11 +01:00
Lirusaito
72fe406f64 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-24 18:39:25 -05:00
Siana Gearz
10af9d64f2 One day this will be a memory stat 2012-02-24 03:26:06 +01:00
Lirusaito
f253da09ec Added gesture muting feature, like phoenix has. 2012-02-20 16:02:56 -05:00
Siana Gearz
f7cc9c4d33 Hopefully more correctness in grid manager editor 2012-02-19 00:42:23 +01:00
Siana Gearz
a642b725e0 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-02-17 16:00:00 +01:00
Siana Gearz
60ded2ad14 Initial invisiprim support in deferred 2012-02-17 05:52:41 +01:00
Lirusaito
fa560a7081 Fixed up a few settings' strings to display more correct descriptions for ascent settings in debug settings. 2012-02-16 23:10:20 -05:00
Siana Gearz
4cbf259ab3 Experimental tablet and pen support 2012-02-13 20:38:44 +01:00
Siana Gearz
d709200fc0 Those memory pools can't be of ANY use with our malloc 2012-02-11 17:01:52 +01:00
Siana Gearz
77df33ebf6 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-02-11 17:00:00 +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
Lirusaito
fec75d9436 Added commandline for Fake Away Status. 
Users can turn on and off the fake away status by typing a command.
Can be placed inside gesture to be performed together with going away.
 2012-02-08 12:54:34 -05:00
Lirusaito
6ba69adccc Renewed support for / starting chat on linux. 2012-02-06 15:30:27 -05:00
Siana Gearz
548f9d0a88 Restore starting chat by slash 2012-02-06 04:32:17 +01:00
Siana Gearz
8450386330 Allow to disable chat animation 2012-02-06 03:52:25 +01:00
Siana Gearz
cd51a6f795 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-02-05 15:23:51 +01:00
Siana Gearz
3d40cd86ac Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-02-05 15:14:53 +01:00
Shyotl
b0ccec2b62 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 
Conflicts:
	indra/newview/llvoavatar.cpp
 2012-02-01 03:10:46 -06:00
Siana Gearz
071745007a Partial port of Phoenix Windlight parts 2012-02-01 06:36:10 +01:00
Lirusaito
3548521bef Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-31 03:55:57 -05: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
Lirusaito
655365247c Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llpanelmaininventory.cpp
	indra/newview/llpanelmaininventory.h
	indra/newview/llvoavatar.cpp
 2012-01-31 02:47:02 -05:00
Lirusaito
661f5ede04 Removed max node quick setting(set volatile in settings), put LOD(Obj. Detail) in its place. 2012-01-30 12:44:08 -05:00
Lirusaito
f9398a3ab1 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-30 00:06:51 -05:00
Shyotl
9453c2c2e9 Memory tracking system updated. 2012-01-29 01:33:14 -06:00
Shyotl
c548aa3497 Enable Hardware Skinning by default for med/high/ultra settings. 2012-01-28 22:11:51 -06:00
Siana Gearz
a15e72dc03 Force translator off, remove its UI in chat, small adjustments 2012-01-28 21:52:26 +01:00
Siana Gearz
26858c026a Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-01-28 03:25:36 +01:00
Shyotl
fc65380f2a Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views. 2012-01-27 02:36:26 -06:00
Latif Khalifa
2e59ae1340 Implemented support for external script editor based on v3 code (part 2) 2012-01-27 05:25:18 +01: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
Siana Gearz
d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp
 2012-01-24 21:22:49 +01:00
Shyotl
d7d65df9e0 HTTP inventory fetching enabled. 2012-01-21 02:37:22 -06:00
Lirusaito
27a17b332f Spelling fix 2012-01-13 15:51:58 -05:00
Lirusaito
4de23007a5 Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down. 
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
 2012-01-11 11:04:12 -05:00
Shyotl
89e738003c Default RednerDelayVBUpdate to false. 2012-01-03 20:28:15 -06:00
Shyotl
a3f7399d7d Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported). 2012-01-03 20:27:56 -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