Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
SamGondelman
e282d51883
CR
2018-11-26 01:15:07 -05:00
sam gateau
9ee35def3d
trying to fix the include issue
2018-11-21 15:42:35 -08:00
Wayne Chen
bf285b3570
adding experimental login state sound
2018-11-21 14:14:07 -08:00
Wayne Chen
51f5942a7f
adding sound to login screen
2018-11-21 13:36:36 -08:00
sam gateau
be03859ed6
Warnings from build
2018-11-21 13:31:54 -08:00
Wayne Chen
d12655ed7b
sfx to login mousearea/hiding desktop toolbar
2018-11-21 12:21:19 -08:00
sam gateau
44b9b92450
Getting ready for merge
2018-11-20 17:32:04 -08:00
Wayne Chen
cdee10d0b8
getting dominant hand laser + sign up working
2018-11-20 16:54:16 -08:00
sabrina-shanman
be511378cd
Merge branch 'master' into hfm_serializer
2018-11-20 13:42:24 -08:00
Wayne Chen
4d55081184
changing the keyboard password flag appropriately
2018-11-20 10:56:34 -08:00
Wayne Chen
5f658b90ff
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-20 10:44:29 -08:00
Wayne Chen
d55c9467e7
fixing keyboard offset
2018-11-20 10:37:30 -08:00
Dante Ruiz
db607e564f
fixing keyboard mallets dimensions
2018-11-20 09:13:07 -08:00
SamGondelman
372f4390e8
replicate default skybox
2018-11-19 19:14:07 -05:00
sam gateau
84cd2a8ef6
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-19 15:23:55 -08:00
Wayne Chen
e0eba2135a
Merge branch 'master' into loginInitiative2
2018-11-19 15:23:43 -08:00
Wayne Chen
2820328137
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-19 15:21:24 -08:00
Wayne Chen
1419ec907b
adding wip
2018-11-19 13:57:55 -08:00
Ryan Huffman
c87748830f
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity
...
MS19903: don't trigger virtual keyboard scroll on non input focus.
2018-11-19 13:52:22 -08:00
David Rowe
7ffa70d0ac
Fix memory accumulating while Interface is minimized
2018-11-20 09:36:58 +13:00
Thijs Wenker
84e8e21d85
don't trigger virtual keyboard scroll on non input focus.
2018-11-19 21:08:21 +01: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
John Conklin II
d63a850ec0
Merge pull request #14409 from danteruiz/keyboard-touchups
...
keyboard address some feedback
2018-11-19 09:48:00 -08:00
Wayne Chen
3555276817
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-19 09:02:30 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
vladest
db82994b4d
Merge branch 'master' into qml_warning_fix
2018-11-18 16:10:21 +01:00
Sam Gateau
837b321004
merging with master
2018-11-17 10:35:05 -08: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
SamGondelman
0fccb4c73c
move to batch, try to use static
2018-11-17 01:45:16 -08:00
Sam Gateau
5f062bbcf5
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-11-16 20:05:08 -08: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
SamGondelman
cbe5814c64
shader compilation prototype
2018-11-16 15:18:56 -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
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC
...
Case 19722 - Auto-Tester on Mac.
2018-11-16 12:49:58 -08:00
Wayne Chen
4f1361c0ea
adding keyboard following login dialog
2018-11-16 12:31:22 -08:00
sam gateau
9dd6c8d9d9
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-16 11:55:44 -08:00
Wayne Chen
a2a09bc2b9
fixing compile error
2018-11-16 11:16:24 -08:00
Sam Gateau
0166d7748a
Merging with master around rc76 cut time
2018-11-15 22:52:37 -08:00
Wayne Chen
27f02c072a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-15 18:49:49 -08:00
Wayne Chen
02248e77e4
got the overlay to start recentering
2018-11-15 17:03:55 -08:00
Howard Stearns
8e1785bd90
security settings post-oculus-store wording
2018-11-15 15:59:52 -08:00
Jamil Akram
35ec0b60ab
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model
...
FB18302 Remove deprecated Package Model functionality
2018-11-15 15:52:04 -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
r3tk0n
60832b071c
Fix logic for cases with rift headset but no touch controllers.
2018-11-15 14:08:38 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash
...
Rework audio data memory ownership model to fix injector crashes
2018-11-15 13:25:42 -08:00
Dante Ruiz
20ad05726e
entity server timout
2018-11-15 10:52:40 -08:00
NissimHadar
e6190eb429
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-15 10:45:05 -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
bf731f32b9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-15 09:46:32 -08:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
...
FB17479 - Fix scripted key release events for handshakes.
2018-11-15 09:21:32 -08:00
Wayne Chen
e787fd5371
experimenting with overlay pos/rot. update
2018-11-15 08:02:28 -08:00
humbletim
d0e4c62978
fix merge conflict
2018-11-14 23:50:02 -05:00
humbletim
21030fbe5b
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
2018-11-14 23:40:04 -05:00
NissimHadar
a74e123229
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-14 20:20:41 -08:00
Atlante45
31033ad685
Update TTS audio API use
2018-11-14 15:42:39 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Wayne Chen
6707bf55ef
experimenting login overlay following hmd
2018-11-14 14:46:59 -08:00
Clement
7f910a38e3
Update keyboard injector to new interface
2018-11-14 14:46:08 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -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
Wayne Chen
76f33ff853
dont allow auto-switch after display mode change
2018-11-14 13:27:00 -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
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
David Rowe
010f7121a3
Fix Goto app clicks not working
...
Includes better card highlighting fix.
2018-11-14 15:27:18 +13:00
Wayne Chen
7375840eda
adding 3d keyboard/get anchor id wip for reposition
2018-11-13 17:09:47 -08:00
Thijs Wenker
0248323bee
fix test path
2018-11-14 01:05:38 +01:00
Thijs Wenker
cc207537a3
Fix for unintended snapshots while parenting/un-parenting
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
sabrina-shanman
e08bc7296f
Merge branch 'master' into hfm_serializer
2018-11-13 15:41:49 -08:00
r3tk0n
dd8bbeb0e5
Clean up code and remove comments.
2018-11-13 15:36:25 -08: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
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
2afc8c505d
Merge pull request #14344 from ElderOrb/FB19348
...
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-13 14:29:25 -08:00
Wayne Chen
e84361f267
getting hmd/desktop switch working
2018-11-13 14:20:23 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820
...
Fix entities not loading when Interface doesn't have focus
2018-11-13 13:45:42 -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
4cab805392
Merge pull request #12718 from gcalero/tester_flag
...
Detect if Interface is running on an android testing device
2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
...
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub
b5e432bcb1
Merge pull request #14265 from amantley/needToSquat
...
Bug fix for Users unable to Squat
2018-11-13 12:01:06 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
...
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -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
NissimHadar
ef34ff622a
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-13 11:11:53 -08:00
Dante Ruiz
1a95ee2b31
making requested changes
2018-11-13 11:11:18 -08:00
Dante Ruiz
10d045b11b
fix infinate loading if entity server is not running
2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus
...
Case 19475: Fix various Oculus Store test failures
2018-11-13 11:06:39 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404
...
Fix interstitial page not displaying at Interface start-up
2018-11-13 10:38:38 -08:00
Wayne Chen
5b021041bb
adding play area center for overlay position
2018-11-13 10:23:28 -08:00
NissimHadar
2011e7b94c
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-13 10:12:52 -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
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577
...
Add option to start up at home location
2018-11-13 09:29:37 -08:00
NissimHadar
fc832bff58
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-13 08:27:23 -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
David Rowe
e12833da23
Fix entities not loading when Interface doesn't have focus
...
Reverts https://github.com/highfidelity/hifi/pull/14286
2018-11-13 14:50:02 +13:00
Howard Stearns
7da440a886
Merge pull request #14385 from howard-stearns/inventory-icons-again
...
new inventory icons, and align message waiting light in items tab
2018-11-12 17:05:06 -08:00
Wayne Chen
206c1d5b53
adding background image
2018-11-12 16:23:12 -08:00
Sam Gondelman
f68706e72f
Merge pull request #14252 from gcalero/enable_aec_by_default
...
Enabled AEC by default (bug 19210)
2018-11-12 16:15:33 -08:00
sabrina-shanman
5b6e2aae5a
Remove/move some unused serializer imports
2018-11-12 16:12:21 -08:00
sabrina-shanman
f971294d6d
Make HFMSerializer return a smart pointer to an HFMModel
2018-11-12 16:12:21 -08:00
sabrina-shanman
00f2b4eeb9
Make the existing model serializers based on HFMSerializer
2018-11-12 16:12:20 -08:00
sabrina-shanman
83cc90ace0
Re-name GLTFReader to GLTFSerializer and do the same for other model readers
2018-11-12 16:12:20 -08:00
Jeff Clinton
ab8ba2daad
Merge pull request #14230 from amantley/shoulderSpaceFix
...
Hand Azimuth improvement
2018-11-12 16:00:26 -08:00
amantley
f2f4a55c19
removed cruft
2018-11-12 15:07:14 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
Howard Stearns
3431bdbb0e
new inventory icons, and align message waiting light in items tab
2018-11-12 14:51:32 -08:00
John Conklin II
ec4f2f781d
Merge pull request #14352 from Atlante45/feat/solo-source
...
[master] Add audio soloing feature
2018-11-12 14:07:30 -08:00
NissimHadar
07515eab68
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-12 14:00:46 -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
Jamil Akram
6511b60aa4
Merge pull request #14264 from ctrlaltdavid/M19085
...
Fix AvatarManager.getPalData() returning data for just a single avatar
2018-11-12 12:27:58 -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
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
...
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
2018-11-12 10:45:52 -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
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
...
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
NissimHadar
ae28de119f
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-12 08:27:17 -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
Wayne Chen
c927cd6287
wip on overlay spawn in play area
2018-11-09 15:02:14 -08:00
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -08:00
Zach Fox
1ce6079c5a
Remove extra as
2018-11-09 11:26:18 -08:00
NissimHadar
8d4d0beebd
Cleanup
2018-11-08 17:52:07 -08:00
NissimHadar
dddb08b7fb
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-08 17:50:14 -08:00
Wayne Chen
b500a9ebbb
using experimental play area
2018-11-08 17:13:14 -08:00
David Rowe
de61f0f010
Add missing JSDoc noticed in passing
2018-11-09 14:00:47 +13:00
David Rowe
c9b3fda724
Merge branch 'master' into M19768
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
r3tk0n
d2a1b35f96
Fix desktop case showing Vive controls.
2018-11-08 16:50:11 -08:00
David Rowe
5c97954e66
Merge branch 'master' into M19404
...
# Conflicts:
# scripts/system/interstitialPage.js
2018-11-09 13:35:11 +13:00
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
Wayne Chen
f4ae55d534
adding experimental play area position for overlay
2018-11-08 15:46:27 -08:00
Wayne Chen
fe0bbe19d7
creating login overlay upon startup in HMD/feedback changes
2018-11-08 14:32:11 -08:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
...
3D Keyboard.
2018-11-08 13:35:13 -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
Zach Fox
1de4f9c3cc
Correct portal math
2018-11-08 13:07:49 -08:00
Brad Davis
8c4f0ec774
Vcpkg migration
2018-11-08 12:28:06 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
...
Interstitial bug fixes
2018-11-08 11:43:38 -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
John Conklin II
ab9c494fef
Merge pull request #14367 from SamGondelman/tablet
...
Case 17284: Fix tablet culling
2018-11-08 11:14:12 -08:00
r3tk0n
05939f8a7c
Fix settings to only show relevant HMD controls.
2018-11-08 11:09:19 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin
...
case 18450: Do not show login dialog if requested not to on the command line.
2018-11-08 10:43:21 -08:00
Zach Fox
811b01816b
CR round 3
2018-11-08 10:41:31 -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
f664421fe0
addressing code review feedback
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
David Rowe
e5fe2622ae
Merge branch 'master' into M19768
2018-11-08 17:13:02 +13:00
Wayne Chen
3f7e810eb8
Update LoginDialog.cpp
2018-11-07 16:47:27 -08:00
Wayne Chen
13de13b822
delete unneeded headers
2018-11-07 16:45:59 -08:00
Wayne Chen
f683a51ef5
allowing qApp to load overlay/load default scripts if runningscripts empty
2018-11-07 16:32:06 -08:00
Zach Fox
69ade28c45
Merge branch 'master' of github.com:highfidelity/hifi into portalPrototype
2018-11-07 15:47:47 -08:00
NissimHadar
f0dd07294e
Added the no-login option.
2018-11-07 15:10:01 -08:00
Zach Fox
cee1454f6e
CR feedback - thanks Ken!
2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce
fix tablet culling
2018-11-07 15:02:32 -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
NissimHadar
e00c9333c6
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-07 14:54:18 -08:00
Zach Fox
d2d5132f72
It's working!
2018-11-07 14:51:19 -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
b837cbd8a0
removing debug statement
2018-11-07 14:05:50 -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
Zach Fox
668e4aeafd
The Beginnings
2018-11-07 11:55:10 -08:00
Wayne Chen
fc32ba9ce3
fixing create app window on desktop
2018-11-07 09:26:34 -08:00
NissimHadar
189a799a3a
Added method to detect OS type. Needed for running automated tests.
2018-11-07 08:58:38 -08:00
David Rowe
28097933ed
Add setting to enable/disable the mini tablet
2018-11-07 14:39:06 +13:00
Wayne Chen
1ded4b6fb8
hiding previous username/hiding dev menu
2018-11-06 16:45:45 -08:00
SamGondelman
887c4f108f
high detail not low
2018-11-06 16:34:16 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
SamGondelman
e20aeb28eb
force low detail on oculus first run
2018-11-06 15:58:35 -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
8797c40d94
cleanup unused functions
2018-11-06 15:04:51 -08:00
Wayne Chen
0fcbc11419
forgot file
2018-11-06 14:53:38 -08:00
sabrina-shanman
e654ff9bbc
Remove forward declaration in HFM.h so ModelPackager and other things can use it instead
2018-11-06 14:53:23 -08:00
Howard Stearns
05becb870f
remove urls from logs in Interface
2018-11-06 13:47:07 -08:00
Wayne Chen
c8071e81b1
sending user to saved address if logged in
2018-11-06 13:32:31 -08:00
Clement
0ca0a6f3be
Fix JSDoc arrays
2018-11-06 12:57:17 -08:00
Wayne Chen
9beedf9292
changing login overlay size + add keyboard
2018-11-06 12:56:50 -08:00
Zach Fox
378bf911d4
Fix another build error
2018-11-06 12:48:17 -08:00
Clement
4e802b0f3f
Add JSDoc comments
2018-11-06 11:59:15 -08:00
sabrina-shanman
1a69afb3e8
Move HFM.h to hfm subfolder per convention
2018-11-06 11:43:19 -08:00
Zach Fox
c33f9b6ea3
Fix build error
2018-11-06 11:26:09 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
NissimHadar
91fb592d3f
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-06 10:19:52 -05: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
NissimHadar
e9a636d751
Revert...
2018-11-05 22:13:02 -05:00
NissimHadar
c0e7a4348b
Reverted changes to Interface.
2018-11-05 22:10:20 -05:00
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
Wayne Chen
235df365aa
wip on disabling pointers
2018-11-05 17:41:42 -08:00
Wayne Chen
77b47d4b32
adding class for creating overlay and lasers
2018-11-05 17:29:01 -08:00
Anthony Thibault
ac8281075b
Code review feedback
...
Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()
2018-11-05 17:25:00 -08: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
b54b5082ee
Merge branch 'master' of github.com:highfidelity/hifi into tabless
2018-11-05 16:14:49 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce
...
Oculus store commerce
2018-11-05 16:13:04 -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
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
...
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Gabriel Calero
344774dcec
Merge remote-tracking branch 'upstream/master' into tester_flag
2018-11-05 19:13:04 -03:00
Gabriel Calero
611881e002
Mute when entering a domain
2018-11-05 18:35:57 -03: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
sabrina-shanman
a98a9b1c0c
Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs
2018-11-05 12:47:34 -08:00
sabrina-shanman
e00024e8b0
Create HFM library
2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
Wayne Chen
9deeee6534
removing unused classes
2018-11-05 11:07:29 -08:00
Zach Fox
a4d36b3845
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-05 10:25:58 -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
Alexander Ivash
3bc274dd10
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-04 23:11:59 +05:30
Wayne Chen
23141662ff
changing button channel to enum
2018-11-02 20:09:28 -07:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab
Use AccountManager instead of settings
2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
...
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Dante Ruiz
b33934ec46
fixing Image3DOverlay scaling
2018-11-02 14:24:14 -07:00
NissimHadar
562c9b1196
"works" on Mac
2018-11-02 13:35:38 -07:00
