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
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
...
MS19550 - Don't show help for HMDs that aren't plugged in and active
2018-11-16 15:49:46 -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
Dante Ruiz
a77121a588
keyboard touch ups
2018-11-16 14:20:17 -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
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47: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
r3tk0n
ecee319602
Get logic working correctly.
2018-11-13 15:20:46 -08: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
Alexander Ivash
3a62184afd
specify min/max/stepsize
2018-11-13 19:06:09 +05:30
Alexander Ivash
95c51c2ffa
unfocus spinboxes on finishing editing
2018-11-13 19:05:20 +05:30
Alexander Ivash
37bb3586ea
show spinbox suffix in separate control to: disallow editing it & allow to pass validator
2018-11-13 19:05:16 +05:30
Alexander Ivash
a9ff1f4ecd
add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog
2018-11-13 19:03:50 +05:30
Wayne Chen
206c1d5b53
adding background image
2018-11-12 16:23:12 -08:00
Howard Stearns
3431bdbb0e
new inventory icons, and align message waiting light in items tab
2018-11-12 14:51:32 -08:00
r3tk0n
597f83e6d5
HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2
2018-11-12 13:58:37 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
John Conklin II
cd3dc04dc5
Merge pull request #14159 from alexiamandeville/WoodyUpdate
...
Updating Woody avatar for new UV seams
2018-11-12 12:12:49 -08:00
John Conklin II
33da88f174
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
...
Tweak transit animations
2018-11-12 10:39:56 -08:00
Wayne Chen
ea325acef9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-12 10:28:03 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry
...
Actually fix MS19803: Replace missing imports
2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9
Actually fix MS19803: Replace missing imports
2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a
Remove extra as
2018-11-09 11:26:18 -08:00
r3tk0n
d2a1b35f96
Fix desktop case showing Vive controls.
2018-11-08 16:50:11 -08:00
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
r3tk0n
84209c0e53
Finally fix all indentation.
2018-11-08 13:18:25 -08:00
Jason Najera
59bba5b6e6
More attempt to fix indentation.
...
Still looked fine in github's editor and N++.
2018-11-08 13:16:24 -08:00
Jason Najera
b4be7544b9
Attempt to fix spacing
...
Weird thing is it still looked fine in GitHub's editor...
2018-11-08 13:15:19 -08:00
r3tk0n
a6494bf379
Fix edge case with Oculus.
2018-11-08 11:25:55 -08:00
r3tk0n
1bd978e4c3
Clean up code in tabletHelp.html
2018-11-08 11:22:43 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2
2018-11-08 11:17:24 -08:00
r3tk0n
05939f8a7c
Fix settings to only show relevant HMD controls.
2018-11-08 11:09:19 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1
feedback changes
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
...
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Wayne Chen
dd1cf1be6c
adding back deprecated UI toolkit
2018-11-07 14:25:39 -08:00
Wayne Chen
a05d70cd8b
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 14:21:13 -08:00
Wayne Chen
8e075c2a7c
fixing login qml/using HMD position for overlay
2018-11-07 14:05:06 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396
...
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
2018-11-07 13:36:41 -08:00
Wayne Chen
edf16b15e8
missed a file
2018-11-07 12:04:28 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Wayne Chen
fc32ba9ce3
fixing create app window on desktop
2018-11-07 09:26:34 -08:00
Wayne Chen
1ded4b6fb8
hiding previous username/hiding dev menu
2018-11-06 16:45:45 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505
Fix MS19743: Fix case where user couldn't update certain items
2018-11-06 15:47:47 -08:00
Wayne Chen
7c2dd973b7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-06 15:34:34 -08:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Wayne Chen
0fcbc11419
forgot file
2018-11-06 14:53:38 -08:00
Wayne Chen
c8071e81b1
sending user to saved address if logged in
2018-11-06 13:32:31 -08:00
Wayne Chen
9beedf9292
changing login overlay size + add keyboard
2018-11-06 12:56:50 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Alexander Ivash
a3dfc873b7
rsolve rebase conflict
2018-11-06 14:21:14 +05:30
Alexander Ivash
4c6700b497
remove deprecations warnings
2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416
change imports (how could I miss this place?)
2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4
return controls-uit & styles-uit folders to preserve backward-compatibility
2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d
add FilterBar & ScrollBar to qmldir
2018-11-06 14:21:14 +05:30
Alexander Ivash
82313f9464
update imports for utilities / all other qml files found
2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244
cherry-picking
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
luiscuenca
6ed6e30df3
Tweak transit animation
2018-11-05 19:14:40 -07:00
luiscuenca
f9b6d3dc6f
Merge addTransitAPI branch
2018-11-05 19:02:35 -07:00
Anthony Thibault
ac8869eb61
Bug fix for head trackers in desktop mode
...
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
Wayne Chen
9deeee6534
removing unused classes
2018-11-05 11:07:29 -08:00
Wayne Chen
2dd20de1bd
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-05 09:13:25 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Howard Stearns
3e2d6c341b
placeholder svgs
2018-11-01 11:45:25 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Wayne Chen
c43e67e4a8
adding tabbing between textfields
2018-10-31 16:57:03 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Wayne Chen
6822287d67
sending to tutorial if dismiss login
2018-10-31 16:13:01 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Wayne Chen
f62c8ae87a
overlay HMD implementation
2018-10-31 15:26:49 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
efcda129b7
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Roxanne Skelly
b5a48d31b6
Fix code-review spacing issue
2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Wayne Chen
03c39eb92f
more wip
2018-10-31 07:45:55 -07:00
Roxanne Skelly
e5f06690b5
Strip out references to 'my purchases' vs 'my items' code
2018-10-30 17:31:31 -07:00
Roxanne Skelly
0e639f4e34
Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce
2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456
Checkpoint Proofs Filter in Inventory
2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
Wayne Chen
43b269b612
testing tablet implementation
2018-10-30 11:48:22 -07:00
David Rowe
1a129335dd
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-10-30 19:57:07 +13:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
Wayne Chen
af04630642
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-26 17:53:13 -07:00
Wayne Chen
955b0a580e
adding hooks for application for pause/resume
2018-10-25 17:25:44 -07:00
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13:00
Wayne Chen
5e73fe3e41
more wip
2018-10-25 14:11:55 -07:00
Howard Stearns
9095df4641
fix getting inventory back after showing my items
2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab
don't show price for free items
2018-10-25 12:46:30 -07:00
Howard Stearns
3503d79b05
missed a buy/purchase
2018-10-25 12:39:33 -07:00
Howard Stearns
e3b1e14db6
nix "buy" where possible.
2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Wayne Chen
75efc465b4
adding logging in qml wip
2018-10-24 17:34:42 -07:00
Wayne Chen
030b5a2745
resetting bodyLoader first source
2018-10-24 17:31:20 -07:00
Wayne Chen
951c4b2961
updating tablet implementation
2018-10-24 17:26:18 -07:00
Howard Stearns
993cb0cfa0
restore separation of inventory vs proofs.
2018-10-24 12:00:17 -07:00
David Back
b3e0d51260
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-24 11:48:56 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation
...
Add animations to Avatar Transit
2018-10-24 10:51:21 -07:00
Wayne Chen
fad147656b
tablet implementationWIP
2018-10-24 10:47:32 -07:00
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -07:00
Wayne Chen
331b09c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-24 09:16:24 -07:00
Gabriel Calero
28c062b842
Don't show stats in release builds
2018-10-24 11:57:59 -03:00
Wayne Chen
eb36abbff6
more wip
2018-10-23 23:10:16 -07:00
Wayne Chen
3522fe5263
some work to profile screen
2018-10-23 22:19:54 -07:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -07:00
Wayne Chen
c28f0fd232
updating qml, adding new glyphs font
2018-10-23 16:22:42 -07:00
Howard Stearns
7707d92a95
connect wiring on purchases
2018-10-23 16:07:35 -07:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix
...
Sit State for the seated user in HMD: Squatty Potty Fix
2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
Zach Fox
988bca201b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:36:46 -07:00
Howard Stearns
97bc84ed87
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 13:28:35 -07:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste
...
Add copy/paste functionality to edit.js
2018-10-23 13:18:12 -07:00
Zach Fox
897d21bea2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7
initial limited commerce for oculus store prototype
2018-10-23 13:08:39 -07:00
Wayne Chen
d5b7fe62db
modularizing qml font in login
2018-10-23 11:00:42 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Wayne Chen
56656a9079
adding button font modularity/using cairo
2018-10-23 10:46:19 -07:00
Wayne Chen
2a0a099397
adding steam svg
2018-10-23 10:04:21 -07:00
Wayne Chen
162502923a
image for steam login button
2018-10-23 10:00:35 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -07:00
Wayne Chen
c087b0f196
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-23 08:51:45 -07:00
amantley
3e8663f8e9
removed the dropdown from the avatar app, because it is in settings controls now
2018-10-22 22:31:26 -07:00
Wayne Chen
137b240a47
more changes to functions
2018-10-22 20:03:12 -07:00
Wayne Chen
84001ae208
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 17:59:33 -07:00
Wayne Chen
1e418e9976
some cleanup in LinkAccountBody
2018-10-22 17:52:03 -07:00
amantley
472ab1c613
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-22 17:50:56 -07:00
amantley
cce2f295a1
fixed conflict in myskeletonmodel.cpp
2018-10-22 17:49:30 -07:00
Wayne Chen
736a78061d
button style change/cant access text
2018-10-22 17:44:03 -07:00
Wayne Chen
b33267a63a
more wip
2018-10-22 17:38:12 -07:00
Zach Fox
1d8994993c
Whitelist TTS scripting interface to TTS app, which is now a default script
2018-10-22 17:05:31 -07:00
luiscuenca
afc76fec72
Added overrideNetworkAnimation and restoreNetworkAnimation methods
2018-10-22 15:20:32 -07:00
David Back
e8bda1793f
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-22 15:12:45 -07:00
Zach Fox
f9cc4f5a69
Count unique source and url pairs
2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b
Only show unique resources
2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc
Tons of improvements
2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Ryan Huffman
9cc2add4a0
Add copy/paste functionality to edit.js
2018-10-22 13:56:07 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-10-22 11:50:09 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting
...
Add a 'grabbable' option to the new-model dialog
2018-10-22 11:42:40 -07:00
Wayne Chen
d7a4531d00
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 09:27:23 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
amantley
a427ddb235
removed extraneous print statements
2018-10-20 09:16:05 -07:00
amantley
55daeb11cd
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
2018-10-19 18:43:02 -07:00
amantley
070a517423
changed the recenterModel variables to userRecenterModel
2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
cd4e9a3e08
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
...
Updating highlight textures on Rift Controller
2018-10-19 16:39:17 -07:00
Wayne Chen
3bd10716b2
wip
2018-10-19 16:06:28 -07:00
amantley
a43985ef64
combo box for recenter model is added
2018-10-19 16:03:53 -07:00
Wayne Chen
8c7a5e98f2
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 11:31:43 -07:00
Brad Hefta-Gaub
b281c090e3
Merge pull request #14012 from alexiamandeville/controlImageUpdate
...
Adding handshake control to image in Controls Reference
2018-10-19 11:15:11 -07:00
Alexander Ivash
5fef331995
address CR comment
2018-10-19 19:35:12 +03:00
Wayne Chen
e32460ed96
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 09:25:57 -07:00
Alexander Ivash
5d8a253785
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
...
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
2018-10-19 18:57:07 +03:00
amantley
0837f790eb
combo box changes
2018-10-19 07:46:16 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap
...
Fix MS18154: Don't snap to cards in My Purchases
2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
...
make room for keyboard and help in SendAsset
2018-10-18 17:53:52 -07:00
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
John Conklin II
b2e84a8f3b
Merge pull request #14191 from howard-stearns/new-rez-images
...
new images for My Purchases rez tutorial
2018-10-18 17:50:30 -07:00
Anthony Thibault
51d767ac2b
Reasonable defaults for position and rotation filtering for vive tracked joints.
2018-10-18 17:46:32 -07:00
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e
Remove cruft
2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945
UX/UI improvements
2018-10-18 15:27:16 -07:00
Wayne Chen
5a381fdc03
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-18 14:53:49 -07:00
Alexander Ivash
64f67d5eb7
update imports for utilities / all other qml files found
2018-10-18 22:03:50 +03:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor
2018-10-17 20:01:15 -07:00
Alexander Ivash
0ab8a0ba5f
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: TypeError: Cannot read property of null
2018-10-18 01:23:10 +03:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
...
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
amantley
02f499e9f7
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-16 16:56:10 -07:00
David Back
50becb5c37
merge particle explorer into properties, resurrect sliders, other tidying/fixes
2018-10-16 12:39:34 -07:00
Sam Gondelman
121fc7205c
Delete Default-Sky-9-cubemap.texmeta
2018-10-14 22:36:22 -07:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
Howard Stearns
6c6d29152f
new images for My Purchases rez tutorial
2018-10-11 12:36:43 -07:00
Anthony Thibault
a3a87ef48b
Debug rendering of tracked objects, remove filters from body.
2018-10-10 17:52:26 -07:00
Howard Stearns
30971cd766
make room for keyboard and help in SendAsset
2018-10-10 15:43:20 -07:00
Wayne Chen
35eb857ea6
adding non-working login screen
2018-10-09 16:30:47 -07:00
Wayne Chen
3488763d94
reverting login dialog stuff
2018-10-09 16:29:56 -07:00
Alexander Ivash
6e66f289fe
take 'materialData?materialName' cases into account
2018-10-09 23:08:14 +03:00
Anthony Thibault
7777f3edd0
Added OutOfRangeDataStrategy parameter to Controller Settings
...
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.
* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results. This is the default.
2018-10-09 10:51:02 -07:00
Anthony Thibault
d15cc86735
Added deceleration limit to AccelerationLimiterFilter
2018-10-09 10:51:01 -07:00
Anthony Thibault
8642edd144
Added acceleration limit filter to controller system
2018-10-09 10:51:01 -07:00
amantley
c4187f0d60
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-08 17:07:55 -07:00
Wayne Chen
91e34a305c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-08 16:46:45 -07:00
Alexander Ivash
7d470cf161
FB18859 - Avatar App Bug when material entity is added as avatar entity
2018-10-09 01:59:41 +03:00
Alexia Mandeville
911e5e6b52
Deleting GLES files because they are no longer necessary
2018-10-08 14:37:50 -07:00
Alexia Mandeville
3d70cec61b
Updating UV seams on Qoody
2018-10-08 14:28:31 -07:00
Alexia Mandeville
f2a5b1f497
Updating Woody avatar for new UV seams
2018-10-08 11:52:07 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
Wayne Chen
83d683de7a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-08 08:52:38 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
