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
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
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
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
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
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -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
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
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
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
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
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
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
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13: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
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
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -07:00
Gabriel Calero
28c062b842
Don't show stats in release builds
2018-10-24 11:57:59 -03:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -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
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -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
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
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
