Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 09:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 25 branches 0 tags 1.1 GiB
Commit graph

72789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
eec565e7f4 Revert "Checkpoint sysTray Installer" 
This reverts commit 7257a99414.
 2018-09-27 12:58:33 -07:00
Roxanne Skelly
f1ba213ccc Merge branch 'sysTray' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 12:08:51 -07:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
Roxanne Skelly
330789471d Fix merge conflict and set proper polling times 2018-09-27 12:03:37 -07:00
Roxanne Skelly
00a5075d34 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 11:44:41 -07:00
Roxanne Skelly
6a3b286a07 Fix windows notification popups:w 2018-09-27 11:44:00 -07:00
sabrina-shanman
ed987ffe9e Improve style/compatibility for default position/direction when creating parabola pick 2018-09-27 11:42:19 -07:00
sabrina-shanman
12a755310f Fix wrong velocity in ParabolaPick::getMathematicalPick 2018-09-27 11:37:30 -07:00
John Conklin II
0b185c6890
Merge pull request #14031 from zfox23/notificationsForFourApps 
Discovery Notifications Project: Notifications for PEOPLE, WALLET, MARKET, and GOTO
 2018-09-27 11:34:05 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
sam gateau
85b3b883f9 REmove cruft 2018-09-27 11:11:14 -07:00
Roxanne Skelly
d851e3994e Search for interface should check peer package 
Also, retain enabled/disabled state for notifications across restarts
 2018-09-27 11:10:51 -07:00
sabrina-shanman
bb38efa061 Set joint state for the mouse RayPick of the EntityTreeRenderer 2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969 Add simpler RayPick constructor with position/direction values set to default 2018-09-27 10:53:10 -07:00
Wayne Chen
9079c8a6b7 adding log for redirect cases 2018-09-27 10:42:21 -07:00
luiscuenca
bbe836ee88 Remove smooth teleport and set/get API methods 2018-09-27 10:38:45 -07:00
sabrina-shanman
14b3093506 Clarify 'what can be parented to what' table in pick parenting doc 2018-09-27 10:33:21 -07:00
Roxanne Skelly
61aef14c64 OSX notifications dismiss the previous notifications immediately when 
sent, preventing 'click' behavior
 2018-09-27 10:16:21 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
sabrina-shanman
a9164f96b9 Fix some inaccuracies in the pick parenting doc 2018-09-27 09:53:42 -07:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
Gabriel Calero
fba3b48923 Merge remote-tracking branch 'upstream/master' into android_signup 2018-09-27 11:38:52 -03:00
Olivier Prat
9bc85b3e5d Fixed android build 2018-09-27 15:43:37 +02:00
Olivier Prat
9cd963af95 Added generateTextureMipsWithPipeline function in batch 2018-09-27 10:26:51 +02:00
Sam Gateau
8923055e91 Exploring the bad peroformances 2018-09-27 00:15:34 -07:00
David Rowe
5ab22a1f40 Change play area option text for Oculus 2018-09-27 17:07:42 +12:00
David Rowe
3284b2a90e Immediately hide fading overlays if other hand starts teleporting 2018-09-27 15:20:43 +12:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
David Rowe
b9c6811fdc Restructure post-teleport fading code 2018-09-27 14:44:30 +12:00
Sam Gateau
301d6c4de8 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-26 19:02:54 -07:00
Roxanne Skelly
b6fd302a83 OSX Interface-running detection fixes 2018-09-26 18:40:54 -07:00
Ken Cooke
9dc0aa5c8d HRTF starts in silent state 2018-09-26 18:23:26 -07:00
Ken Cooke
a8f7ff7d8a Add HRTF reset() 2018-09-26 18:18:20 -07:00
David Back
046a4e4041 ordering/comment tweak 2018-09-26 18:02:15 -07:00
sam gateau
4078be3df5 Better naming and simpler template maybe 2018-09-26 17:58:06 -07:00
David Back
7e7dc33acd more CR changes + fix resizing 2018-09-26 17:57:44 -07:00
Roxanne Skelly
ba1bae6408 OSX Build fix 2018-09-26 17:43:04 -07:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
Wayne Chen
33db8e1f24 only allow right-click for buttons 2018-09-26 16:40:43 -07:00
John Conklin II
7701cfd9c8
Merge pull request #14084 from luiscuenca/appearOnFloorFix 
Fix avatars loading below the ground bug
 2018-09-26 16:00:53 -07:00
Wayne Chen
fda3ec87ce removing lingering print statement 2018-09-26 15:57:57 -07:00
sam gateau
34203c67b0 Addressing the merge with master 2018-09-26 15:42:13 -07:00
Gabriel Calero
3163ae5997 Fix case 18465: redirect to domain after login 2018-09-26 19:41:43 -03:00
Roxanne Skelly
db772fc3fe Update console name for osx build 2018-09-26 15:39:45 -07:00
Wayne Chen
afae4f3b96 adding toolbar reappearing 2018-09-26 15:33:57 -07:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Howard Stearns
6e2a7c280e bottleneck opening our marketplace, and make sure it sets up wallet 
first
 2018-09-26 15:21:53 -07:00
John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 
fix MyAvatar-vs-OtherAvatar collisions
 2018-09-26 15:21:18 -07:00
Wayne Chen
db77cbcbc1 new location drop - unparent overlays 2018-09-26 15:12:48 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00