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

27 Commits

Author SHA1 Message Date
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Inusaito Sayori
171c1a5c44 Fix media controls loading entered urls twice as much. 
Thanks to Diva Canto for working with me on this!
 2014-12-05 18:41:08 -05:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Inusaito Sayori
9096265bff Possible solution for Issue 954: Singularity Alpha Build 4701 EULA file missing on first login. 2014-07-31 11:20:17 -04:00
Lirusaito
3739639295 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate 
Conflicts:
	indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
	indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.

Compile fixies:
	indra/newview/llavataractions.cpp needed to include llnotifications.h
	indra/newview/llvoicechannel.cpp needed to include llnotifications.h
 2013-06-23 22:36:04 -04:00
Shyotl
9c8cfcfd0a Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent). 2013-06-02 23:47:47 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Shyotl
a5dad6be5c UI cleanup. 
-Added ui-local transformation matrix.
-Gutted legacy commitcallbacks throughout ui widget ctors.
-Created filter_editor ui widget which issues commit on keypress
   -search_editor commits on focus loss/enter press
   -search_editor and filter_editor now have a built in 'x' button to clear text.
-LLComboBox::setPrearrangeCallback now uses boost::function
-LLComboBox::setTextEntryCallback now uses boost::function
-LLLineEditor::setKeystrokeCallback now uses boost::function
-LLLineEditor::setPrevalidate now uses boost::function
-LLPanel::childSetKeystrokeCallback removed
-LLPanel::childSetPrevalidate removed
-LLPanel::childSetActionTextbox now uses boost::function
-LLTextBox::setClickedCallback now uses boost::function
-LLTextEditor::setKeystrokeCallback added.
-Cleaned up JCFloaterAreaSearch
 2013-04-16 00:25:59 -05:00
Shyotl
c5c1294d7d Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library. 2013-01-07 20:12:14 -06:00
Drake Arconis
769a7b89d2 More Media Updates 
Further updated llviewermedia
 2012-08-03 23:14:03 -04:00
Drake Arconis
4508ea1cc1 Fixup from last commit 
*grumble* Stupid git gui broke my commit!
Fixed a warning in llpaneleditwearables.cpp
 2012-07-07 00:35:46 -04:00
Drake Arconis
525e9d9a8e Webkit plugin updates 
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
 2012-07-06 11:37:45 +00:00
Shyotl
ae0804beea Trival V3 llmath merge. 2012-05-21 20:23:42 -05: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
Shyotl
02b58694bb A required hack to LLMediaCtrl due to our LLPanel behaving far too differently right now. (Clicking isn't passed through like it should, and LLMediaCtrl is not currently parsing xml files so postBuild is not called.) 2011-10-15 01:21:10 -05:00
Shyotl
4a910a8037 onVisibilityChange renamed to handleVisibilityChange. Added setVisibleCallback to LLPanel 2011-10-14 22:57:35 -05:00
Shyotl
d6d8681874 onVisibilityChange renamed to handleVisibilityChange 2011-10-13 17:17:57 -05:00
Shyotl
008bebd817 Merge with siana/future 2011-10-13 00:03:56 -05:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing 
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
 2011-09-09 16:53:12 -05:00
Shyotl
417f5084b4 Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places. 2011-09-03 19:30:42 -05:00
Siana Gearz
9d05a11ef0 Trivial build fixes for Linux 2011-08-18 21:17:32 +02:00
Shyotl
25be08f236 Innitial commit. Did as much as I can for llmediactrl without diving too deep into llviewermedia 2011-07-18 04:21:36 -05:00
Shyotl
a35a59d56b Revert regression from merge 2011-04-13 01:28:56 -05:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come. 
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
 2011-03-31 03:22:01 -05:00
Shyotl
564f7067f7 Browser window less likely to display garbage when resized. (Initialized gl texture to black) 
Could improve even further by padding area around copied plugin texture with black. Doesn't seem too necessary tho.
 2011-03-10 23:19:14 -06:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00