David Kelly
|
d64a803451
|
no need to set checked
|
2017-04-06 16:08:48 -07:00 |
|
David Kelly
|
a1c211395b
|
Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column
fix sorting by pal connections-tab friends column
|
2017-04-06 15:43:21 -07:00 |
|
David Kelly
|
179a445f59
|
updated connection instructions
|
2017-04-06 15:21:10 -07:00 |
|
Howard Stearns
|
67f2cc3567
|
Merge pull request #10148 from davidkelly/dk/3936
pal selection changes
|
2017-04-06 14:58:46 -07:00 |
|
howard-stearns
|
9577102c22
|
fix sorting by pal connections-tab friends column
|
2017-04-06 14:45:08 -07:00 |
|
Dante Ruiz
|
a89081601c
|
fix merge issues
|
2017-04-06 22:31:47 +01:00 |
|
Dante Ruiz
|
52fd446d4d
|
toggle goto in tablet
|
2017-04-06 22:27:37 +01:00 |
|
David Kelly
|
331f2da4f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936
|
2017-04-06 14:22:08 -07:00 |
|
Seth Alves
|
3c6429cdf3
|
Merge pull request #10103 from vladest/master-qml-bugfixes
Master qml bugfixes
|
2017-04-06 14:22:06 -07:00 |
|
David Kelly
|
726395ac3e
|
friends checkbox speedup
|
2017-04-06 14:07:07 -07:00 |
|
Howard Stearns
|
f7ef587c61
|
Merge pull request #10138 from davidkelly/dk/3935
Now you can forget connections
|
2017-04-06 14:05:25 -07:00 |
|
David Kelly
|
46a7d28e16
|
Merge pull request #10144 from howard-stearns/notice-login-change-in-pal
notice login/logout change in pal
|
2017-04-06 12:57:22 -07:00 |
|
David Kelly
|
e0a1422345
|
pal selection changes
|
2017-04-06 12:07:51 -07:00 |
|
samcake
|
19d080c4cc
|
Merging
|
2017-04-06 11:33:41 -07:00 |
|
howard-stearns
|
1d60a55d5f
|
notice login/logout change in pal
|
2017-04-06 11:20:08 -07:00 |
|
David Kelly
|
85c78da839
|
updated, plus fixed some annoying errors in logs from Pal.qml
|
2017-04-06 11:16:51 -07:00 |
|
Vladyslav Stelmakhovskyi
|
16fa7988f6
|
TabletWebView redesigned to single WebView instance
|
2017-04-06 17:53:46 +02:00 |
|
Triplelexx
|
f588612fc3
|
add audioPacketLoss % display in stats
|
2017-04-06 16:04:14 +01:00 |
|
David Kelly
|
06bd9c97bf
|
remove info button from avatar image
|
2017-04-05 18:21:54 -07:00 |
|
David Kelly
|
61ece265f4
|
now you can forget connections
|
2017-04-05 18:16:16 -07:00 |
|
Dante Ruiz
|
5bb4edf18c
|
Merge branch 'master' of github.com:highfidelity/hifi into goto-fix
|
2017-04-06 00:16:59 +01:00 |
|
Dante Ruiz
|
90f5d02c99
|
goto toggle option
|
2017-04-06 00:13:53 +01:00 |
|
samcake
|
1a9005ed8b
|
Avoid unexpected changes
|
2017-04-05 13:57:40 -07:00 |
|
samcake
|
8356e5495f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-04-05 13:12:21 -07:00 |
|
samcake
|
6122155880
|
Renaming the PendingCHanges class to Transaction
|
2017-04-05 13:10:31 -07:00 |
|
Dante Ruiz
|
34f3c4abee
|
removed mousearea
|
2017-04-05 18:08:03 +01:00 |
|
Dante Ruiz
|
de8b7eeb27
|
removed commented code
|
2017-04-05 18:02:55 +01:00 |
|
Dante Ruiz
|
24b89275f2
|
fix new model dialog textInput
|
2017-04-05 18:00:43 +01:00 |
|
kunalgosar
|
8749428ede
|
dont assume no query tags
|
2017-04-04 13:51:34 -07:00 |
|
howard-stearns
|
6f79b2eaeb
|
send initial path in location update (e.g., on login)
|
2017-04-04 12:05:43 -07:00 |
|
kunalgosar
|
cc81bcab66
|
updating url check from hifi master
|
2017-04-04 11:58:38 -07:00 |
|
Kunal Gosar
|
e5c075f107
|
fix typo and namespace
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
8e4229b211
|
dont redirect people from webentity
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
3b88553699
|
check scripts
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
9d0667cb31
|
add url tag to web entities
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
19ab7526d3
|
apply profile to relevant entities
|
2017-04-04 11:54:21 -07:00 |
|
kunalgosar
|
9b758dbdba
|
updated headers
|
2017-04-04 11:54:21 -07:00 |
|
kunalgosar
|
a0f0879087
|
added file type filter and interceptor
|
2017-04-04 11:54:21 -07:00 |
|
Stephen Birarda
|
c7a28a527a
|
cleanup Agent recording handling, make loadRecording async
|
2017-04-04 10:56:25 -07:00 |
|
Howard Stearns
|
b0fa784267
|
Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach
Dk/pal improvements mostly zach
|
2017-04-04 10:03:10 -07:00 |
|
David Kelly
|
08ac25473f
|
wording change
|
2017-04-04 09:53:09 -07:00 |
|
Ryan Huffman
|
8b6dd2a835
|
Change default avatar to ball and stick avatar
|
2017-04-04 09:39:06 -07:00 |
|
Vladyslav Stelmakhovskyi
|
367555acdb
|
Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set
|
2017-04-04 16:35:21 +02:00 |
|
Vladyslav Stelmakhovskyi
|
332f9bb283
|
Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error
|
2017-04-04 16:22:40 +02:00 |
|
Vladyslav Stelmakhovskyi
|
072e024d9a
|
Fixed warning in JSConsole
|
2017-04-04 16:10:37 +02:00 |
|
Thijs Wenker
|
2b85563413
|
Merge pull request #10115 from sethalves/fix-fast-talking
Fix fast talking
|
2017-04-04 02:13:09 +02:00 |
|
David Kelly
|
4d6886d1f4
|
cr feedback, plus changed 'People' to 'Connections' in a couple places
|
2017-04-03 17:03:14 -07:00 |
|
Seth Alves
|
cb787c2862
|
Merge pull request #10104 from druiz17/tablet-webView3.0
Remove unnecessary prints and code for tabletWebView.qml
|
2017-04-03 16:10:54 -07:00 |
|
Seth Alves
|
fbf2014f04
|
Merge pull request #10102 from vladest/tablet-ui-goto
Put current address to location instead of inputfield
|
2017-04-03 16:09:58 -07:00 |
|
Seth Alves
|
d1827cf12c
|
Merge pull request #10002 from fayeli/tablet-photobooth
Photobooth Improvements: Using Tablet & Ability to Rotate Model
|
2017-04-03 16:05:13 -07:00 |
|
David Kelly
|
4629accc9c
|
style updates
|
2017-04-03 15:35:53 -07:00 |
|
Seth Alves
|
55c2d36752
|
math fixes, cleanups
|
2017-04-03 15:30:06 -07:00 |
|
Seth Alves
|
2a43c41954
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking
|
2017-04-03 14:44:13 -07:00 |
|
Seth Alves
|
7ac09398be
|
include deltaTime in audioAttack running average
|
2017-04-03 14:44:05 -07:00 |
|
Andrew Meadows
|
66ff551a7c
|
Merge pull request #10080 from ZappoMan/footActions
add foot IK targets as actions, map Kinect feet to foot targets
|
2017-04-03 12:06:14 -07:00 |
|
Seth Alves
|
7f1095c590
|
use deltaTime rather than calling usecTimestampNow
|
2017-04-03 11:55:08 -07:00 |
|
Seth Alves
|
9e08925d7e
|
involve clock time in _mouthTime calculation
|
2017-04-03 11:34:29 -07:00 |
|
David Kelly
|
2f1b6be24d
|
Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi
|
2017-04-03 10:55:55 -07:00 |
|
Dante Ruiz
|
3090629f77
|
clean up code
|
2017-04-03 18:51:39 +01:00 |
|
Anthony Thibault
|
999bd0d339
|
Merge pull request #10075 from sethalves/tablet-ui
Tablet ui -- misc changes + landscape mode
|
2017-04-03 10:43:34 -07:00 |
|
Vladyslav Stelmakhovskyi
|
990e1379e3
|
Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
|
2017-04-03 19:33:41 +02:00 |
|
Vladyslav Stelmakhovskyi
|
156166ce4a
|
Fixed another warning in TabletAddressDialog.qml
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
|
2017-04-03 19:33:13 +02:00 |
|
Vladyslav Stelmakhovskyi
|
9e96888534
|
Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown'
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
|
2017-04-03 19:32:09 +02:00 |
|
Vladyslav Stelmakhovskyi
|
6b7f3f7125
|
Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time.
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
|
2017-04-03 19:32:09 +02:00 |
|
Vladyslav Stelmakhovskyi
|
849d65f95f
|
Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
|
2017-04-03 19:32:09 +02:00 |
|
Seth Alves
|
c45514a557
|
Merge pull request #10066 from vladest/tablet-ui-connection-dialog
Implemented no connection dialog for Tablet UI
|
2017-04-03 09:57:00 -07:00 |
|
Seth Alves
|
98a54d9119
|
Merge pull request #10101 from ctrlaltdavid/21252
Fix tablet scrolling getting stuck to mouse pointer
|
2017-04-03 09:52:45 -07:00 |
|
Seth Alves
|
0f936f7511
|
Merge pull request #10078 from hyperlogic/feature/avatar-skeleton
Expose Avatar Skeleton to JavaScript
|
2017-04-03 09:39:35 -07:00 |
|
Seth Alves
|
43e1cec8a3
|
merge from upstream
|
2017-04-03 06:28:59 -07:00 |
|
Vladyslav Stelmakhovskyi
|
d207dae5b7
|
Put current address to location instead of inputfield
|
2017-04-02 20:02:40 +02:00 |
|
David Rowe
|
2b4afdb987
|
Fix tablet window getting stuck to pointer if release mouse off tablet
|
2017-04-02 12:58:11 +12:00 |
|
Chris Collins
|
3c62826ef9
|
Merge pull request #10091 from ctrlaltdavid/21248
Fix HTML controls not working properly in the tablet
|
2017-04-01 08:41:44 -07:00 |
|
Chris Collins
|
cc8b52fff4
|
Merge pull request #10095 from druiz17/tablet-webView2.0
Tablet webview now uses mobile format
|
2017-04-01 08:33:09 -07:00 |
|
Dante Ruiz
|
7ca7ad5e0b
|
removed junk file
|
2017-04-01 01:53:00 +01:00 |
|
Zach Fox
|
f148bca1c0
|
More progress on ComboDialog
|
2017-03-31 17:12:41 -07:00 |
|
Zach Fox
|
8a96969471
|
Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
|
2017-03-31 17:00:41 -07:00 |
|
Dante Ruiz
|
b10f491c6e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0
|
2017-04-01 00:58:37 +01:00 |
|
Dante Ruiz
|
d1bf3e4bf2
|
fixed webview mobile view
|
2017-04-01 00:58:09 +01:00 |
|
Zach Fox
|
fd3167ca9c
|
'PEOPLE' back to 'CONNECTIONS'
|
2017-03-31 16:41:25 -07:00 |
|
Andrew Meadows
|
0181783290
|
Merge pull request #10064 from samcake/ambient
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
|
2017-03-31 16:04:00 -07:00 |
|
Seth Alves
|
cec02bbf6f
|
Merge pull request #10011 from humbletim/fix-rightclick-menu-again
Fix right-click popup menus in web views
|
2017-03-31 15:48:11 -07:00 |
|
Chris Collins
|
b36f688a5a
|
Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default
use tablet-ui stylus as default, rather than avatar finger
|
2017-03-31 15:34:37 -07:00 |
|
David Kelly
|
8ceb6a20f0
|
friend/unfriend working
|
2017-03-31 15:05:21 -07:00 |
|
Zach Fox
|
6a4c2c5e12
|
Fix issues; checkpoint on new ComboDialog
|
2017-03-31 14:56:42 -07:00 |
|
David Rowe
|
25ac82f162
|
Don't send "move" events for non-move events
|
2017-04-01 10:47:04 +13:00 |
|
David Rowe
|
b03fd44240
|
Fix controls in HTML pages not responding to mouse events on tablet
|
2017-04-01 10:40:06 +13:00 |
|
Clément Brisset
|
9d0676dd87
|
Merge pull request #10088 from huffman/stable-merge
Stable merge
|
2017-03-31 14:27:42 -07:00 |
|
howard-stearns
|
5c8b2ba1c3
|
restore lost code
|
2017-03-31 13:28:14 -07:00 |
|
Seth Alves
|
8d4982d794
|
Merge pull request #10087 from druiz17/tablet-webView
Better webview handing for the tablet
|
2017-03-31 13:26:56 -07:00 |
|
Seth Alves
|
54c66aff07
|
use tablet-ui stylus as default, rather than avatar finger
|
2017-03-31 13:18:40 -07:00 |
|
Dante Ruiz
|
70d2d69557
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView
|
2017-03-31 19:29:31 +01:00 |
|
Dante Ruiz
|
9658e1b8ac
|
better web view handling
|
2017-03-31 19:25:03 +01:00 |
|
Dante Ruiz
|
b6901bba3e
|
added tabletWebView.qml
|
2017-03-31 18:48:08 +01:00 |
|
Vladyslav Stelmakhovskyi
|
7558765042
|
Script log now back to HUD
|
2017-03-31 14:20:15 +02:00 |
|
Sam Cake
|
dd73cb7b8e
|
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
|
2017-03-30 23:46:37 -07:00 |
|
ZappoMan
|
53c439ffba
|
add foot IK targets as actions
|
2017-03-30 19:11:16 -07:00 |
|
Anthony J. Thibault
|
22901a40c8
|
Expose Avatar skeletons to JavaScript
|
2017-03-30 17:27:40 -07:00 |
|
Dante Ruiz
|
8f402c73b0
|
saving work 2.0
|
2017-03-31 01:18:31 +01:00 |
|
Zach Fox
|
05c34fb3ee
|
Move some things around so ComboBox works (and layout improves)
|
2017-03-30 15:19:19 -07:00 |
|
Ryan Huffman
|
150dcd7dec
|
Merge remote-tracking branch 'upstream/master' into stable-merge
|
2017-03-30 14:22:27 -07:00 |
|
Zach Fox
|
c24b8b47a9
|
Minor layout changes
|
2017-03-30 14:08:29 -07:00 |
|
Howard Stearns
|
0edbf1fbd9
|
Merge pull request #10044 from howard-stearns/pal-backend-integration
Pal backend integration
|
2017-03-30 12:55:11 -07:00 |
|
Howard Stearns
|
3056bb16a2
|
typo, and delete request on abort/fail
|
2017-03-30 12:40:54 -07:00 |
|
David Rowe
|
985a804fe9
|
Merge branch 'master' into 21242
|
2017-03-31 08:03:05 +13:00 |
|
Seth Alves
|
c62b07d26f
|
add setLandscape call to tablet
|
2017-03-30 11:36:21 -07:00 |
|
David Kelly
|
e66c075f8e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-30 10:14:29 -07:00 |
|
Seth Alves
|
cc5fe05268
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-30 09:33:04 -07:00 |
|
samcake
|
e6d30fbb2f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-03-29 18:22:47 -07:00 |
|
David Rowe
|
06910d1881
|
Add comment re scrollbar stability in tablet
|
2017-03-30 14:20:02 +13:00 |
|
David Rowe
|
f954767b84
|
Get entities list and entity properties scrollbars working on tablet
|
2017-03-30 14:04:03 +13:00 |
|
samcake
|
b6504bba56
|
Moving the num mips per texture to the creator so it s immutable and simpler
|
2017-03-29 17:58:56 -07:00 |
|
Howard Stearns
|
af25e0e21f
|
Don't consider changes to location details as update-worthy if we're not discoverable.
|
2017-03-29 17:55:57 -07:00 |
|
Dante Ruiz
|
cb8660c699
|
saving work
|
2017-03-30 01:34:14 +01:00 |
|
Zach Fox
|
4887081e2c
|
New PAL colors; slight layout changes
|
2017-03-29 16:30:24 -07:00 |
|
Howard Stearns
|
3a7edebb94
|
Adjust reporting of availability to metaverse.
|
2017-03-29 16:12:50 -07:00 |
|
Zach Fox
|
a6ff3fcdb7
|
Tablet PAL bugfix; Connections help text v1
|
2017-03-29 15:47:19 -07:00 |
|
Seth Alves
|
371df35013
|
remove code related to tablet being a model rather than an overlay. start on landscape mode
|
2017-03-29 14:16:14 -07:00 |
|
Anthony J. Thibault
|
332dfa098f
|
Fix for disappearing toolbar after reload all scripts
|
2017-03-29 14:10:26 -07:00 |
|
Delamare2112
|
3ebe1a0015
|
Add AvatarInputs::loudnessToAudioLevel
|
2017-03-29 14:01:27 -07:00 |
|
Howard Stearns
|
b8f557ca54
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
|
2017-03-29 13:30:15 -07:00 |
|
Delamare2112
|
2f6add3398
|
Expose LimitlessSpeechRecognition to scripts
|
2017-03-29 12:56:08 -07:00 |
|
Delamare2112
|
4f7cbd5b7c
|
Add limitless connection and scripting interface
|
2017-03-29 12:47:58 -07:00 |
|
samcake
|
9bc7e41642
|
Remove extra calls for binding default textures, not needed
|
2017-03-29 10:57:08 -07:00 |
|
Vladyslav Stelmakhovskyi
|
209de29b2a
|
Intial commit. Basically works. Need some testing
|
2017-03-29 17:36:05 +02:00 |
|
Vladyslav Stelmakhovskyi
|
9822193644
|
Set z-order of comboboxes to make sure lowest will no overlap higher ones
|
2017-03-29 14:41:18 +02:00 |
|
Howard Stearns
|
c795d2ca3b
|
Four-way discoverability. (Needs testing.)
|
2017-03-28 18:31:08 -07:00 |
|
Zach Fox
|
b776f25b3b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-28 18:09:17 -07:00 |
|
Zach Fox
|
81264c998b
|
Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
|
2017-03-28 17:39:45 -07:00 |
|
Zach Fox
|
b5ba4a109d
|
Merge from upstream/master
|
2017-03-28 17:37:34 -07:00 |
|
Seth Alves
|
8dcbf33e16
|
Merge pull request #10041 from druiz17/tablet-improve-goto
added left out design elements to the tablet goto page
|
2017-03-28 17:19:50 -07:00 |
|
howard-stearns
|
c2a49a582e
|
send credentials to local metaverse servers, and initial users data
integration.
|
2017-03-28 16:44:16 -07:00 |
|
howard-stearns
|
37ab0b57a7
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
|
2017-03-28 15:41:46 -07:00 |
|
Dante Ruiz
|
a76e5ef8d9
|
improve the design of the tablet goto
|
2017-03-28 23:02:23 +01:00 |
|
Seth Alves
|
6df4dda746
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-28 11:42:14 -07:00 |
|
Seth Alves
|
39ec53d69a
|
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
Mark the system TabletProxy object as Cpp ownership.
|
2017-03-28 10:08:05 -07:00 |
|
Seth Alves
|
9e675d4c93
|
Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
|
2017-03-28 10:07:37 -07:00 |
|
Anthony J. Thibault
|
ec6ef01600
|
Mark the system TabletProxy object as Cpp ownership.
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
|
2017-03-28 09:53:00 -07:00 |
|
Andrew Meadows
|
60b8dbfce1
|
Merge pull request #10026 from AndrewMeadows/cleanup-fbx
reduce memory bandwitdh to GPU for skinned meshes
|
2017-03-28 08:55:06 -07:00 |
|
Seth Alves
|
b50a02ea19
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-28 08:16:59 -07:00 |
|
Chris Collins
|
83aa7358e2
|
Merge pull request #9998 from birarda/bug/oculus-buttons-flipped
fix swapped buttons in oculus touch graphic
|
2017-03-28 06:50:20 -07:00 |
|
Zach Fox
|
fce2049630
|
Trivial removal of commented code
|
2017-03-27 16:45:03 -07:00 |
|
Seth Alves
|
c013813161
|
Merge pull request #10027 from druiz17/tablet-disable-vto
Remove visibleToOthers option for the tablet from general settings
|
2017-03-27 16:28:23 -07:00 |
|
Dante Ruiz
|
65be71fa69
|
min diff
|
2017-03-28 00:05:02 +01:00 |
|
Dante Ruiz
|
7434cc5644
|
force vto to false on start up
|
2017-03-28 00:02:02 +01:00 |
|
howard-stearns
|
85347e3269
|
new location protocol
|
2017-03-27 15:55:05 -07:00 |
|
Dante Ruiz
|
02535722ba
|
removed visible to others opition from general settings
|
2017-03-27 23:31:41 +01:00 |
|
Dante Ruiz
|
018138f422
|
fixed some issues with tablet help
|
2017-03-27 22:46:06 +01:00 |
|
Andrew Meadows
|
18544581e6
|
remove warnings about implicit float cast
|
2017-03-27 14:40:31 -07:00 |
|
Brad Hefta-Gaub
|
c986077a4f
|
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
Added Developer > Avatar > Show IK Targets
|
2017-03-27 14:29:02 -07:00 |
|
David Kelly
|
5c1e085e7b
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-27 11:29:18 -07:00 |
|