Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 23:18:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74371 commits 69 branches 58 tags 1.2 GiB
Commit graph

4237 commits

Author SHA1 Message Date
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00
Zach Fox
dff7804cdc Change username to trashbot 2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098 Implement MS20187: Add trash can feature to Inventory 2018-12-11 15:44:42 -08:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory 
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
 2018-12-10 10:49:06 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1 
Pay-Out API Frontend, Part One
 2018-12-06 15:25:54 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Zach Fox
235b27a198 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308 Secret to Coupon ID 2018-12-05 16:34:53 -08:00
Anthony Thibault
7f2e427584 Added DropAfterDelay strategy to Vive Tracker Calibration Dialog 
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
 2018-12-03 18:56:45 -08:00
Zach Fox
ab184c5c2b Authorized Script to Coupon 2018-12-03 15:16:06 -08:00
Anthony Thibault
c0bf832e39 Head and Hand offsets for Vive Trackers now function as expected 
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now.  This gives you the ability to adjust
the offsets of the pucks to the hands/head.  For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
 2018-12-02 16:18:36 -08:00
Zach Fox
0d66d230c5 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-11-30 16:45:03 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix 
Fix QML achoring warnings on Layouts
 2018-11-30 10:50:30 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option 
Keyboard menu option in general settings
 2018-11-30 09:43:10 -08:00
Zach Fox
bc39dbba8b Finish out the feature 2018-11-29 12:44:30 -08:00
Zach Fox
371c50b2ab Start work on Pay Out UI 2018-11-28 11:01:40 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
John Conklin II
6b25179aa9
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue 
Dismiss keyboard when backout of the login screen
 2018-11-19 09:58:54 -08:00
vladest
db82994b4d Merge branch 'master' into qml_warning_fix 2018-11-18 16:10:21 +01:00
Alexander Ivash
fe43c733f8 FB19400 during shutdown -- TypeError: Cannot read property 'buttons' 2018-11-17 22:56:59 +05:30
vladest
932d1dbcd7 Fixed width binding loop warning 2018-11-17 17:20:02 +01:00
vladest
53b7cc1376 Fix QML achoring warnings on Layouts 2018-11-17 15:06:25 +01:00
Dante Ruiz
4388763c34 fixing keyboard not being dismissing when backout of the login screen 2018-11-16 16:04:40 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading 
Fixing case of interstitial not finishing loading
 2018-11-16 14:53:01 -08:00
Howard Stearns
8e1785bd90 security settings post-oculus-store wording 2018-11-15 15:59:52 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697 
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
 2018-11-15 14:54:26 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859 
Fix Goto app clicks not working
 2018-11-15 09:56:56 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238 
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
 2018-11-14 14:38:34 -08:00
David Rowe
9c5d318341 Fix highlighting 2018-11-15 10:15:30 +13:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
David Rowe
010f7121a3 Fix Goto app clicks not working 
Includes better card highlighting fix.
 2018-11-14 15:27:18 +13:00
Thijs Wenker
0248323bee fix test path 2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
 2018-11-13 15:07:21 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode 
Bug fix for head trackers in desktop mode
 2018-11-13 11:49:24 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
1611525220
Merge pull request #14028 from ElderOrb/FB12459 
Improve keyboard raising logic for web views
 2018-11-13 09:41:04 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836 
Make tablet page indicators clickable to scroll tablet
 2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640 
Fix Goto app cards staying highlighted if move off dialog while dragging
 2018-11-13 09:32:24 -08:00
Alexander Ivash
b16efb2afb set minimum shoulder width to 25 cm (based on discussion with Tony) 2018-11-13 19:06:10 +05:30