Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 01:16:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79963 commits 76 branches 59 tags 1.2 GiB
Commit graph

29872 commits

Author SHA1 Message Date
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -07:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00
Amer
4c145386e5
Merge pull request #15899 from amerhifi/bugz-907 
Case bugz-907: On launch default to non hmd device
 2019-07-10 16:03:29 -07:00
Howard Stearns
7eaa29c147
Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui 
new-account wallets in simplified UI
 2019-07-10 15:09:59 -07:00
Andrew Meadows
1a5a925a4c fix a typo 2019-07-10 14:18:34 -07:00
amer cerkic
e463a828ef removed extra line 2019-07-10 14:09:51 -07:00
amer cerkic
bc51b8e709 removed extra space 2019-07-10 14:08:20 -07:00
amer cerkic
fc21f6088a undoing code structures changes to else blocks 2019-07-10 14:07:10 -07:00
dante ruiz
7c024b4e8a fix interactive window crash 2019-07-10 11:49:36 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts 
DEV-164: Add defaultScriptsOverride option
 2019-07-10 10:16:55 -07:00
Andrew Meadows
2da0714e36 comments and more readable code 2019-07-09 15:51:56 -07:00
Andrew Meadows
1bfd5386a9 restore entity->requestRenderUpdate() in SafeLanding::updateTracking() 2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
Zach Fox
4dfbc489e8 Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype 2019-07-09 15:40:16 -07:00
Howard Stearns
4191c37f6e indentation 2019-07-09 14:48:17 -07:00
Howard Stearns
79a3d45eae new-account wallets in simplified UI 2019-07-09 14:25:11 -07:00
SamGondelman
bd2003fa01 Merge remote-tracking branch 'upstream/master' into uber 2019-07-09 13:45:14 -07:00
RebeccaStankus
169b15c985 Merge branch 'master' of github.com:highfidelity/hifi into createAgain 2019-07-09 13:03:08 -07:00
RebeccaStankus
714a3f6b08 Fixed path to tabletAssetServer in HMD, simplifiedUI system folder 2019-07-09 13:02:54 -07:00
amer cerkic
09ecb49e5b --no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd 2019-07-09 11:39:42 -07:00
amer cerkic
45b339a6c7 removing comment 2019-07-09 09:35:58 -07:00
amer cerkic
d04a06e757 changing the default fallback to non hmd device 2019-07-09 09:33:44 -07:00
Howard Stearns
7aef864d7f
Merge pull request #15898 from howard-stearns/log-windows-wakeup 
log wakeup (on client and report to DS) during connection on Windows
 2019-07-09 09:29:57 -07:00
Amer
749a78680d
Merge pull request #15877 from amerhifi/bugz-690 
case BUGZ-690 & BUGZ382 : adding a null check escape to the activeItem. On right click back to …
 2019-07-09 09:17:30 -07:00
SamGondelman
41e8a08484 Merge remote-tracking branch 'upstream/master' into uber 2019-07-08 23:00:36 -07:00
Zach Fox
d622e53458 Some comments; changed the code to be backwards compatible 2019-07-08 17:10:11 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Zach Fox
5048b8bd89 Implement DEV-218 & DEV-219 and commit a starting point for the Emote app 2019-07-08 16:46:58 -07:00
Shannon Romano
31582cf857
Merge pull request #15887 from sethalves/set-default-gl-format 
BUGZ-926: use the correct gl format when creating the initial platform window
 2019-07-08 14:03:43 -07:00
Jamil Akram
aa82c4e971
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements 
Idles talks locomotion improvements
 2019-07-08 13:30:51 -07:00
amerhifi
84055a6f0d adding focus back on _glWidget 2019-07-08 11:12:50 -07:00
amer cerkic
386d945eeb Merge branch 'master' into bugz-690 2019-07-08 09:28:28 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut 
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
 2019-07-06 02:18:11 +02:00
David Rowe
9f4c657bc3 Update Overlays properties JSDoc 2019-07-06 12:12:33 +12:00
Sam Gateau
b4e86741e0 Adress typo in gpuident and add extra checks on the recommended scale value 2019-07-06 01:13:38 +02:00
Zach Fox
243733028b
Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch 
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
 2019-07-05 12:59:56 -07:00
Zach Fox
38ad93a7ed BUGZ-917: Fix log spam in NameCard.qml due to errant line of code 2019-07-05 12:24:05 -07:00
Zach Fox
4223800af7 BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About 2019-07-05 12:17:28 -07:00
Seth Alves
708979a30c use the correct gl format when creating the initial platform window 2019-07-05 10:48:57 -07:00
Sam Gateau
11f036246e Implement the ppi scaling in sync with the platform tier 2019-07-05 17:52:44 +02:00
Samuel Gateau
6ef652038b EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed 2019-07-05 16:15:19 +02:00
Shannon Romano
ab376d59db
Merge pull request #15865 from ctrlaltdavid/DOC-105 
DOC-105: Pointers JSDoc revision
 2019-07-04 12:02:52 -07:00
David Rowe
8fb83e98be Doc review. 2019-07-04 20:02:42 +12:00
SamGondelman
8b9fcd43b1 merge with master 2019-07-03 17:58:23 -07:00
amer cerkic
9384c5b3a3 testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window 2019-07-03 16:02:56 -07:00
Sam Gondelman
00441f1899
Merge pull request #15875 from SamGondelman/load 
BUGZ-910: Return entity load priority operator to proper state after safe landing
 2019-07-03 14:20:03 -07:00
amer cerkic
e429b7a1e2 Merge branch 'master' into bugz-690 2019-07-03 14:00:27 -07:00
Zach Fox
1f54f3c159 BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text 2019-07-03 12:49:23 -07:00
amer cerkic
39fd16fc9e adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item 2019-07-03 11:05:38 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit 
BUGZ-661: Add unlit property to text entities
 2019-07-03 18:43:26 +02:00
Amer
f97cde46bf
Merge pull request #15868 from amerhifi/bugz-103 
case BUGZ-103: HMD Mouse rendering
 2019-07-03 09:17:23 -07:00
David Rowe
c70d2c006f Revise organization of Overlays types and properties JSDoc per Entities 2019-07-03 14:25:11 +12:00
Anna
75c5a99ee2 removed secondary camera tone mapping compensation during 360 screenshot 2019-07-02 17:59:30 -07:00
SamGondelman
4973563c20 return entity load priority operator to proper state 2019-07-02 16:29:19 -07:00
amer cerkic
75beb95a97 Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse. 2019-07-02 10:31:31 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Ryan Huffman
d29cd796ca Add defaultScriptsOverride option 2019-07-01 23:51:34 -07:00
David Rowe
5c29eb04b3 Typo 2019-07-02 16:19:32 +12:00
David Rowe
c6fd726111 Typos etc. 2019-07-02 16:12:47 +12:00
David Rowe
b7e92e0994 LaserPointers API JSDoc update 2019-07-02 16:12:47 +12:00
David Rowe
e109c8f6d3 Picks and RayPick API JSdoc updates per Pointers API JSDoc 2019-07-02 16:12:47 +12:00
David Rowe
f2cf3bd05c Revise Pointers API JSDoc 2019-07-02 16:12:47 +12:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
Andrew Meadows
4bbfd7cad1 more correct bounding sphere around avatar for SafeLanding query 2019-07-01 15:53:42 -07:00
Andrew Meadows
0d8fdf51c5 fix safe landing to load proper set of objects 2019-07-01 14:18:19 -07:00
Zach Fox
b8485361ce
Merge pull request #15858 from zfox23/PTTDuckingSlider 
DEV-194: Iterate on PTT Ducking Slider design
 2019-07-01 12:00:17 -07:00
Zach Fox
73db19464f DEV-194: Iterate on PTT Ducking Slider design 2019-07-01 11:28:48 -07:00
Brad Hefta-Gaub
191086c57a
Merge pull request #15857 from PrestonB1123/webcamPermissions 
DEV-193: Disallow mic and webcam access always.
 2019-07-01 09:54:58 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts 
DEV-173: Re-enable shortcuts
 2019-06-28 15:29:53 -07:00
Preston Bezos
ef674a5934 removed permission for qml to access webcam and mic 2019-06-28 15:23:50 -07:00
Preston Bezos
1315677aec fixed doc and removed log spam 2019-06-28 15:02:33 -07:00
Preston Bezos
d1470d3323 readded ctrl+n and ctrl+b as shortcuts with a default script 2019-06-28 14:33:03 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source 
DEV-175: QML content URL validation, whitelist trusted sources
 2019-06-28 14:18:56 -07:00
Sabrina Shanman
0b6dfe3f7c
Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood 
BUGZ-868: Avoid SafeLanding signal-slot connection resource leak
 2019-06-28 13:29:31 -07:00
Brad Hefta-Gaub
8082ff8529
Merge pull request #15850 from zfox23/PTTAttenuationOption 
BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option
 2019-06-28 11:08:11 -07:00
Brad Davis
e3393a8ee5 Apply URL validation to top level window QML 2019-06-28 10:43:03 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update - Doc Review
 2019-06-28 10:12:05 -07:00
Zach Fox
5cc6efc831 CR feedback 2019-06-28 09:07:58 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
Brad Davis
8bcde84d89 Disable remote QML unless whitelisted 2019-06-27 16:37:56 -07:00
Zach Fox
8af469992e BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option 2019-06-27 15:55:58 -07:00
Andrew Meadows
0bec2bca83 OctreePacketProcessor should process packet even when no SafeLanding 2019-06-27 14:44:23 -07:00
Zach Fox
7c189d46f2 BUGZ-363: Remove 20dB output attenuation during PTT 2019-06-27 13:28:29 -07:00
dooglifeSF
7856ab611f rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces 2019-06-27 11:37:05 -07:00
Andrew Meadows
bf068a3211 fix SafeLanding start/stop on entity-server connection flow 2019-06-27 11:33:51 -07:00
Andrew Meadows
dfb7ac7044 name changes and improved flow for SafeLanding logic 2019-06-27 08:14:34 -07:00
Andrew Meadows
00185ee82e cleaup to help unravel one spaghetti strand 2019-06-26 17:05:44 -07:00
Andrew Meadows
496a7f3608 less cruft, more readable 2019-06-26 16:02:00 -07:00
Andrew Meadows
46b3d84be5 remove unused cruft 2019-06-26 15:41:50 -07:00
Andrew Meadows
355de0e6d5 move Application::setFailedToConnect() to cpp for easier debugging 2019-06-26 15:41:01 -07:00
Andrew Meadows
c96b704a28 avoid dupe connections and teardown old connections 2019-06-26 15:38:59 -07:00
SamGondelman
5937a219dd wait on thread pool threads 2019-06-26 15:25:17 -07:00
Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges 
New Top Bar Icons
 2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
dooglifeSF
9f8d1dd51d Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-26 09:31:23 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow 
BUGZ-664: Introduce scaling of rendering for forward renderer
 2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update
 2019-06-25 14:18:13 -07:00
Sam Gateau
768dd051aa Add sanity check for viewport resolution scale to avoid negative value 2019-06-25 11:54:50 -07:00
Zach Fox
b7a3d82f0f DEV-170: Increase the speed of the animation when clicking between tabs in Settings 2019-06-25 11:30:25 -07:00
Preston Bezos
1481c7424f changed ptt muted icon 2019-06-25 11:02:44 -07:00
Preston Bezos
5686f51171 fixed hmd settings buttons spacing 2019-06-25 09:19:30 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
Zach Fox
3e2e020731 BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version) 2019-06-24 12:48:13 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
Sam Gateau
7bf2c5fc8e Simplify the setting name 2019-06-21 16:22:01 -07:00
Sam Gateau
aa160c4d0f Improving presentation of stats & debug information 2019-06-21 16:17:28 -07:00
Sam Gateau
35d7211aca Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-21 11:38:33 -07:00
dooglifeSF
3d92875eb5 add spine twist during transitions in/out of alt idle to help when talking is overlayed 2019-06-21 10:39:53 -07:00
Sam Gateau
a856fdb3ca getting rid of the resolution Scale on the display plugin 2019-06-21 10:36:25 -07:00
amer cerkic
67e42148ef Merge branch 'master' of https://github.com/highfidelity/hifi 2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-20 22:23:15 -07:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix 
Disable handTouch.js to prevent finger twitching
 2019-06-20 17:03:39 -07:00
dooglifeSF
e25913f136 fix finger collapse in talks and idles - caused by finger joints bending more than 90 degrees in Y 2019-06-20 16:05:18 -07:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
amer cerkic
1218f7e014 moved audioclient stop to dtor 2019-06-20 15:10:21 -07:00
Andrew Meadows
cd9b450475 re-expose mic and camera to disable crash 2019-06-20 15:03:15 -07:00
dooglifeSF
12b7cb0262 merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-20 09:01:59 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
Sam Gateau
8f04eaae1d Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
dooglifeSF
3eef23fe98 change base idle more frequently, add more motion to idle02, improve head movements in talks, add head movement to talk_armsdown 2019-06-19 16:19:42 -07:00
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85 
DOC-85: Revise new MyAvatar signals' JSDoc
 2019-06-19 15:16:46 -07:00
RebeccaStankus
30dd667b17 Changed qml import method 2019-06-19 10:40:32 -07:00
RebeccaStankus
feaea12b24 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-19 10:14:04 -07:00
dooglifeSF
4be42a4b9b Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-19 09:57:04 -07:00
dooglifeSF
255777c82d bring latest changes to idles, locomotion and animation json into hifi from hifi-animation 2019-06-19 09:49:42 -07:00
Sam Gateau
1ae06f01b0 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 17:41:56 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
Zach Fox
18f703ee43 BUGZ-732: Enable text selection by mouse in Profile/Display Name field 2019-06-18 14:11:14 -07:00
Zach Fox
9b1c7b39bb
Merge pull request #15790 from zfox23/SUI/aboutTab 
Implement an "About" tab in the Settings app
 2019-06-18 13:16:30 -07:00
Zach Fox
f6822f17a9 Add computer description 2019-06-18 12:43:45 -07:00
Zach Fox
bd02a5eafd Better text formatting 2019-06-18 12:29:52 -07:00
Zach Fox
4670c11397 Tighten up the graphics on level 3 2019-06-18 12:26:03 -07:00
Zach Fox
ec4fc672b6 Better design; Interface version 2019-06-18 12:09:37 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
Zach Fox
34def0fd6b DEV-145: About screen for platform info 2019-06-18 11:09:15 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement 
Improvement to Developer > Avatar > Draw Animation
 2019-06-18 10:50:46 -07:00
dooglifeSF
ae2c381aaa Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-18 09:42:18 -07:00
dooglifeSF
55524ec815 Set debug text lit time to 20 (again) and move 2 break statements out of comment to fix exception in debug 2019-06-18 09:39:06 -07:00
RebeccaStankus
cd508a5475 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22 moved files 2019-06-17 16:45:54 -07:00
Zach Fox
32aec78ea2
Merge pull request #15782 from zfox23/SUI/resizeSignal 
BUGZ-699: Make PSFListModel fetch early when making container bigger
 2019-06-17 15:27:21 -07:00
Zach Fox
9cb4ad61ee BUGZ-699: Make PSFListModel fetch early when making container bigger 2019-06-17 15:06:20 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation 
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
 2019-06-17 14:50:19 -07:00
Shannon Romano
7c3147fa2c
Merge pull request #15778 from zfox23/SUI/scrollbars 
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
 2019-06-17 14:38:10 -07:00
Preston Bezos
538b15dd57 caught a couple of edge cases for mic states 2019-06-17 13:20:25 -07:00
Preston Bezos
7879dbf687 changed width of ptt muted icon 2019-06-17 13:13:43 -07:00
Zach Fox
1d2ed1985f DEV-142 & DEV-140: Scrollbars in Your Profile and Settings 2019-06-17 12:35:45 -07:00
Andrew Meadows
ce96ea5bf8 more correct rebuild OtherAvatar detailed pickable shapes 2019-06-17 11:20:42 -07:00
Preston Bezos
bd78dd96a0 replaced icons with icons that are on the whole pixel so as not to cause blur 2019-06-17 11:05:47 -07:00
dooglifeSF
1c1807a80c Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-17 10:44:11 -07:00
Preston Bezos
a954ef6068 Merge branch 'master' of github.com:highfidelity/hifi into iconChanges 2019-06-17 10:43:43 -07:00
Preston Bezos
d9f1aa73ba switched top bar icons and changes input device meter to be in icon instead of in bar 2019-06-17 09:12:32 -07:00
dooglifeSF
51b5f6093a locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds 2019-06-17 08:58:15 -07:00
David Rowe
351bb3b934 Fix JSDoc naming of some Test API functions 2019-06-15 10:44:55 +12:00
Sam Gateau
c0d64ce4e2 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 18:43:34 -07:00
Shannon Romano
491af66a0e
Merge pull request #15767 from sethalves/fix-drawcalls-stat 
BUGZ-686: fix drawcalls stat broken in pr-15721
 2019-06-13 17:57:01 -07:00
Shannon Romano
e6ea4839e0
Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3 
BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody
 2019-06-13 17:55:59 -07:00
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd 
BUGZ-531: Quest tablet login missing keyboard
 2019-06-13 16:44:49 -07:00
Zach Fox
503fc18d70 Make this slightly more robust 2019-06-13 16:08:29 -07:00
Seth Alves
431ff0d1de fix drawcalls stat broken in pr-15721 2019-06-13 15:35:08 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut 
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
 2019-06-13 14:32:36 -07:00
Shannon Romano
a37ce9f89d
Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512 
BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit
 2019-06-13 12:13:04 -07:00
Zach Fox
fcda85a3d1
Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2 
BUGZ-658: Don't let the user switch avatar models to Woody
 2019-06-13 10:55:55 -07:00
Zach Fox
431ec0bfd0
Merge pull request #15760 from zfox23/SUI/betterHomeBookmark 
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
 2019-06-13 10:49:58 -07:00
Zach Fox
289e948d6b BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome' 2019-06-13 10:27:18 -07:00
Zach Fox
4ccd7bd808 BUGZ-658: Don't let the user switch avatar models to Woody 2019-06-13 10:17:14 -07:00
luiscuenca
20b17291b4 Reset detailed motion states when the workload zone changes 2019-06-13 09:05:55 -07:00
Sam Gateau
fbab3fcde9 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-12 19:15:25 -07:00
Sam Gateau
b2feb0f920 Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air 2019-06-12 16:48:36 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
038747e645 Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering 2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
6fed581452 DEV-128: Update settings screen with latest design 2019-06-12 14:22:02 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats 
BUGZ-623: Quiet asan gpu stats
 2019-06-12 09:02:13 -07:00
David Rowe
29079b9221 Miscellaneous JSDoc improvement 2019-06-12 19:15:29 +12:00
David Rowe
93d42917b0 Revise JSDoc for new MyAvatar signals 2019-06-12 19:15:14 +12:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63 
DOC-63: Tablet JSDoc
 2019-06-11 16:51:08 -07:00
Shannon Romano
453085f992
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks 
BUGZ-484: Add --setBookmark and getAddress API
 2019-06-11 15:31:41 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33 
DOC-33: MyAvatar API JSDoc catch-up
 2019-06-11 15:05:06 -07:00
Ryan Huffman
a1b7392854 Add --setBookmark and getAddress API 2019-06-11 14:10:09 -07:00
Zach Fox
a88023469b
Merge pull request #15737 from zfox23/SUI/developerMenu 
DEV-122: Add a developer menu in Settings
 2019-06-11 13:32:14 -07:00
Zach Fox
7bdd3084e9 DEV-122: Add a developer menu in Settings 2019-06-11 12:56:14 -07:00
Seth Alves
cd1c782aa8 fix warning 2019-06-11 12:54:40 -07:00
Zach Fox
97c4726e1e
Merge pull request #15736 from zfox23/SUI/autoSelectAvatar 
BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory
 2019-06-11 11:50:55 -07:00
Zach Fox
9932b1da57
Merge pull request #15734 from zfox23/SUI/recommendedGraphics 
Implement BUGZ-633: Change 'Graphics Preset'
 2019-06-11 11:24:52 -07:00
Zach Fox
db2ce822b7 BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory 2019-06-11 10:52:45 -07:00
Zach Fox
2d4ba92eeb Implement BUGZ-633: Change 'Graphics Preset' 2019-06-11 09:58:01 -07:00
dante ruiz
01fab12942 fixing interface and laucnher script argument 2019-06-11 09:18:20 -07:00
Zach Fox
b62ab2ea82
Merge pull request #15731 from zfox23/SUI/forwardKeyEvents 
Implement BUGZ-226: Forward keypresses made while Top Bar is in focus
 2019-06-11 07:52:11 -07:00
Zach Fox
9a926abd76 Implement BUGZ-226: Forward keypresses made while Top Bar is in focus 2019-06-10 20:27:03 -07:00
Andrew Meadows
250a4490d2
Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations 
Adjust run and jog anims to better align head with 1p camera
 2019-06-10 17:37:33 -07:00