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

72402 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
f96c7f4db4 minimal time handshake 2018-09-27 17:05:18 -07:00
David Back
215e7e6da7 remove unneeded variable 2018-09-27 17:04:43 -07:00
David Back
b7c098c260 remove unneeded variable 2018-09-27 17:02:54 -07:00
David Back
4204adf60f fix deselecting entity when re-clicking row, fix ctrl/shift selections 2018-09-27 16:59:23 -07:00
Roxanne Skelly
6d0996c254 Show "Sandbox" as the server component for server installs, show 
"Console" for client-only installs
 2018-09-27 16:52:03 -07:00
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
David Rowe
d98e7cea4e Fix not being able to grab tablet with other hand 2018-09-28 11:09:16 +12:00
Howard Stearns
ad676b14a1 doh - return with a newline (and no semicolon) does not continue. Don't 
need extra handler in marketplace any more.
 2018-09-27 16:06:55 -07:00
David Back
8c306b8428 disable debug pick plane 2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9 better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup 2018-09-27 16:01:20 -07:00
Howard Stearns
4cf5b51124 works, using additional handler from wallet.js 2018-09-27 15:34:16 -07:00
Roxanne Skelly
57fcdddea2 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 15:22:38 -07:00
Roxanne Skelly
c3e956932b Fix OSX Build 2018-09-27 15:22:04 -07:00
Gabriel Calero
5fc24b2587 UI fixes in login and signup for S8 and S9 aspect ratio 2018-09-27 19:20:38 -03:00
David Rowe
1088a0f9ae Fix invalid state transition in desktop mode 2018-09-28 10:19:17 +12:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
sabrina-shanman
74937a1979 Serialize PickRay according to its variables 2018-09-27 14:41:38 -07:00
sabrina-shanman
c3df710396 Use bracket default initialization for PickQuery::_jointState 2018-09-27 14:34:36 -07:00
sabrina-shanman
bfa270375a Simplify PickRay calculations in RayPick::getMathematicalPick 2018-09-27 14:33:29 -07:00
sabrina-shanman
9e0d35e40d Combine PickScriptingInterface::getPickJointState and createTransformNode into one function 2018-09-27 14:28:10 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
ec4575f587 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 13:36:10 -07:00
Roxanne Skelly
b0b2c6f3ee Fixup path finding for interface 2018-09-27 13:31:28 -07:00
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
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
sabrina-shanman
a9164f96b9 Fix some inaccuracies in the pick parenting doc 2018-09-27 09:53:42 -07:00
Gabriel Calero
fba3b48923 Merge remote-tracking branch 'upstream/master' into android_signup 2018-09-27 11:38:52 -03: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