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

197 Commits

Author SHA1 Message Date
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Drake Arconis
d219087950 Remove llqtwebkit, add cef 2016-01-16 16:14:04 -05:00
Inusaito Sayori
bb2537dbaf Fix Issue 1960: Wrong positon display in mouselook 2015-07-16 17:14:05 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
0688cda8d2 More thorough VBO teardown in resetVertexBuffers/stopGL. Also, found cases where gGL.init failed to be called when it should have been. 2015-06-01 17:58:19 -05:00
Shyotl
690f3614c1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 
Conflicts:
	indra/llrender/llpostprocess.cpp
 2015-05-16 02:53:19 -05:00
Shyotl
966c5aa409 Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction. 2015-05-16 02:31:06 -05:00
Inusaito Sayori
9f06333a86 Address Issue 1897: Pressing letter keys STARTS local chat 
Option lives in Text Chat preferences. "Letter keys start typing into local chat"

Code is from upstream..ish
 2015-04-19 18:59:17 -04:00
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit. 
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
 2015-03-20 22:04:04 -04:00
Inusaito Sayori
02c629a0b0 Pick up "AlchemyMouselookInstructions setting and make mouselook instructions useful" from Alchemy 2015-03-19 03:59:27 -04:00
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
18b7f6925a Fix/Update Inspect Tool 
Solves Issue 1131: Inspect Window while open prevents camming
Possibly fixes Issue 928: Have to Click a second time to Inspect an object, I couldn't reproduce, but maybe you still can?

Fixes a bug in the name cache connection setting of llfloaterinspect.cpp from upstream.
 2015-01-20 04:59:46 -05:00
Drake Arconis
eb96dee176 Murrrrge 2014-09-10 01:03:04 -04:00
Inusaito Sayori
56f2e20cb4 Feature Request: Add LiruResizeRootWithScreen to prevent ui getting messed up when the window is resized 
This is not complete, and it should only be used if you know what you're getting into.
 2014-09-03 08:28:06 -04:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Inusaito Sayori
5191baa659 Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal 
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
 2014-07-21 23:31:59 -04:00
Inusaito Sayori
8a2e24ecd0 Sync with viewer-tiger~ 
Syncs up llmath stuffs.

Thanks to Shyotl for the CMakeLists fix for Wbemuuid.
 2014-07-11 20:36:19 -04:00
Inusaito Sayori
a7728b87fc Touchup-fix for Issue 1549: Keyboard camera panning only works in 3 directions using WASD keys. 
I didn't like the way Advanced menu flickered, so I provided a setting to prevent the toggle that way altogether.

Adds LiruUseAdvancedMenuShortcut
 2014-06-18 09:47:08 -04:00
Shyotl
24ca32f9f7 Replace gluProjectf/gluUnprojectf with own versions. Also changed gGLModelView/gGLProjection and other related matrices to LLMatrix4a. 2014-06-06 01:59:04 -05:00
Inusaito Sayori
1048f213c7 Fix maximized windows being repositioned to no longer maximized when applying graphics settings. 2014-06-03 00:56:24 -04:00
Shyotl
22bcf83cb9 Toyed with gl init ordering. Fixes adaptive vsync. May explode on linux, not that adaptive vsync works there, but it should in theory work there if we ever port to sdl2. If it does explode, I'll know shortly... probably. 2014-05-14 03:10:34 -05:00
Shyotl
7e8e8bdb26 Disable some diagnostic gunk eating memory. 2014-05-08 16:35:12 -05:00
Shyotl
f0763fd31c Tweaked context-recreation logic to force a 0xAA context when fbos are in use. Should also handle toggling of fbo checkbox a bit gracefully as well. 2014-05-08 15:48:08 -05:00
Shyotl
162e7b7699 Fixed a silly mistake that was causing vsync to be enabled when it should have been. Also fix typo in objectSkinV.glsl previous commit 2014-05-08 15:30:02 -05:00
Latif Khalifa
e12548ab8c Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2014-03-28 08:45:40 +01:00
Shyotl
d6fdaa93a4 Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel). 2014-03-28 02:34:03 -05:00
Inusaito Sayori
af58636c7c Fix the Login Panel such that it persists until a successful login and maintains ui values between failed logins 
When the login panel used to die, it now hides instead, we only truly kill it upon successful login.
Much of the opening and setting behaviors have been cleaned up to ensure fields are autofilled by the viewer without any user action once
Everything else like changing saved logins will still work the same.
 2014-02-02 16:45:37 -05:00
Latif Khalifa
594eacb480 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-19 04:44:55 +01:00
Shyotl
be249ac8a1 Font update. Minor refactor, and removed some pointless code that was leaking. 2013-11-18 09:56:49 -06:00
Latif Khalifa
c6ec2a531f Alow alt-camming and terrian parcel selection from farther away. 
Thanks to Liru for finding the sport
 2013-11-17 12:28:06 +01:00
Latif Khalifa
14c43aa9a2 Fixed camera pan 2013-11-14 20:36:07 +01:00
Inusaito Sayori
fd42029a61 LLViewerWindow::handleKey(): Partial Fix for Issue 704: Keyboard shortcuts that should be passed to focused text fields are instead passed to selected prims when building 
All edit keys now work, but Ctrl-A still doesn't work right, it must be grabbed by something else...
Adds LLFocusMgr::keyboardFocusHasAccelerators()
Adds virtual bool LLView::hasAccelerators() which returns false by default, overrides returning true placed in LLPreviewScript and LLPreviewNotecard
Shortcut keys added to notecard and script menu xmls

I'm thinking Qarl's Align tool handling may be receiving the Ctrl-A, we do seem to handle it differently than Exodus and Firestorm something modern could have broken the old way..
Come to think of it, those two features(Align and Select all prims) have a longstanding shortcut conflict in shortcuts... that's pretty nasty
 2013-10-22 23:35:53 -04:00
Inusaito Sayori
574d0dab8d LLViewerWindow::handleKey(): Also handle keys for navigating through the displayed menu 2013-10-22 22:39:15 -04:00
Inusaito Sayori
1aee941cb6 LLViewerWindow::handleKey(): The work in progress bits of the sync, commented out 2013-10-22 09:19:38 -04:00
Inusaito Sayori
75ee99f4d5 LLViewerWindow::handleKey(): More harmlessness (sync) 
Handle Tabbing through elements/floaters earlier.
Combine g*Menu*View handleKey() checks.
 2013-10-22 09:08:41 -04:00
Inusaito Sayori
45cd0157ef LLViewerWindow::handleKey(): Code cleanup, bit of harmless sync 
Moved Notifications Console into the advanced menu for login, so it's not shoved in as a hack, also a bit easier to access
 2013-10-22 08:16:12 -04:00
Inusaito Sayori
9ec10cf246 Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature 
Switches to exodus implementation
Includes relicensing of LLViewerCamera and LLToolComp
Maintains use of the old saved zoomed setting
 2013-10-22 07:47:43 -04:00
Inusaito Sayori
d95e1800e1 Miscellaneous touchups 
Fixes chatbar not handling ctrl+shift+arrow for word selection
lltoolmgr.cpp sync
Removes some pointless dead code from llviewertexteditor.cpp
 2013-10-21 15:15:17 -04:00
Latif Khalifa
cb12a35102 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llaudio/llaudioengine.cpp
 2013-10-12 10:04:05 +02:00
Shyotl
7fb05e6a48 Audio engine changes: 
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
 2013-10-12 02:49:11 -05:00
Latif Khalifa
c313d5fe28 Merge branch 'master' of https://github.com/AdeonWriter/SingularityViewer 2013-10-10 21:58:19 +02:00
Latif Khalifa
d98402b13f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvotree.h
 2013-10-10 00:03:36 +02:00
Shyotl
f25eb07fab Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation. 2013-10-09 15:43:23 -05:00
Adeon Writer
be10c2d7fb Focus depth of field under cursor in flycam 2013-10-07 22:28:26 -04:00
Salvatore La Bua
67720c6a6a Fixed position of ui element Show FPS to the bottom right corner 2013-09-22 01:14:47 +02:00
Salvatore La Bua
df6aa397f9 Added a menu toggle item at Advanced > UI > Show FPS to show fps as an ui element. The related Debug Setting is: SLBShowFPS 2013-09-22 00:11:54 +02:00
Drake Arconis
fdc855cd37 Trivial changes to better sync with viewer 3 2013-08-25 14:14:51 -04:00
Shyotl
8310575fc3 added LLProgressView::abortShowProgress. Issue upon failed login to terminate pending loginpanel destruction which was killing the actual 'new' replacement loginpanel instead of the old to-be-deleted version. 2013-07-03 17:15:30 -05:00
Lirusaito
c2cc398339 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate 
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
 2013-06-25 19:37:50 -04:00