Simon Walton
|
e5b35b1cd9
|
Clang doesn't support digit separators yet
|
2018-06-22 12:01:00 -07:00 |
|
Sam Gondelman
|
44a7d04b2a
|
Merge pull request #13426 from SamGondelman/avatarPriority
Highest loading priorities for avatars and attachments
|
2018-06-22 11:22:10 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
amantley
|
3027f8242c
|
added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp
|
2018-06-21 17:23:03 -07:00 |
|
Simon Walton
|
6796af4b6a
|
Move sendAvatarIdentityRequest() to a more logical location
|
2018-06-21 15:00:51 -07:00 |
|
amantley
|
e4ca6c6303
|
added the fixes for the lurch that happens when driving or flying
|
2018-06-21 11:22:26 -07:00 |
|
amantley
|
8fc04776f9
|
starting to implement the step detection code in MyAvatar.cpp
|
2018-06-21 10:59:07 -07:00 |
|
John Conklin II
|
aa630e02cf
|
Merge pull request #13269 from wayne-chen/BillboardableWarning-case-14709
Billboardable::pointTransformAtCamera div by zero asan warning
|
2018-06-21 10:04:38 -07:00 |
|
Gabriel Calero
|
4af0815561
|
Add missing annotations to breakpad (version, build_number, build_type)
|
2018-06-21 11:19:39 -03:00 |
|
Simon Walton
|
d789c4573b
|
Add couple of comments
|
2018-06-20 17:44:58 -07:00 |
|
SamGondelman
|
8f411ad6c8
|
CR
|
2018-06-20 16:13:10 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
Cristian Luis Duarte
|
3837952418
|
Android - Add a clear method on pending downloads and use it when going background
|
2018-06-20 18:29:04 -03:00 |
|
SamGondelman
|
8014f61243
|
loading priorities for avatars and attachments
|
2018-06-20 12:29:28 -07:00 |
|
Simon Walton
|
d638bdd986
|
First pass at requesting ID for unknown data
Keep list of AvatarData that was created from a
data packet without a matching ID. If items get
old enough send an ID request and remove them.
|
2018-06-20 12:21:39 -07:00 |
|
Andrew Meadows
|
24bae8eddc
|
Merge pull request #13425 from sabrina-shanman/crash-strafe
Fix crash when walking sideways
|
2018-06-20 11:13:20 -07:00 |
|
sabrina-shanman
|
a8b2da14cf
|
Format numeric constant in strafe crash commit to match coding standards
|
2018-06-20 08:45:12 -07:00 |
|
sabrina-shanman
|
45fdf3d68f
|
Fix crash when walking sideways
|
2018-06-19 17:23:00 -07:00 |
|
Brad Davis
|
787fb1b9bd
|
Fix crash in display plugin caused by audio device changed
|
2018-06-19 16:13:57 -07:00 |
|
Zach Fox
|
3ef41664dc
|
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 10:32:01 -07:00 |
|
David Rowe
|
0e1e44a3f5
|
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-19 20:44:53 +12:00 |
|
Andrew Meadows
|
44c3620b6e
|
remove cruft
|
2018-06-18 17:45:58 -07:00 |
|
John Conklin II
|
9ace80c709
|
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars
RC69: avatars collide again (again)
|
2018-06-18 15:21:47 -07:00 |
|
John Conklin II
|
a47038d81f
|
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id
Add main & render thread ids to crashpad annotations
|
2018-06-18 15:21:04 -07:00 |
|
Sam Gateau
|
56a1137f7b
|
Merge pull request #13312 from SamGondelman/overlayPipelines
Fix layered overlay rendering and highlight
|
2018-06-18 14:35:03 -07:00 |
|
Andrew Meadows
|
a18ba36dd2
|
merge 'master' into 'workload'
|
2018-06-18 13:40:08 -07:00 |
|
Andrew Meadows
|
085130e3c9
|
avatars collide again again
|
2018-06-18 13:17:32 -07:00 |
|
Zach Fox
|
84ed07cdb4
|
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 13:10:45 -07:00 |
|
Wayne Chen
|
07e689f086
|
removing compute/check for u
|
2018-06-18 13:02:53 -07:00 |
|
Zach Fox
|
e83b76781b
|
Be a bit more specific in the docs
|
2018-06-18 11:47:26 -07:00 |
|
Zach Fox
|
614b512411
|
Add docs
|
2018-06-18 11:43:31 -07:00 |
|
Elisa Lupin-Jimenez
|
9c488ff05e
|
Merge pull request #13331 from gcalero/breakpad_android
Breakpad integration for android Interface
|
2018-06-18 11:32:05 -07:00 |
|
Elisa Lupin-Jimenez
|
c08df9e39f
|
Merge pull request #13400 from kitely/parse-snapshot-fix
Don't call parseSnapshotData() in a static manner
|
2018-06-18 11:26:29 -07:00 |
|
Zach Fox
|
dbf3ade04f
|
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 11:22:05 -07:00 |
|
Wayne Chen
|
e381022910
|
checking for NaN in cross products from vec3 positions
|
2018-06-18 11:21:53 -07:00 |
|
Gabriel Calero
|
3eecb2f379
|
Apply code conventions
|
2018-06-18 14:42:08 -03:00 |
|
Wayne Chen
|
ed7f008517
|
checking edge case of if input vectors are zero
|
2018-06-18 10:31:11 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
Elisa Lupin-Jimenez
|
b255cf0ba9
|
Merge pull request #13389 from AndrewMeadows/misc-001
crash fixes, removing unnecessary writes, and misc cleanup
|
2018-06-18 09:19:22 -07:00 |
|
Oren Hurvitz
|
d8ea47b78f
|
Don't call parseSnapshotData() in a static manner.
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
|
2018-06-17 14:18:25 +03:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +12:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -03:00 |
|
Gabriel Calero
|
20c147ef11
|
Fix compilation error
|
2018-06-15 21:12:38 -03:00 |
|
Gabriel Calero
|
1cdd8c2f3c
|
Fix compilation error
|
2018-06-15 20:39:24 -03:00 |
|
Gabriel Calero
|
20727378e2
|
Rename crash handler files
|
2018-06-15 20:32:10 -03:00 |
|
Anthony J. Thibault
|
2feecf6db8
|
removed unnecessary setting of 'username' annotation.
|
2018-06-15 14:56:10 -07:00 |
|
Anthony J. Thibault
|
8ddcff6070
|
Set username annotation more reliably.
|
2018-06-15 14:47:02 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Anthony J. Thibault
|
24689224ce
|
removed redundant machine_fingerprent crashpad annotation.
|
2018-06-15 11:40:45 -07:00 |
|
David Rowe
|
249f72758e
|
Fix entity detaching from head joint not becoming visible
|
2018-06-15 16:36:16 +12:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Gabriel Calero
|
c02750edd1
|
Upload breakpad minidumps from an android service
|
2018-06-14 19:43:03 -03:00 |
|
Anthony J. Thibault
|
84601446bf
|
Add main thread id & machine fingerprint to crashpad annotations
|
2018-06-14 12:57:30 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
John Conklin II
|
99b5835098
|
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
|
2018-06-13 11:16:56 -07:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
027c4f6b9e
|
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68
Large avatars should instantly shrink when entering small height domains
|
2018-06-12 14:57:07 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gateau
|
f769b63c3d
|
Merge pull request #13308 from jherico/fix/13677
Fix for black text rendering white in web elements
|
2018-06-11 16:17:31 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07:00 |
|
Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
sabrina-shanman
|
4c39d08358
|
Remove "Draw Collision Shapes" option from developer physics menu
|
2018-06-11 11:03:57 -07:00 |
|
Zach Fox
|
56bd7e3d37
|
Remove dead function declaration from header
|
2018-06-11 10:58:01 -07:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
Zach Fox
|
c26b03f480
|
Cleanup
|
2018-06-11 10:40:13 -07:00 |
|
Zach Fox
|
c7c06590ac
|
Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix
|
2018-06-11 10:16:35 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Sam Gondelman
|
535dc92213
|
Merge pull request #13334 from SamGondelman/tablet
Fix tablet not disappearing
|
2018-06-11 09:34:57 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
Stephen Birarda
|
9506e7edbe
|
check for update for dev-builds, handle semantic version
|
2018-06-08 17:20:57 -07:00 |
|
howard-stearns
|
ce322a4794
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 15:33:07 -07:00 |
|
John Conklin II
|
bc3edbc7fc
|
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-08 15:14:32 -07:00 |
|
howard-stearns
|
210cb23de6
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 14:54:15 -07:00 |
|
Stephen Birarda
|
112abc9d7e
|
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
|
2018-06-08 14:44:22 -07:00 |
|
Zach Fox
|
95faad23e2
|
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-08 14:20:21 -07:00 |
|
Zach Fox
|
812c28ef48
|
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-08 14:15:42 -07:00 |
|
SamGondelman
|
310e2ee063
|
attempt to fix first time model overlay loading
|
2018-06-08 13:56:21 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
Zach Fox
|
d4a19e7bc9
|
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-08 10:52:14 -07:00 |
|
Atlante45
|
83e1db14cf
|
Set UAL default value earlier to be caught by crashpad
|
2018-06-07 19:40:30 -07:00 |
|
howard-stearns
|
348d5fc359
|
inventory text filter
|
2018-06-07 17:01:48 -07:00 |
|
SamGondelman
|
c7007c089f
|
fix tablet not disappearing
|
2018-06-07 16:35:22 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
Zach Fox
|
c1b971a269
|
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-07 16:10:44 -07:00 |
|
Anthony J. Thibault
|
608575cf17
|
Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
|
2018-06-07 15:31:40 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
Gabriel Calero
|
3911a93a38
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-07 19:00:16 -03:00 |
|
Gabriel Calero
|
8869af069e
|
Integrate Breakpad in android Interface
|
2018-06-07 18:59:43 -03:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Zach Fox
|
7d8e02e714
|
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-07 14:01:52 -07:00 |
|
amantley
|
97831e61f0
|
removed stray comments
|
2018-06-07 12:54:46 -07:00 |
|
Zach Fox
|
d33875e142
|
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-07 12:42:24 -07:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
John Conklin II
|
1646f543cd
|
Merge pull request #13273 from danteruiz/fix-show-overlays-menu
fixing show overlays menu item on start up
|
2018-06-07 11:34:30 -07:00 |
|
John Conklin II
|
3b413d0f72
|
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized
MS14615: Prevent memory overuse when minimized
|
2018-06-07 11:16:56 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Zach Fox
|
7f04506020
|
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged
Fix MS14925: Don't double-emit signal for display plugin change
|
2018-06-07 09:32:50 -07:00 |
|
Dante Ruiz
|
6ddc768f57
|
making overlays use precisionPicking and adjust tablet screen position
|
2018-06-06 15:40:33 -07:00 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Zach Fox
|
6869718025
|
Fix MS14925: Don't double-call signal for display plugin change
|
2018-06-06 14:41:33 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Seth Alves
|
6c8e514367
|
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
|
2018-06-06 11:08:04 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -07:00 |
|
MiladNazeri
|
082c1fce52
|
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
|
2018-06-05 19:04:54 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|
SamGondelman
|
aec7206901
|
get rid of overlay pipelines and just use forward rendering
|
2018-06-05 14:44:44 -07:00 |
|
Bradley Austin Davis
|
e7e9ca4b2b
|
Disable chromium distance field text rendering on ATI GPUs
|
2018-06-05 14:16:03 -07:00 |
|
howard-stearns
|
3d75a793cc
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 13:35:54 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
SamGondelman
|
968758a022
|
CR
|
2018-06-05 09:35:17 -07:00 |
|
Ken Cooke
|
aa19794a94
|
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
|
2018-06-05 09:17:34 -07:00 |
|
Ken Cooke
|
83dda420ba
|
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
|
2018-06-05 09:16:28 -07:00 |
|
Anthony J. Thibault
|
558711f906
|
Smooth hips transition between idle and fly.
Also, take dt into account for the critically damped spring lerp calculation.
|
2018-06-04 16:57:41 -07:00 |
|
Andrew Meadows
|
d220d437cc
|
remove payloadGetLayer() from GameWorkloadRenderer
|
2018-06-04 16:39:29 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
Andrew Meadows
|
4329ea5240
|
Merge master' into 'workload'
|
2018-06-04 16:11:25 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
howard-stearns
|
25ee948662
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 15:30:10 -07:00 |
|
Sam Gondelman
|
38e7b31c32
|
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
|
2018-06-04 14:48:46 -07:00 |
|
Zach Fox
|
60aff7a224
|
Whoops
|
2018-06-04 14:41:18 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Zach Fox
|
7407507f0b
|
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-04 14:13:25 -07:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
howard-stearns
|
24a67c6008
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 11:15:39 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
howard-stearns
|
bf7453482a
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 10:26:49 -07:00 |
|
John Conklin II
|
29f2ab01d8
|
Merge pull request #13244 from danteruiz/fix-shortcuts
fix copy delete cut paste commands and menus (RC68)
|
2018-06-04 10:02:49 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Dante Ruiz
|
606b6d8947
|
fix code standard issue
|
2018-06-04 09:16:39 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
John Conklin II
|
378e84b7ce
|
Merge pull request #13257 from danteruiz/rc68-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil(RC68)
|
2018-06-01 15:10:28 -07:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
Simon Walton
|
f58e1ebdd9
|
Only take down tablet if it was brought up
|
2018-06-01 10:41:08 -07:00 |
|
howard-stearns
|
84f5f0a653
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 09:58:08 -07:00 |
|
John Conklin II
|
194c33bf19
|
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
|
2018-06-01 09:31:13 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
amantley
|
3bda5bf6a0
|
added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h
|
2018-05-31 17:58:37 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
Sam Gateau
|
f372e25a9f
|
Merge pull request #13247 from NissimHadar/DailyTests
Daily tests
|
2018-05-31 14:50:32 -07:00 |
|
Simon Walton
|
7598c7aaf3
|
Remove tablet message-box when required
Desktop request was being honoured but not HMD.
|
2018-05-31 13:52:06 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
Dante Ruiz
|
caa7f64865
|
fixing show overlays menu item
|
2018-05-31 10:58:04 -07:00 |
|
amantley
|
7cc5e96f2d
|
Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
|
2018-05-31 10:35:31 -07:00 |
|
Zach Fox
|
259803f856
|
MS14615: Prevent memory overuse when minimized
|
2018-05-31 10:30:25 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
howard-stearns
|
b0d3729d4d
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-30 17:09:57 -07:00 |
|
NissimHadar
|
bea21e3a68
|
WIP.
|
2018-05-30 17:06:49 -07:00 |
|
NissimHadar
|
6717a16098
|
WIP.
|
2018-05-30 17:04:19 -07:00 |
|
NissimHadar
|
51b1188bdb
|
WIP.
|
2018-05-30 17:01:47 -07:00 |
|
NissimHadar
|
df668e44ca
|
WIP.
|
2018-05-30 16:59:53 -07:00 |
|
NissimHadar
|
c1bc3bd154
|
WIP.
|
2018-05-30 16:58:35 -07:00 |
|
NissimHadar
|
d01d774f76
|
WIP.
|
2018-05-30 16:51:17 -07:00 |
|
NissimHadar
|
78f04f84c5
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-30 16:45:53 -07:00 |
|
NissimHadar
|
c8a04911f4
|
Interface respects Show Overlay menu checkbox on start up.
|
2018-05-30 16:45:29 -07:00 |
|
samcake
|
37c1f4fc06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-30 16:05:46 -07:00 |
|
Andrew Meadows
|
003e444246
|
Merge branch 'master' into 'workload'
|
2018-05-30 16:04:13 -07:00 |
|
John Conklin II
|
6095a3b319
|
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
|
2018-05-30 13:55:34 -07:00 |
|
Gabriel
|
6fa58fce1f
|
Update Application.cpp
Remove the mic bar for android
|
2018-05-30 15:40:05 -03:00 |
|
Dante Ruiz
|
646b852aef
|
fix headers
|
2018-05-30 11:15:58 -07:00 |
|
Dante Ruiz
|
3942f397d0
|
adding back reload scripts
|
2018-05-30 11:15:47 -07:00 |
|
samcake
|
2e9076c71e
|
Clean up and trying to get ready for merge
|
2018-05-30 11:14:49 -07:00 |
|
Dante Ruiz
|
c4358aad81
|
remove dead code in Application::keyPressEvent
|
2018-05-30 07:33:32 -07:00 |
|
Dante Ruiz
|
543a721a11
|
fix headers
|
2018-05-29 17:55:42 -07:00 |
|
samcake
|
873cabe284
|
Cleaning the code
|
2018-05-29 17:46:25 -07:00 |
|
Dante Ruiz
|
ea10dc176a
|
adding back reload scripts
|
2018-05-29 17:38:02 -07:00 |
|
howard-stearns
|
a84829392f
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-29 16:14:22 -07:00 |
|
David Rowe
|
08cb5c7191
|
Fix JSDoc example typo
|
2018-05-30 10:25:16 +12:00 |
|
David Rowe
|
0db440931e
|
Miscellaneous JSDoc fixes
|
2018-05-30 10:02:30 +12:00 |
|
Andrew Meadows
|
57138b5fb7
|
disable workload region regulation by default
also set default region radiuses large
|
2018-05-29 14:21:16 -07:00 |
|
Gabriel
|
cf499ca047
|
Update Application.cpp
Remove the mic bar for android
|
2018-05-29 16:42:09 -03:00 |
|
NissimHadar
|
5fb7ec7b72
|
Updated jsdoc
|
2018-05-29 11:50:23 -07:00 |
|
NissimHadar
|
855084b6d5
|
Updated jsdoc.
|
2018-05-29 11:29:59 -07:00 |
|
NissimHadar
|
c49bcbe4e9
|
Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands.
|
2018-05-29 11:20:29 -07:00 |
|
milad
|
3455dd296b
|
Vec3 fix
|
2018-05-29 09:57:10 -07:00 |
|
NissimHadar
|
0af1599b53
|
Added jsdoc to TestScriptingInterface.
|
2018-05-29 09:45:03 -07:00 |
|
samcake
|
82503a9e64
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-29 08:59:37 -07:00 |
|
NissimHadar
|
658c0e329f
|
Corrected comment.
|
2018-05-28 19:57:54 -07:00 |
|
David Rowe
|
a9c4eab099
|
Fix up JSDoc for Window.takeSnapshot() and related
|
2018-05-28 12:46:51 +12:00 |
|
David Rowe
|
b31a4d0b64
|
Add JSDoc stubs for new HifiAbout API
|
2018-05-28 10:40:42 +12:00 |
|
Sam Gateau
|
678effdb48
|
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
|
2018-05-26 23:28:59 -07:00 |
|
NissimHadar
|
20d2128a10
|
Corrected timing bug.
|
2018-05-25 17:36:55 -07:00 |
|
Dante Ruiz
|
68b18def22
|
fix copy delete cut paste commands and menus
|
2018-05-25 15:49:19 -07:00 |
|
Dante Ruiz
|
9a25a74834
|
fix copy delete cut paste commands and menus
|
2018-05-25 15:34:17 -07:00 |
|
NissimHadar
|
00300f4b2f
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-25 15:02:43 -07:00 |
|
NissimHadar
|
87220e501a
|
Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail)
|
2018-05-25 15:02:00 -07:00 |
|
John Conklin II
|
1d9f33a637
|
Merge pull request #13220 from NissimHadar/fixCameraMode
Correct `Camera.mode` command.
|
2018-05-25 10:47:31 -07:00 |
|
John Conklin II
|
82bb664cb3
|
Merge pull request #13235 from druiz17/fix-qml-crash-v2
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
|
2018-05-25 10:46:11 -07:00 |
|
samcake
|
051776ab1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-25 10:30:45 -07:00 |
|
Andrew Meadows
|
cd568867b2
|
disable regulation of workload views by default
|
2018-05-25 08:30:11 -07:00 |
|
Andrew Meadows
|
85beca6b67
|
tweak to dynamic workload regions regulation
|
2018-05-25 08:30:11 -07:00 |
|
NissimHadar
|
54b64c59d7
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-25 08:29:09 -07:00 |
|
John Conklin II
|
0d8fb90fa8
|
Merge pull request #13222 from SamGondelman/mirror
Fix image and text overlay drifting
|
2018-05-25 08:26:33 -07:00 |
|
Sam Gateau
|
aa49595a23
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 18:19:55 -07:00 |
|
Dante Ruiz
|
adee5e9ef7
|
fix crash
|
2018-05-24 18:02:15 -07:00 |
|
Dante Ruiz
|
e34d67fee4
|
fix crash
|
2018-05-24 17:54:53 -07:00 |
|
NissimHadar
|
d01482bf68
|
Now looks for an actual change in the boom length (vs a change has been requested).
|
2018-05-24 17:44:39 -07:00 |
|
NissimHadar
|
9ed8c04097
|
Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode
|
2018-05-24 17:40:21 -07:00 |
|
Clement
|
19100c9550
|
Coding Standard
Spacing
Self-Sufficient Headers
|
2018-05-24 17:30:32 -07:00 |
|
samcake
|
559d436dfa
|
Fixing the merge conflicts
|
2018-05-24 16:57:10 -07:00 |
|
NissimHadar
|
77d6ea6bec
|
Added hide/show for task bar (Windows only).
|
2018-05-24 16:48:03 -07:00 |
|
Anthony Thibault
|
eae5215d94
|
Merge pull request #13206 from ctrlaltdavid/21872-c
JSDoc fixes
|
2018-05-24 16:44:55 -07:00 |
|
samcake
|
44a8d880fa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 14:31:53 -07:00 |
|
David Rowe
|
bc757ddd41
|
Fix typo
|
2018-05-25 09:04:06 +12:00 |
|
John Conklin II
|
04bf8f851f
|
Merge pull request #13219 from samcake/one
Bringing Evolution to the Job Engine Task library developed in the workload project to master
|
2018-05-24 13:30:16 -07:00 |
|
Bradley Austin Davis
|
3beb77694f
|
Cached shader binaries and uniform data for shaders
|
2018-05-24 12:42:33 -07:00 |
|
Stephen Birarda
|
2cb7c9cc62
|
add a BUILD_TYPE to BuildInfo, fix conditional
|
2018-05-24 12:04:32 -07:00 |
|
Stephen Birarda
|
55bf70991b
|
cleanup wording and formatting for version in window title
|
2018-05-24 12:03:03 -07:00 |
|
Stephen Birarda
|
c3595a3216
|
pass STABLE_BUILD instead of BUILD_BRANCH through cmake
|
2018-05-24 12:03:03 -07:00 |
|
Andrew Meadows
|
31dd59d212
|
double bits in collision groups
|
2018-05-24 11:28:52 -07:00 |
|
Sam Gateau
|
13d02011f3
|
There and back again...
|
2018-05-24 00:53:29 -07:00 |
|
samcake
|
40370f860a
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-05-23 17:26:08 -07:00 |
|
samcake
|
cf58f31f3e
|
Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'
|
2018-05-23 15:08:48 -07:00 |
|
Andrew Meadows
|
d50da2babc
|
Merge 'master' into 'workload'
|
2018-05-23 14:51:05 -07:00 |
|
Dante Ruiz
|
c2ceb48a28
|
fixing key conflicts
|
2018-05-23 14:16:05 -07:00 |
|
SamGondelman
|
940b112f62
|
fix image and text overlay drifting
|
2018-05-23 11:58:50 -07:00 |
|
samcake
|
5bede45c85
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-23 11:26:07 -07:00 |
|
NissimHadar
|
e07e716d40
|
Fixed stupid gcc warning.
|
2018-05-23 07:35:25 -07:00 |
|
NissimHadar
|
06203d44d8
|
Correct Camera.mode command.
|
2018-05-22 17:08:28 -07:00 |
|
milad
|
1a4fa92a29
|
Merge commit 'refs/pull/13206/head' of https://github.com/highfidelity/hifi into gravprep-redo
|
2018-05-22 14:33:53 -07:00 |
|
Simon Walton
|
f702374db3
|
Just have one const for concurrent downloads
|
2018-05-22 10:16:44 -07:00 |
|
Dante Ruiz
|
5fb08d0d9c
|
fix speech api not showing up
|
2018-05-21 14:21:21 -07:00 |
|
David Rowe
|
fa54461788
|
Update some recent JSDoc additions
|
2018-05-22 08:52:39 +12:00 |
|
howard-stearns
|
fc6bfe9e44
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-21 10:41:45 -07:00 |
|
samcake
|
b4807becb6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-21 10:41:25 -07:00 |
|
Dante Ruiz
|
249d22b4b4
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-21 10:31:24 -07:00 |
|
Sam Gondelman
|
6eb6a5b767
|
Merge pull request #13197 from gcalero/your_last_location
Add "Your Last Location" to Android Home
|
2018-05-21 09:28:56 -07:00 |
|
David Rowe
|
6d4f704279
|
Regularize some JSDoc usage
|
2018-05-21 09:32:10 +12:00 |
|
milad
|
46efb2b868
|
merging onto mac
|
2018-05-19 22:44:18 -07:00 |
|
druiz17
|
bd3a9865bf
|
moving control speech to developer menu
|
2018-05-19 18:27:28 -07:00 |
|
druiz17
|
f2807e38f9
|
fix goto shortcut
|
2018-05-19 17:36:46 -07:00 |
|
samcake
|
3aaa01788c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-18 17:42:30 -07:00 |
|
samcake
|
36a08fdd84
|
Friday night end of the day, last compilation.... almost
|
2018-05-18 17:41:28 -07:00 |
|
Dante Ruiz
|
8a2b54c2b7
|
fixing mistakes
|
2018-05-18 17:09:41 -07:00 |
|
howard-stearns
|
d385a255c4
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-18 16:53:08 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
Dante Ruiz
|
60dd7e49ab
|
making requested changes
|
2018-05-18 16:41:39 -07:00 |
|
Sam Gateau
|
07f1ab8c98
|
Merge pull request #13194 from SamGondelman/resolution
Fix Scale Resolution option
|
2018-05-18 15:23:01 -07:00 |
|
Dante Ruiz
|
6eb5a78611
|
fixing code that breaks andriod build
|
2018-05-18 10:33:03 -07:00 |
|
Andrew Meadows
|
a9c193b672
|
merge 'workload-014' into 'workload'
|
2018-05-18 10:12:04 -07:00 |
|
Brad Davis
|
ae07036f20
|
Add ideal resource texture memory stat
|
2018-05-18 09:23:53 -07:00 |
|
Dante Ruiz
|
ea771c2325
|
make final changes
|
2018-05-18 09:21:41 -07:00 |
|
Liv
|
40ff3f966f
|
Merge pull request #13165 from ctrlaltdavid/21872-b
JSDoc stubs for various APIs
|
2018-05-18 09:11:55 -07:00 |
|
Gabriel Calero
|
7a6b7b8ba3
|
Add Your Last Location in Android Home
|
2018-05-18 12:26:41 -03:00 |
|
Andrew Meadows
|
a23126a6b2
|
Merge 'master' into 'workload'
|
2018-05-18 07:38:02 -07:00 |
|
samcake
|
aa18aaa7b1
|
Maybe
|
2018-05-17 18:06:46 -07:00 |
|
Andrew Meadows
|
00e360aff0
|
reduce sim ownership priority when releasing grab
|
2018-05-17 17:25:07 -07:00 |
|
SamGondelman
|
c57c15f22c
|
fix resolution option
|
2018-05-17 16:58:35 -07:00 |
|
Sam Gondelman
|
74840d2130
|
Merge pull request #12935 from gcalero/android_new_login
Android new login
|
2018-05-17 15:53:25 -07:00 |
|
samcake
|
0cf87748cd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-17 14:20:44 -07:00 |
|
Dante Ruiz
|
0f122e3dbc
|
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
|
2018-05-17 13:33:34 -07:00 |
|
Dante Ruiz
|
e760912fd2
|
fix warning
|
2018-05-17 13:33:19 -07:00 |
|
Clement
|
da08d747dc
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-05-17 12:10:08 -07:00 |
|
vladest
|
eb25601856
|
Return back LOD tools
|
2018-05-17 20:41:50 +02:00 |
|
Dante Ruiz
|
201b8a5140
|
fixing the graphics preference
|
2018-05-17 11:35:34 -07:00 |
|
Gabriel Calero
|
5a73da6fdf
|
Bugfix: stop audio when app starts
|
2018-05-17 14:05:49 -03:00 |
|
Gabriel Calero
|
8741c5e6a4
|
Make haptic pulse duration configurable in VirtualPadDevice
|
2018-05-17 11:37:13 -03:00 |
|
David Rowe
|
d20cd6ad44
|
Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot()
|
2018-05-17 20:25:25 +12:00 |
|
David Rowe
|
6db4dd8673
|
Merge branch 'master' into 21872-b
# Conflicts:
# interface/src/ui/Snapshot.h
|
2018-05-17 20:11:14 +12:00 |
|
samcake
|
735db27919
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-16 17:18:23 -07:00 |
|
samcake
|
ade1d6c056
|
use the correct call to toggle the debugFXAA on the AaConfig
|
2018-05-16 15:37:13 -07:00 |
|
Dante Ruiz
|
f8e9afb115
|
fixing damn build issues
|
2018-05-16 15:08:09 -07:00 |
|
Dante Ruiz
|
3be4b01d2c
|
move overlays menu back
|
2018-05-16 14:36:55 -07:00 |
|
Zach Fox
|
486f33b4bd
|
Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash
|
2018-05-16 14:14:35 -07:00 |
|
Dante Ruiz
|
237b0d7483
|
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
|
2018-05-16 13:49:02 -07:00 |
|
Dante Ruiz
|
fbc3d97af3
|
adding back overlay menu and avatar size
|
2018-05-16 13:48:29 -07:00 |
|
Zach Fox
|
585957409d
|
Merge pull request #13141 from zfox23/spectatorCameraImprovements
Spectator Camera V2
|
2018-05-16 13:38:07 -07:00 |
|
samcake
|
21e069c90c
|
Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa
|
2018-05-16 13:09:55 -07:00 |
|
John Conklin II
|
8d437892cb
|
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing
Fix hips position when flying
|
2018-05-16 12:37:07 -07:00 |
|
Zach Fox
|
0021af8714
|
Merge in in-progress changes from old commerce_paginationAndFiltering branch
|
2018-05-16 12:28:52 -07:00 |
|
Zach Fox
|
154d70866f
|
It's working
|
2018-05-16 12:17:17 -07:00 |
|
vladest
|
8c146521cf
|
remove double crash options
|
2018-05-16 21:10:51 +02:00 |
|
vladest
|
7501b8818e
|
removed shadows quality
|
2018-05-16 21:01:50 +02:00 |
|
Zach Fox
|
f8215b5999
|
Fix final? crash
|
2018-05-16 11:05:21 -07:00 |
|
Zach Fox
|
c3ea176b58
|
Give me my reticle back!
|
2018-05-16 10:54:58 -07:00 |
|
Dante Ruiz
|
37c51a7246
|
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
|
2018-05-16 10:41:40 -07:00 |
|