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
NissimHadar
51272d8fec
Added setGeometry script command.
2018-11-02 13:09:07 -07:00
NissimHadar
70c0addc3f
Removed setWindowSize - crashes on both Windows and Mac.
...
Fixed typo.
2018-11-02 10:47:17 -07:00
NissimHadar
c7353e6c59
Added setWindowSize - FOR TESTING ON MAC
2018-11-02 09:57:58 -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
Sam Gateau
fa0c58fa0e
Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend
2018-11-02 00:08:47 -07:00
NissimHadar
470a490494
Typo.
2018-11-01 17:31:10 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
Wayne Chen
7f805ebcb4
more wip
2018-11-01 17:16:15 -07:00
NissimHadar
d851720cb0
Added method to detect OS type. Needed for testing.
2018-11-01 16:57:28 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Roxanne Skelly
1f8dde6756
Transaction string was assuming items given to the
...
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
2018-11-01 15:44:11 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Wayne Chen
c28ed9fc4b
enabling certain menus/key events in login
2018-11-01 13:38:27 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -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
David Rowe
ae2715af31
Add option to start up at home location
2018-11-01 08:57:12 +13: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
67539bc87a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-31 09:00:37 -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
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -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
amantley
53650850da
first change to check if the hips are going through the floor : todo --> in rig disable animation when we are in experimental mode
2018-10-30 14:31:33 -07:00
SamGondelman
dd96881724
don't submit frames while oculus says it's not visible
2018-10-30 12:15:46 -07:00
Wayne Chen
43b269b612
testing tablet implementation
2018-10-30 11:48:22 -07:00
Wayne Chen
8e4837f8c8
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-30 10:23:25 -07:00
Wayne Chen
54fe9eec87
adding overlay
2018-10-30 10:19:11 -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
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988
...
Fix Interface eating memory when minimized
2018-10-29 12:52:10 -07:00
Wayne Chen
ed847203ea
wip for getting hmd overlay
2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-29 08:48:02 -07:00
Wayne Chen
11dc82a5cf
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44
adding prototype functions
2018-10-29 08:47:09 -07:00
luiscuenca
e49e9cdc56
Set avatar client sooner
2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1
Apply transit logic if avatar instance is client side
2018-10-27 07:15:31 -07:00
Wayne Chen
af04630642
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-26 17:53:13 -07:00
David Rowe
1cca975b37
Fix Interface eating memory when minimized
2018-10-27 11:40:02 +13:00
Brad Davis
36edb939c3
Try to fix android crash
2018-10-26 11:23:30 -07:00
Bradley Austin Davis
28b45ce1d9
Resolve compositing glitches
2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
David Rowe
e2ae50362e
Add missing JSDoc of Window.interstitialModeEnabled property
2018-10-26 19:21:58 +13: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
Howard Stearns
c85dbb8233
limitedCommerce switch
2018-10-25 11:25:56 -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
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates
...
Resorting Developer menu organization
2018-10-24 19:41:22 -07:00
John Conklin II
7db7131ef4
Merge pull request #14172 from dback2/entityPropertiesRefactor
...
Entity properties refactor / reorder and merge particle explorer into properties
2018-10-24 17:39:17 -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
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
...
Small avatars now have a minimum jump height of 0.25 meters
2018-10-24 17:08:28 -07:00
amantley
7fe53d4399
removed extra const float value
2018-10-24 16:32:18 -07:00
amantley
370801bd85
removed _spine2position variable and added handling for when there is no spine2 joint. In that case the head will do the recentering rotation and the shoulders will not move with the hand azimuth
2018-10-24 16:23:05 -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
humbletim
d8217e9a79
synthesize key release events on Desktop focus change
2018-10-23 22:42:06 -04:00
Wayne Chen
c34d18065c
adding login dialog properties
2018-10-23 17:02:53 -07:00
amantley
5063d0b527
changed handAzimuth to non const function
2018-10-23 16:51:56 -07:00
amantley
56deb500bb
Merge remote-tracking branch 'upstream/master' into shoulderSpaceFix
2018-10-23 16:36:52 -07:00
Wayne Chen
c28f0fd232
updating qml, adding new glyphs font
2018-10-23 16:22:42 -07:00
David Rowe
e879c5a32d
Merge branch 'master' into M19085
...
# Conflicts:
# interface/src/avatar/AvatarManager.h
2018-10-24 12:16:38 +13:00
Howard Stearns
7707d92a95
connect wiring on purchases
2018-10-23 16:07:35 -07:00
amantley
36466a4a9f
Merge remote-tracking branch 'upstream/master' into needToSquat
2018-10-23 16:07:23 -07:00
amantley
e9dae8ebeb
added force stand option for avatar lean behavior, you can now squat to your hearts content
2018-10-23 16:07:18 -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
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
...
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
...
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
SamGondelman
0efbdc1ab5
merge with master
2018-10-23 14:33:57 -07:00
Alexia Mandeville
68ab5475fe
Remove duplicate display crash options
2018-10-23 14:13:09 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
amantley
2df9d6c5e9
addressed missing changes for luis
2018-10-23 13:37:56 -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
Alexia Mandeville
178b8ef37b
Removed duplicate menu items
...
Removed duplicates:
Console...
API Debugger
2018-10-23 12:55:02 -07:00
Zach Fox
947391e49e
Fix build errors
2018-10-23 12:45:16 -07:00
amantley
9bc92cb2a3
removed leftover triggers
2018-10-23 12:29:04 -07:00
luiscuenca
fa67e1b269
Remove logs and magic numbers
2018-10-23 11:51:15 -07:00
amantley
0d39343be4
changed if statement to switch in preferencesDialog.cpp, also removed print statement
2018-10-23 11:19:47 -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
amantley
39a16703e4
updated wording for the radio buttons for avatar leaning model
2018-10-23 10:52:14 -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
amantley
8cb09c37ee
changed the ui to the settings/controls
2018-10-22 21:26:30 -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
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item
2018-10-22 15:39:23 -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
SamGondelman
09ea32dcc0
fix fading and highlighting issues
2018-10-22 14:12:43 -07:00
Zach Fox
1023e6d2b9
Fix ClipboardScriptingInterface:
2018-10-22 14:00:04 -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
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -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
humbletim
2cf633ca02
remove Model Type dropdown and related code paths
2018-10-22 15:05:49 -04:00
humbletim
b1d8a9a96b
remove Qt "whatsthis" dialog icon
2018-10-22 15:04:21 -04:00
humbletim
f7cfc61494
Package Model... -> Package Avatar...
2018-10-22 15:02:33 -04: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
bd480bab80
Merge pull request #14226 from Atlante45/fix/octree-scene-stats
...
Only track stats for compatible packets
2018-10-22 11:45:16 -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
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
NissimHadar
c9f9679cf7
Merge branch 'master' of https://github.com/highfidelity/hifi into addNoLogin
2018-10-22 10:55:56 -07:00
NissimHadar
092f88e558
Change parameter name from --no-login to --no-login-suggestion
2018-10-22 10:55:50 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder
...
Fix crash with BandwidthRecorder
2018-10-22 10:11:26 -07:00
Wayne Chen
d7a4531d00
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 09:27:23 -07:00
amantley
eb3db9a571
added default to case statement
2018-10-20 16:13:41 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
amantley
e693275b10
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-20 13:42:23 -07:00
amantley
5efb889de5
removed unused variables
2018-10-20 13:42:17 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
...
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
Brad Hefta-Gaub
23ddb7dea6
Merge pull request #14207 from Atlante45/fix/white-spheres
...
Remove pending avatars data structure
2018-10-20 12:09:51 -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
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
...
hide progress overlays if interstitial mode
2018-10-19 16:35:42 -07:00
Brad Hefta-Gaub
c6fff83805
Merge pull request #14145 from ctrlaltdavid/M17223
...
JSDoc fixes
2018-10-19 16:16:19 -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
Brad Hefta-Gaub
acc6d3e45c
Merge pull request #14144 from ctrlaltdavid/M17222
...
Fix and fill in JSDoc for MyAvatar flying-related functions
2018-10-19 15:57:04 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
...
Disable user hand controllers if they are too far away or not moving.
2018-10-19 14:02:32 -07:00
Anthony Thibault
ef74014075
Small avatars now have a minimum jump height of 0.25 meters
...
This should improve the quality of the jump animation and improve the mobility of small avatars.
2018-10-19 13:55:56 -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
John Conklin II
81fbb5a332
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab
...
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
2018-10-19 10:33:14 -07:00
Zach Fox
2df9d28c5b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-19 09:42:06 -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
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
...
Clean up elbow smoothing code
2018-10-18 19:16:32 -07:00
John Conklin II
7c4733a31d
Merge pull request #14053 from ElderOrb/FB17835
...
make extracted from resources avatarbookmarks.json writable
2018-10-18 18:29:02 -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
John Conklin II
18df79a8a6
Merge pull request #14211 from amantley/crazylegs
...
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
2018-10-18 17:48:26 -07:00
Anthony Thibault
51d767ac2b
Reasonable defaults for position and rotation filtering for vive tracked joints.
2018-10-18 17:46:32 -07:00
NissimHadar
12d092609b
Do not show login dialog if requested not to on the command line.
2018-10-18 17:20:26 -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
Zach Fox
41742aaf9e
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 16:22:41 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -07:00
John Conklin II
40a48777dc
Merge pull request #14231 from ctrlaltdavid/M16205a
...
Fix lasers going through tablet to drawInFrontOverlays
2018-10-18 15:36:29 -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
David Rowe
9b4c5e1685
Fix OSX/Linux warnings
2018-10-19 08:20:21 +13:00
Alexander Ivash
64f67d5eb7
update imports for utilities / all other qml files found
2018-10-18 22:03:50 +03:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07: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
amantley
12b03b0e07
tinkering with lerping the spine2 position in avatar space
2018-10-18 10:52:13 -07:00
Andrew Meadows
1a685d2409
set script-triggerd sim ownership priority correctly
2018-10-18 10:33:02 -07:00
David Back
abb166486a
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-18 10:17:33 -07:00
Zach Fox
2a9e0041b2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 10:16:07 -07:00
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3
...
Replace vec2, vec3, and xColor properties with JS prototypes
2018-10-18 09:47:56 -07:00
amantley
8f4fafe4d0
put some smoothing on the spine2 rotation in myskeletonmodel.cpp
2018-10-18 08:44:01 -07: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 Rowe
e339f966d9
Remove reference to a function no longer in the API
...
Noticed in passing.
2018-10-18 17:11:48 +13:00
David Rowe
1610d79023
Remove now redundant mouse pointer code that tried to do the same thing
2018-10-18 17:11:26 +13:00
David Rowe
c41ce5d484
Make tablet have priority over drawInFront overlays rendered behind it
2018-10-18 17:10:48 +13:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor
2018-10-17 20:01:15 -07:00
amantley
83ec346cc5
changed the hand azimuth computation to be in spine2 space. this stops you from having a reversed direction when you sit down with hmd lean off and the hands are behind the origin in the z direction.
2018-10-17 16:42:29 -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
8e5bc1678f
Merge pull request #14219 from SamGondelman/materialCull
...
QueryAACube fixes and materials expand to include their parent
2018-10-17 15:15:23 -07:00
Clement
a7855dcf70
Only track stats for compatible packets
2018-10-17 15:13:29 -07:00
Wayne Chen
fd3c0d2f76
pushing with new fix
2018-10-17 15:03:09 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3
2018-10-17 13:10:29 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation
...
Fix various ResourceCache bugs
2018-10-17 11:13:35 -07: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
cd7af8b605
changed the name of sumuserheightsensorspace to averageuserheightSensorSpace
2018-10-17 08:51:40 -07:00
amantley
baeccebfb9
changed the transition times to make the sit longer and the stand shorter
2018-10-16 17:45:55 -07:00
Zach Fox
26e388b139
Some experimentation yields promising results...
2018-10-16 17:34:48 -07:00
Anthony Thibault
27c495406e
Disable user hand controllers if they are too far away or not moving.
2018-10-16 17:24:47 -07:00
amantley
02f499e9f7
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-16 16:56:10 -07:00
amantley
1764531822
removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr
2018-10-16 16:31:55 -07:00
amantley
cf7dc49499
removed a commment and changed the sanity check to be a const instead of a magic number
2018-10-16 16:04:31 -07:00
amantley
952b112271
changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing.
2018-10-16 15:10:26 -07:00
SamGondelman
49b496046b
queryAACube fixes
2018-10-16 14:35:39 -07:00
luiscuenca
078baa86e4
Sitting abort post transit animation
2018-10-16 13:16:01 -07:00
David Back
50becb5c37
merge particle explorer into properties, resurrect sliders, other tidying/fixes
2018-10-16 12:39:34 -07:00
David Rowe
353938193e
Add return value
2018-10-17 08:03:56 +13:00
SamGondelman
ded8d4b547
variant conversions
2018-10-16 11:55:28 -07:00
luiscuenca
7da5fa9ea7
Transit animations won't play, they just get sent over the network
2018-10-16 11:33:58 -07:00
amantley
7d7fe8c089
removed some cruft
2018-10-15 18:12:27 -07:00
amantley
49b869c5e3
got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state
2018-10-15 18:02:50 -07:00
Wayne Chen
28a950fe9f
staging
2018-10-15 16:51:28 -07:00
amantley
9ec999e15e
added condition for start up in oculus that gets the correct starting height
2018-10-15 16:43:03 -07:00
Anthony Thibault
640ed6a32a
Added "Developer > Avatar > Show Tracked Objects" menu
2018-10-15 12:42:07 -07:00
amantley
ae3ae9ce9a
put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again.
2018-10-15 09:52:34 -07:00
amantley
8e272d6dd2
added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account
2018-10-15 08:43:25 -07:00
Sam Gondelman
121fc7205c
Delete Default-Sky-9-cubemap.texmeta
2018-10-14 22:36:22 -07:00
luiscuenca
ad09007bd8
Fix flickering holded entity, renames and refactors
2018-10-13 16:32:51 -07:00
Clement
3bfc5011f5
Remove _pendingAvatars struct
2018-10-12 17:57:48 -07:00
amantley
05d3becd40
changed cg hips computation so that it is not computed when hmdleanrecenter is turned off
2018-10-12 17:03:34 -07:00
amantley
90c9e578c8
when you unlock the transitions you now start in stand state
2018-10-12 16:47:53 -07:00
amantley
ee830cdcb0
cleaned white space
2018-10-12 16:05:31 -07:00
amantley
7dd156ccdd
made the threshold for the spine angle larger to make auto transitions more robust
2018-10-12 15:00:15 -07:00
luiscuenca
52ed6cb6e9
Abort settle animation if already moving
2018-10-12 11:35:51 -07:00
Zach Fox
53226e7924
Prevent overflows; still not working
2018-10-12 11:19:52 -07:00
David Rowe
2bd5605d8c
Fix AvatarManager.getPalData() returning data for just a single avatar
...
And fix up JSDoc.
2018-10-12 17:32:27 +13:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
Zach Fox
daeedc6ef1
Lots of progress today
2018-10-11 17:10:14 -07:00
Clement
1bcbda7ad6
Prevent race on internal client traits members
2018-10-11 16:16:24 -07:00
amantley
f73d974ad7
added a lock state so you can lock sit or stand state, also made the
...
hand azimuth relative to the spine2 location in avatar space. This stops
the arms from behaving badly when the hands are in front of the chest
but behind the root position of the avatar
2018-10-11 15:14:33 -07:00
Howard Stearns
6c6d29152f
new images for My Purchases rez tutorial
2018-10-11 12:36:43 -07:00
luiscuenca
de1b6e717f
Cancel animation on chained trasits
2018-10-11 11:35:56 -07:00
luiscuenca
2f10327ad3
Fix last anim value
2018-10-11 10:57:39 -07:00
luiscuenca
1adac78828
fix errors and set new anim parameters
2018-10-11 10:45:35 -07:00
amantley
5faf26abd1
turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions
2018-10-11 10:38:59 -07:00
Anthony Thibault
a3a87ef48b
Debug rendering of tracked objects, remove filters from body.
2018-10-10 17:52:26 -07:00
Zach Fox
5d4de3d3b0
I love it.
2018-10-10 17:36:38 -07:00
Zach Fox
d8c9712dd2
It's working!
2018-10-10 16:19:11 -07:00
Zach Fox
f1446532d0
Almost working
2018-10-10 16:13:23 -07:00
Howard Stearns
30971cd766
make room for keyboard and help in SendAsset
2018-10-10 15:43:20 -07:00
Zach Fox
7de784ce27
First steps (definitely not working)
2018-10-10 12:32:55 -07:00
unknown
82918a5c31
Add animation support
2018-10-10 12:31:16 -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
Wayne Chen
60bbcc7fc3
adding initialization of qml when keyboard ready
2018-10-09 15:20:16 -07:00
Alexander Ivash
6e66f289fe
take 'materialData?materialName' cases into account
2018-10-09 23:08:14 +03:00
Clement
8983fe2bcf
Fix new Mac warnings
2018-10-09 12:11:55 -07:00
Anthony Thibault
0283c9fbdc
Added CriticallyDampedSpringPoseHelper to help smooth out hips.
2018-10-09 10:51:02 -07: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
Wayne Chen
ccebf3edef
omitting keyboard focus hack
2018-10-08 17:18:40 -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
unknown
3c25e6d5a8
Increase the linear velocity step when the avatar is small to avoid freezing
2018-10-08 14:40:54 -07: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
Alexander Ivash
19c3f1516f
relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables
2018-10-09 00:17:19 +03:00
Clement
3eb7c80af3
Fix BandwidthRecorder storage concurrent accesses
2018-10-08 13:45:34 -07:00
unknown
1172e29d95
Clean up elbow smoothing code
2018-10-08 13:21:47 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3
2018-10-08 12:59:34 -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
amantley
3517905435
added getter and setter for sitstandstatechange bool
2018-10-05 16:22:30 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged
...
fix for failing to enter domain
2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57
fix for failing to enter domain
2018-10-05 15:39:51 -07:00
amantley
96872f8412
moved all the state update for sit and stand to myavatar::update() also
...
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018
remove expired avatarEntities from their avatars
2018-10-05 13:48:35 -07:00
amantley
ad46b71966
before moving the step state counting to myavatar::update()
2018-10-05 13:04:14 -07:00
Wayne Chen
8abbd51bb1
removing unused variable
2018-10-04 23:11:27 -07:00
David Rowe
2ba8dc37d0
Miscellanous JSDoc fixes for issues noticed in passing
2018-10-05 16:57:29 +13:00
David Rowe
539c280281
Fill in missing JSDoc stubs in AvatarList and AvatarManager
2018-10-05 15:13:13 +13:00
danteruiz
d285080197
remmoving some debug statements
2018-10-04 18:38:25 -07:00
amantley
cbe638bfdb
added flag for vertical recentering that is state change, snap, versus
...
the usual .5 second recentering
2018-10-04 18:17:27 -07:00
David Rowe
ea8e02a84a
Fix and fill in JSDoc for MyAvatar flying-related functions
2018-10-05 14:05:33 +13:00
amantley
635300c6d5
changed pre physics to use cg for desired body when in cg mode
2018-10-04 18:05:05 -07:00
Dante Ruiz
5d011bafb2
small tweaks
2018-10-04 17:02:44 -07:00
Dante Ruiz
2a3b4a85c7
debugging
2018-10-04 15:57:05 -07:00
amantley
82f8c67436
put the mode in sensor space for cg
2018-10-04 15:37:01 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
amantley
acce675efc
added snap for recentering with sit stand state change. using average height with tipping point for thresholds
2018-10-04 14:53:51 -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
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix
...
Fix avatars transit on domain enter
2018-10-04 13:08:59 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Wayne Chen
c785efec84
removing extraneous bool
2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
amantley
809ca0e512
vive hmd input is implemented. not using mode
2018-10-03 18:05:30 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3
2018-10-03 17:14:15 -07:00
luiscuenca
a05e493e06
Long distance avatars should not be new
2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09
Fix avatars transit on domain enter
2018-10-03 16:23:09 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
b46d2319b1
fix spelling error
2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4
reverting logic change
2018-10-03 15:13:42 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
sabrina-shanman
2ef85dfdba
Merge branch 'master' into stt_parenting2
2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
Dante Ruiz
b28c375ad3
better loading check logic
2018-10-03 09:57:32 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix
...
Disable Hand Touch when Leap Motion is running
2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub
bb78a8dd5c
Merge pull request #14134 from jherico/fix/fb19088
...
Fix avatar thumbnails
2018-10-03 09:01:33 -07:00
amantley
8a0fbc3fe9
changed the height to use the mode . to do fix sensor space bug.
2018-10-02 17:47:56 -07:00
Wayne Chen
2d85f882b8
adding buttons
2018-10-02 17:47:09 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates
2018-10-02 16:43:08 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace
...
Better deadlock crash
2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup
...
Android signup
2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c
Better deadlock crash
2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast
...
Fix for bad static_pointer_cast on exit.
2018-10-02 11:31:47 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Gabriel Calero
13e2b99dfa
Merge remote-tracking branch 'upstream/master' into android_signup
2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
amantley
f0676d796c
added constants and tipping point for running average. this should be replaced by the mode
2018-10-01 17:57:00 -07:00
sabrina-shanman
67dc526ee2
Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2
2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan
...
fix several uninitialized reads
2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465
...
Fix case 18465: redirect to domain after login
2018-10-01 16:48:27 -07:00
Wayne Chen
e254324dbd
Merging more files
2018-10-01 16:47:10 -07:00
Wayne Chen
72851acd8b
adding spacer/close button pos
2018-10-01 16:44:01 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix
...
Fix avatar warp into floor when navigating to a saved bookmark
2018-10-01 16:36:31 -07:00
Gabriel Calero
1422c178a4
Merge remote-tracking branch 'upstream/master' into android_signup
2018-10-01 20:36:27 -03:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1
...
Fix some Mac rendering issues
2018-10-01 16:35:57 -07:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build
...
get interface building and working with clang-7 on ubuntu 18
2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
...
Simple avatar transit
2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation
...
Fix edit rotation handle fidgeting
2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061
...
use current wearable index, not joint index!
2018-10-01 16:14:33 -07:00
