Commit Graph

1916 Commits

Author SHA1 Message Date
Lirusaito
9fd813267e Added three macros, two to help the final one which exists to show file and line on llassert messages;
Changed the presentation of said messages to look nicer.
2012-01-08 18:21:43 -05:00
Lirusaito
f14e6cdb60 Pretty sure all I did was fix some things that didn't look nice to me or poor syntax highlighters, shouldn't affect performance... 2012-01-07 18:14:36 -05:00
Lirusaito
fe87ac0f3d Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-07 18:14:15 -05:00
Siana Gearz
a6f36abab0 Semicolon care and feeding 2012-01-07 23:44:46 +01:00
Lirusaito
621e677898 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-07 17:09:43 -05:00
Lirusaito
626a94cf8f Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-07 15:38:58 -05:00
Siana Gearz
d66074d2ea Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-07 21:36:24 +01:00
Shyotl
bf28f6514f Don't grey out 'properties' if selecting multiple items in inventory. 2012-01-06 13:49:24 -06:00
Shyotl
cf62e22409 gpu_table update 2012-01-06 13:48:21 -06:00
Lirusaito
900d063d4f Just fixed this file up a bit to look a bit nicer... Won't affect performance. 2012-01-06 11:18:31 -05: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
Lirusaito
566152c230 Almost completely stripped, saving the final piece for tomorrow
((Double clicking from list of chat people on right of chats))
2012-01-05 21:56:48 -05:00
Shyotl
dcbf39bcfa (Loading...) text in ticker now goes away after 10 seconds. Some streams simply do not provide artist/title metadata. Only parse metadata every half second (opposed to every frame). Also fixed paused text getting clobbered. 2012-01-05 15:52:03 -06:00
Shyotl
c73913a864 Decided to allow width adjustment to ticker floater. It's a little wonky due to blocking height adjustment. LLFloater is kinda crappy and doesen't provide a real max_height/max_width mechanism to do this, so the behavior is a little wonky, but good enough for now. 2012-01-04 18:05:58 -06:00
Shyotl
d3ba4a2b80 Less hardcoded element manipluation for media ticker(allows more freedom for skins, etc). Added gridlines to visualizer. Added oscillator color to color tables (This process sucks, btw). 2012-01-04 03:55:53 -06:00
Shyotl
af7affa9dd Removed code for a case that will never occur (for oscillator). Also tiny bugfix related to iterating down wavedata buffers. 2012-01-03 21:31:21 -06: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
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
Siana Gearz
c6ce417fac Attempt at fixing a Linux build botch in ReleaseSSE2 2011-12-29 13:39:59 +01:00
Siana Gearz
a7510d3b3a Merge git://github.com/Lirusaito/SingularityViewer 2011-12-28 04:28:49 +01:00
CobraElDiablo
aad10c9b8d SH-2516 Fix: Full Bright Geometry Rendering Increases Rapidly, Destroying Frame Rate. By Bao Linden 2011-12-28 04:27:04 +01: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
Inusaito Sayori
536189340d Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-12-24 23:39:41 -05:00
Siana Gearz
23b97efb69 Prebuilt fetch now honors CMake-specified plattform 2011-12-25 05:21:37 +01:00
Siana Gearz
2c8e3bb0a3 More Linux build fixes 2011-12-25 04:28:17 +01:00
Inusaito Sayori
7a48cb9979 Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-12-24 22:09:45 -05:00
Siana Gearz
2f5caa27fd Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer 2011-12-25 03:37:03 +01:00
TighMacFanatic
d69f00741f Openjpeg compile fixes. 2011-12-24 15:07:52 -05:00
Siana Gearz
8c4a52e58d Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-12-24 20:12:47 +01: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
TighMacFanatic
e071dc52fd Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-12-24 13:52:14 -05:00
Shyotl
e1cbeb7e02 Oopsies. Undoing a change that shouldn't have made it into the previous commits. Was simply a part of an experiment. 2011-12-24 11:30:09 -06:00
Inusaito Sayori
9d367cf9f2 Spelling fix 2011-12-24 08:29:58 -05:00
Inusaito
3890e61fbc Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-12-24 03:44:08 -05:00
Siana Gearz
3df853b74b Merge branch 'future' of git://github.com/TighMacFanatic/SingularityViewer 2011-12-24 09:00:31 +01:00
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
Inusaito Sayori
4b87c45298 Highlight for selected line should be visible without eyestrain. 2011-12-24 00:31:14 -05:00
Shyotl
a2fb56bf48 Removed soundgroups. Unneeded and redundant. Any potential usefulness is ursuped by LLAudioEngine's channel management, which I do not want to alter. 2011-12-23 18:29:13 -06:00
Shyotl
37095dc2cd Provide FMOD Ex with format hints. Use software mixing only. Fixed issue with channels being silently stolen due to maxchannels being too low (Wind and streaming audio + 30 sound sources were exceeding max channel count) 2011-12-23 18:00:54 -06: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
Shyotl
b4dad425aa Fixed wind not mixing with other audio. Play no more than 30 world sounds at once (new sounds just muted until channels free up). Add fmod profiler support (SHEnableFMODExProfiler). Use FMOD_UNICODE on windows instead of loading files manually and sending raw data to fmod. Incl other misc cleanup. 2011-12-23 02:29:49 -06:00
Shyotl
c73414f1a1 A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes. 2011-12-22 18:01:07 -06:00
Shyotl
6920bee5e2 Fmod metadata parsing. Innitial. 2011-12-21 01:23:04 -06:00
Shyotl
6a5e203884 Remove hardcoded var passing between LLPostProcess and its floater. Now driven through the xml file. 2011-12-17 00:20:54 -06:00