Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 04:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71864 commits 25 branches 0 tags 1.1 GiB
Commit graph

22078 commits

Author SHA1 Message Date
Simon Walton
790fb43b42 Start of safe landing client work 2018-08-07 11:34:05 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
amantley
a61909446a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-07 10:40:22 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
MuteTab
b590ff793a New function for changing location in domains such that the AVatar's leg-length is taken into account. 2018-08-06 20:26:44 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
Dante Ruiz
6a4a56cee3 imporving the interstitial page script 2018-08-06 17:42:21 -07:00
MuteTab
de5c7f6dcd Change lambda for address manager position getter. 2018-08-06 16:02:00 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts 
Update shader pipeline, improve mac startup time
 2018-08-06 15:30:46 -07:00
SamGondelman
e3756a6dae Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy 2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403 weak pointers to nodeList 2018-08-06 11:21:32 -07:00
sabrina-shanman
577379dcb4 Do not re-calculate intersects flag in CollisionPickResult copy constructor 2018-08-06 10:53:03 -07:00
sabrina-shanman
c40db2e8f0 Add pick filtering to CollisionPick 2018-08-06 10:50:23 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
SamGondelman
6b7f5b662e jsdoc fixes 2018-08-06 09:41:05 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
sabrina-shanman
658ef4e9e6 Remove redundant namespace qualifier on CollisionPickResult::toVariantMap() in header file 2018-08-06 08:54:55 -07:00
Dante Ruiz
cca76f7022 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-06 08:02:03 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying 
fix flying
 2018-08-03 19:27:47 -07:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
sabrina-shanman
a460cfac29 Do not store physics engine pointer in PickScriptingInterface 2018-08-03 17:55:54 -07:00
sabrina-shanman
c6b24496c8 Add 'loaded' parameter to CollisionPickResult to indicate if the collision region is loaded 2018-08-03 17:56:01 -07:00
sabrina-shanman
e7766039b9 Pass pick variant map into unsuccessful/default collision results 2018-08-03 17:55:54 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
MiladNazeri
a7a8214983
Merge pull request #13637 from ctrlaltdavid/M08513-a 
Audio API JSDoc
 2018-08-03 16:38:03 -07:00
Dante Ruiz
f30b552e19 fix-flying 2018-08-03 15:50:11 -07:00
Sam Gateau
aac4ff0b7e
Merge pull request #13749 from samcake/punk 
Fix the other avatars not being removed when Avatar mixer reset
 2018-08-03 15:37:13 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
Dante Ruiz
2377626203 exposing physics progress 2018-08-03 10:47:58 -07:00
Dante Ruiz
683b42e35b Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-03 09:59:35 -07:00
Dante Ruiz
b9cfbfb3be adding interstitial page file to default sctipts 2018-08-03 09:59:21 -07:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics 
reduce physics simulation cost of other-avatars
 2018-08-03 09:33:59 -07:00
Sam Gateau
da252a70c1 Same as https://github.com/highfidelity/hifi/pull/13747 2018-08-03 09:22:29 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Alexander Ivash
5a2506e94f FB16831 qml-related warnings in log 
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
 2018-08-03 17:10:41 +03:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a 
# Conflicts:
#	libraries/audio/src/SoundCache.h
 2018-08-03 10:29:32 +12:00
Dante Ruiz
048196ec6f disble sending avatar and audio packets during interstitial mode 2018-08-02 11:39:06 -07:00
sabrina-shanman
a06f85faa8 Consolidate intersection information in CollisionPickResult to one list, and move variant conversion code to source file 2018-08-02 11:27:04 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
Olivier Prat
0c8d8e985f Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-02 17:14:31 +02:00
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
Andrew Meadows
e336c9276d first set shape THEN use it 2018-08-01 17:39:57 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
Andrew Meadows
bd6f00e707 eliminate angular dynamics of other-avatars 2018-08-01 11:58:52 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352 
Fix HMD.mountedChanged() API signal
 2018-08-01 11:28:11 -07:00
Andrew Meadows
c939699879 ignore other-avatar angularVelocity in physics simulation 2018-08-01 11:22:58 -07:00
SamGondelman
a8c408abe8 correct render bounds for parabolas 2018-08-01 11:09:46 -07:00
Simon Walton
b18c1f0e1e Use defined value for invalid sequence number 2018-08-01 10:10:45 -07:00
Olivier Prat
a3e1eb997d Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-01 15:24:26 +02:00
Simon Walton
ed75fe673e Replace int+bool with single atomic int 2018-07-31 18:28:14 -07:00
amantley
02dd2f4f28 added velocity scaling for forward and back 2018-07-31 18:26:44 -07:00
Dante Ruiz
0b7d6cb720 start interstitial page work 2018-07-31 14:10:19 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash 
Remove deprecated flying setting from MyAvatar.cpp saveData()
 2018-07-31 09:48:01 -07:00
Olivier Prat
30600dff93 Non shadow casters now increase shadow scene bounds only in light direction 2018-07-31 15:23:27 +02:00
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07:00
Clement
9e84603ca4 Make proper -v and -h options for interface 2018-07-30 17:18:32 -07:00
sabrina-shanman
de7d974336 Re-name EntityIntersection to ContactTestResult and remove its default constructor, plus update related variables 2018-07-30 16:45:31 -07:00
sabrina-shanman
fadc094a01 Do not work with raw pointer in CollisionPickResult::compareAndProcessNewResult 2018-07-30 15:10:21 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
sabrina-shanman
41a8deb575 Fix Linux build warnings 2018-07-30 14:51:04 -07:00
amantley
541d2deed5 added the parent alpha into the child animation weight, removed extra hand overlay print outs 2018-07-30 14:45:25 -07:00
r3tk0n
63de16bac5 Remove deprecated flying setting from MyAvatar.cpp saveData() 2018-07-30 11:40:15 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Simon Walton
be1bbc07c2 Don't wait for (nonexistant) ES when in serverless mode 2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291 Remove old physics-enabling code 2018-07-27 17:32:35 -07:00
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
SamGondelman
3d4639bfdd CR 2018-07-27 16:36:22 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
Simon Walton
5315b020ec Use locking for the OctreePacketProcessor additions 2018-07-27 14:51:24 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
SamGondelman
f5364f752f fix scaling 2018-07-26 18:01:24 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector 
Redesign and enable hand's Pole Vectors for elbow simulation
 2018-07-26 11:51:33 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4 Missed an identifier change 2018-07-25 17:36:53 -07:00
sabrina-shanman
de6d30e160 Add JS docs for CollisionPick API 2018-07-25 16:49:41 -07:00
NissimHadar
ce53b44b02 CR comments. 2018-07-25 15:58:46 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
NissimHadar
630df7c233 Corrects loading of texture and default visibility. 2018-07-25 13:28:23 -07:00
sabrina-shanman
8f993e4740 Change meaning/naming of collision points in CollisionPick API to better match spec and be more clear 2018-07-25 11:45:13 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
Dante Ruiz
a21a475784 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue 2018-07-25 08:44:28 -07:00
Dante Ruiz
8da1db31df fix audio page being in desktop when your in HMD 2018-07-25 08:44:11 -07:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
amantley
b91df1b2d4 cleaned up stray files and old hud code 2018-07-24 17:25:27 -07:00
amantley
91b9865f27 Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-24 17:14:24 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
sabrina-shanman
083991dc1a Fix CollisionPick not detecting when collision points for collision models are loaded 2018-07-24 15:50:18 -07:00
sabrina-shanman
5ec277e458 Move bullet references in collision pick API to PhysicsEngine 2018-07-24 15:47:49 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper 
Added _aboutToQuit guard on eventFilter()
 2018-07-24 11:37:19 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
sabrina-shanman
a1202d9bd5 Do not use dynamic cast with bullet objects, and add missing template syntax 2018-07-24 09:07:18 -07:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
MuteTab
52e5bdb360 Added _aboutToQuit guard on eventFilter() 2018-07-23 14:27:38 -07:00
luiscuenca
2adb334034 unused code deleted 2018-07-23 14:25:30 -07:00
sabrina-shanman
a3560d1a1b Remove wrong template from RigidBodyResultCallback function definitions 2018-07-23 13:47:02 -07:00
sabrina-shanman
66f355e5ba Move bullet callbacks for collision picks to source file 2018-07-23 13:33:16 -07:00
sabrina-shanman
ca30bb59af Remove unused Bullet callbacks for collision picking 2018-07-23 13:25:09 -07:00
luiscuenca
9d2d7c3aa4 Redesign and enable hand's Pole Vectors for elbow simulation 2018-07-23 13:16:11 -07:00
sabrina-shanman
7f743de150 Fix CollisionRegion serialization/deserialization issues and CollisionPick implicit cast warning 2018-07-23 12:59:23 -07:00
Alexander Ivash
33c858774b fix coding standard compliance 2018-07-23 21:01:43 +03:00
Seth Alves
ae83c33621
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master 
put back old-style avatar-attachments menu-item
 2018-07-23 10:25:23 -07:00
SamGondelman
e9ab2b8f27 enable LOD manager on android 2018-07-20 17:07:49 -07:00
r3tk0n
bc91affa70 Bring this PR inline with RC70.1 PR. 2018-07-20 15:13:44 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Alexander Ivash
849c91d8f6 remove not necessary EntityTreeRenderer from removeAvatarEntities's condition 2018-07-20 19:32:58 +03:00
r3tk0n
3108d650de
Restore original menu string for flying 
Restore the original menu string for flying as it apparently *does* effect jumping.
 2018-07-20 08:29:11 -07:00
Cristian Luis Duarte
9bb4bada8a Merge remote-tracking branch 'hifi/master' into android_loading_stuck 2018-07-19 21:45:03 -03:00
Cristian Luis Duarte
eb5cc00fff newlines 2018-07-19 21:24:29 -03:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Cristian Luis Duarte
6d239f40fb Android - Freeze at startup problem - remove logs 2018-07-19 20:47:05 -03:00
Ryan Huffman
1f259d235d Fix computePickRay when in mirror mode 
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
 2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
MuteTab
dfcf47e8ee Removed useless comment. 2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193 Remove one change, turned out to be unnecessary. 2018-07-19 14:43:46 -07:00
MuteTab
3080539b63 Make getFlyingEnabled() always true when in desktop. 2018-07-19 14:40:20 -07:00
MuteTab
b70b424447 Added new menu classification for VR vs non-VR movement. 2018-07-19 14:27:49 -07:00
Qliemillar
e779e42d90
Merge pull request #13635 from NissimHadar/bug16645 
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
 2018-07-19 14:43:04 -06:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd Re-added missing semi-colon. 2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da Add first-run checks for flying settings. 2018-07-19 12:41:24 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Brad Davis
63fa54ceda Fix for audio continuing on destroyed Web 3D overlays 2018-07-19 11:50:18 -07:00
Seth Alves
965c35292c put back old-style avatar-attachments menu-item 2018-07-19 11:32:19 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
NissimHadar
4c0b7ca24c Updated per Samuel's/Austin's comments. 2018-07-18 17:30:46 -07:00
amantley
5ec7ab3a7d removed the other way of computing the average lookat which used a ring buffer 2018-07-18 17:20:47 -07:00
amantley
a8c4f4e650 removed extra whitespace 2018-07-18 17:10:09 -07:00
amantley
7cc724a27b added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection 2018-07-18 17:08:04 -07:00
NissimHadar
a882931c6b Only show overlay if textures have loaded 2018-07-18 15:02:02 -07:00
David Rowe
835fb927b7 Merge branch 'master' into 21899 2018-07-19 09:34:37 +12:00
David Rowe
396382afd7 Fill in Audio API JSDoc 2018-07-19 09:31:48 +12:00
NissimHadar
446ef97fc5 Only show overlay if textures have loaded 2018-07-18 13:54:03 -07:00
Wayne Chen
c104e95ef4 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-18 09:06:22 -07:00
amantley
ef2d3c9f16 Merge remote-tracking branch 'upstream/master' into rotateFilterChange 
synching with master
 2018-07-18 09:00:18 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
amantley
33f9acde67 latest 2018-07-17 17:42:11 -07:00
luiscuenca
e3594fe1b7 mutex added 2018-07-17 17:23:03 -07:00
Wayne Chen
3b7f88a4a8 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-17 17:08:43 -07:00
luiscuenca
ba884f8a94 Forgotten coment 2018-07-17 16:42:59 -07:00
luiscuenca
6225435385 some ortographic fixes 2018-07-17 16:38:34 -07:00
luiscuenca
fcb7614f7e Format and fixes 2018-07-17 16:34:30 -07:00
SamGondelman
86c56195d3 refactoring common path pointer functionality 2018-07-17 16:15:20 -07:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
Cristian Luis Duarte
c664ce7671 Android - bypass settings reset dialog with cli option 2018-07-17 15:05:56 -03:00
Qliemillar
d498d6bb3d
Merge pull request #13617 from amantley/rotateRecenter 
Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage
 2018-07-17 08:57:24 -06:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
amantley
abb2c7ef14 Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter. 2018-07-16 11:29:49 -07:00
Zach Fox
ac2351e49f Make JSDoc happy 2018-07-16 11:00:27 -07:00
Cristian Luis Duarte
f9baeaf151 Android - logs during startup - weirdly did not get stuck during tests 2018-07-16 12:28:44 -03:00
David Rowe
806228299e Stub out Audio JSDoc 2018-07-15 10:31:48 +12:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
Zach Fox
2da911ad84 Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup 2018-07-13 09:47:49 -07:00
Seth Alves
5085112722
Merge pull request #13594 from ctrlaltdavid/21677-a 
Remove deprecated Window.raiseMainWindow API function
 2018-07-12 19:48:33 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
Wayne Chen
089831b6ee Adding potential fix 2018-07-12 14:15:16 -07:00
Zach Fox
f57fe892c3
Merge pull request #13590 from zfox23/MS16615_openFromPurchases 
Fix MS16615: Don't early-remove .app.json we JUST installed
 2018-07-12 11:51:52 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale 
Render Scale Resolution applied only to 3D rendering not HUD
 2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539 
MS9539: Update Controls Reference pages
 2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac 
Add Crashpad to Mac
 2018-07-11 19:16:24 -07:00
David Rowe
46c9853152 Remove deprecated Window.raiseMainWindow API function 2018-07-12 14:04:08 +12:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Wayne Chen
f7e906440f Merge branch 'master' of https://github.com/highfidelity/hifi into updateControlsReference-case-9539 2018-07-11 11:20:10 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze 
Fix haze on Mac (bug #15515)
 2018-07-11 20:04:22 +02:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
Clement
b5252da3f2 CR 2018-07-10 16:53:11 -07:00
Zach Fox
d3c0236602 Merge branch 'master' of github.com:highfidelity/hifi into MS16480_disableOverlays 2018-07-10 15:02:05 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
Wayne Chen
8f23fb01a4 removing unused variables 2018-07-10 07:30:02 -07:00
Wayne Chen
bf5cdb0e5f removing unused variables from lambda capture expressions 2018-07-09 22:31:49 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
amantley
cb421fd5b0 fixed build errors for mac and linux 2018-07-09 15:09:45 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
amantley
b2d77ef51a bracket spacing 2018-07-09 13:54:18 -07:00
amantley
7ed8f17b57 tweaked posterior threshold and head velocity threshold 2018-07-09 13:49:21 -07:00
amantley
a3417cace9 implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight 2018-07-09 11:58:02 -07:00
Zach Fox
01eb3eddab Fix MS16480: Disable active ContextOverlays when disabling ContextOverlayInterface 2018-07-09 10:49:11 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Clement
1aeb66f70f Fix Windows warning 2018-07-06 18:17:17 -07:00
amantley
defd6f88e6 started changes suggested by code review, ie mode computation 2018-07-06 18:17:13 -07:00
Clement
c02366a811 Fix android build failure 2018-07-06 17:17:40 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Clement
23e5dd0d2c annotate with fingerprint immidiately 2018-07-06 15:52:30 -07:00
Simon Walton
607a898c32 Transmit a maximum number of identity requests before giving up 2018-07-06 15:16:13 -07:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
John Conklin II
1bd698a5dc
Merge pull request #13558 from danteruiz/fix-falling-through-floor 
Fix falling through floor
 2018-07-06 13:44:08 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Wayne Chen
cb89b046b4 moving copyToClipboard from slots to functions 2018-07-06 11:07:35 -07:00
Wayne Chen
eb4704620c reverting unintended line from previous debug 2018-07-06 11:06:16 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Alexander Ivash
aaa2e3f6a8 fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables' 2018-07-06 21:00:56 +03:00
Alexander Ivash
33c45a224c return 'override' to fix mac/linux builds 2018-07-06 21:00:56 +03:00
Alexander Ivash
745a957e05 more clear description of bookmarks added/loaded/removed signals 2018-07-06 21:00:56 +03:00
Alexander Ivash
7fa09aef8f slightly update jsdoc with functions description 2018-07-06 21:00:55 +03:00
Alexander Ivash
7854b28498 move empty function to header per Dante's request 2018-07-06 21:00:55 +03:00
Alexander Ivash
fae5cd22f0 remove signals blocking 2018-07-06 21:00:55 +03:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbcc654af1 remove comments 2018-07-06 21:00:55 +03:00
Alexander Ivash
b8b3c21c89 added jsdoc comments 2018-07-06 21:00:55 +03:00
Alexander Ivash
ea55df48ca fix coding style 2018-07-06 21:00:55 +03:00
Alexander Ivash
83f92aff9f Create data directory if doesn't exist 2018-07-06 21:00:55 +03:00
Alexander Ivash
4db346167d fix extracting default avatar bookmarks from resources 2018-07-06 21:00:55 +03:00
Alexander Ivash
24885c3512 use avatarbookmarks.json from resources by default 2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
56cd4e57a6 add 'reset sensors' to preferences 2018-07-06 21:00:54 +03:00
Alexander Ivash
929fec731c remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ccd4aaab7 fix typo 2018-07-06 21:00:52 +03:00
Dante Ruiz
ce3015662e backend integration from Dante 
* adding some functionality to avatar bookmarks
* saving work
 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Dante Ruiz
10bce7ea8d adding some functionality to avatar bookmarks 2018-07-06 21:00:51 +03:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
Dante Ruiz
533164e1e4 some more fixes 2018-07-06 08:55:20 -07:00
Thijs Wenker
1b63dfa20a - OSX fixes (right camera after coming from native window, disappearing content) 
- Fix show() to show the window after it was minimized
 2018-07-06 17:50:48 +02:00
Clement
8c283806b3 Fix Warnings 2018-07-05 20:02:57 -07:00
Wayne Chen
3994ec4176 adding potential fix - moving methods to Application 2018-07-05 17:54:27 -07:00
Simon Walton
f77b2903a1 Minor tweaks 2018-07-05 17:13:27 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
Clement
546ee2b96f cleanup cmake code 2018-07-05 14:18:09 -07:00
amantley
0ebc7fc29e fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency 2018-07-05 13:41:06 -07:00
Clement
b8f821a6a6 Use binary path in args to find crashpad handler 2018-07-05 12:05:48 -07:00
Sam
58f004352a Added per pixel GPU stats 2018-07-04 17:15:12 +02:00
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing 
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
 2018-07-03 21:50:57 -07:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
amantley
6460c9e861 fixed case for 0.0 as the filter length 2018-07-03 17:11:19 -07:00
John Conklin II
d34d7388a1
Merge pull request #13537 from r3tk0n/move_hide_overlays_menu 
Moved "Show Overlays" menu item to Developer Menu
 2018-07-03 15:59:02 -07:00
Simon Walton
ec67b8ad56 Address reviewer comments 2018-07-03 15:31:34 -07:00
amantley
4995b57712 removed print statements and fixed rotation threshold update code 2018-07-03 14:31:36 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix 
Tablet Asset Server dialog was instantiated twice
 2018-07-03 13:14:12 -07:00
r3tk0n
4426173021 Moved "Show Overlays" menu item to Developer Menu 2018-07-03 11:56:34 -07:00
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
amantley
9e5763ea5c adding the recentering back into the non hmd lean code 2018-07-03 11:46:59 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix 
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
 2018-07-03 19:38:01 +01:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
amantley
f216316b55 removed some comments and whitespace 2018-07-02 18:19:31 -07:00
amantley
47110d080f removed clang induced changes to MyAvatar.cpp 2018-07-02 17:06:16 -07:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
Bradley Austin Davis
b862694e32
Merge pull request #13505 from samcake/punk 
Fixing a bug if the last session display plugin is an invalid name, resolve to default
 2018-07-02 14:55:04 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2 
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
 2018-07-02 12:33:35 -07:00
vladest
0657992e9c Tablet Asset Server dialog was instantiated twice 2018-07-01 19:56:51 +02:00
Anthony J. Thibault
fff4348a0f Bug fix for poleVector smoothing 
Needs to occur in sensor space rather then avatar space.
 2018-06-29 17:54:21 -07:00
Gabriel Calero
762e8f4bf0 Refactor WebViewActivity using fragment. Try SlidingDrawer. 2018-06-29 20:43:58 -03:00
r3tk0n
39f491d9d0
Update PreferencesDialog.cpp 
Removing errant newline
 2018-06-29 16:17:15 -07:00
r3tk0n
4feba7e66e
Correction of string literals 
Last update to string literals, miscommunication.
 2018-06-29 16:12:31 -07:00
r3tk0n
5158a9c4fd
Update Mouse Sensitivity Settings Text 
Changed text for clarity to new users.
 2018-06-29 16:11:18 -07:00
r3tk0n
9b59dc5809 Changed SpinnerSliderPreference.qml to general-case UI element as originally intended, 
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
 2018-06-29 15:22:57 -07:00
amantley
44d9edec3c added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning 2018-06-29 14:42:23 -07:00
amantley
c9c222a253 added the failsafe code to the stepping 2018-06-29 11:33:42 -07:00
Gabriel Calero
a6d093d8c9 Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-29 15:09:32 -03:00
sabrina-shanman
9dc03f5013 Destroy GeometryCache explicitly in Application destructor 2018-06-29 10:39:16 -07:00
sabrina-shanman
c849d8e2a8 Merge branch 'mac-shutdown-crash-on-present' into fix-osx-crash-on-exit 2018-06-29 09:37:54 -07:00
Sam Gateau
d543cd0766 Fixing a bug if the last session display pluginis an invalid name, resolve to default 2018-06-29 15:42:19 +02:00
amantley
15a17ae32a finished the step detection, need to finish the failsafe 2018-06-28 18:36:13 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster 
The client should render "something" for an avatar even if mesh or identity is not available
 2018-06-28 12:12:16 -07:00
amantley
3e6d54e83c added all the parts for the step conditional to do: failsafe 2018-06-28 11:56:46 -07:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
John Conklin II
b07d317f4c
Merge pull request #13488 from hyperlogic/bug-fix/qstring-from-script-engine 
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
 2018-06-28 09:56:51 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
Sam Gondelman
736c56f5f4
Merge pull request #13487 from gcalero/single_account_manager_android 
Remove the duplicated AccountManager used for android
 2018-06-28 09:07:23 -07:00
Angus Antley
2307c8e24a more work on the mode threshold 2018-06-28 15:40:42 +01:00
amantley
621ca7d2b4 more work on the mode function 2018-06-27 18:46:24 -07:00
amantley
61a935dbb5 added the first pass at mode computation 2018-06-27 18:02:11 -07:00
Anthony J. Thibault
70a3c9ce3c Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings 
Using gflags on windows and enabling full page heap verification, I was able to detect this as a source of
memory corruption.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap

Running interface with pageheap before and after, this change leads me to believe that this is a source of
some of our heap-corruption crashes on backtrace.

Specifically these 19 crashes in the last month, and possibly more.

https://highfidelity.sp.backtrace.io/dashboard/highfidelity/project/Interface/query-builder?qb=%7B%22mode%22%3A%22aggregate%22%2C%22sorting%22%3A%7B%22aggFactor%22%3A%22count%22%2C%22aggSortOrder%22%3A%22descending%22%2C%22selectFactor%22%3A%22timestamp%22%2C%22selectSortOrder%22%3A%22descending%22%2C%22sortedColumnNames%22%3A%5B%5D%7D%2C%22dateTimePicker%22%3A%7B%22granularity%22%3A%221M%22%2C%22start%22%3A%222018-05-27T07%3A00%3A00.000Z%22%2C%22end%22%3A%222018-06-27T23%3A05%3A29.399Z%22%7D%7D&qn=&query=%7B%22filter%22%3A%5B%7B%22callstack%22%3A%5B%5B%22contains%22%2C%22saveAll%22%5D%5D%2C%22timestamp%22%3A%5B%5B%22at-least%22%2C1527404400%5D%2C%5B%22at-most%22%2C1530140729%5D%5D%7D%5D%2C%22fold%22%3A%7B%22timestamp%22%3A%5B%5B%22range%22%5D%2C%5B%22bin%22%2C32%2C1527404400%2C1530140729%5D%5D%7D%2C%22group%22%3A%5B%22classifiers%22%5D%2C%22select%22%3A%5B%22timestamp%22%2C%22fingerprint%22%2C%22_deleted%22%2C%22callstack%22%2C%22object%22%5D%7D
 2018-06-27 16:06:23 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default 
Disable flying by default
 2018-06-27 16:04:16 -07:00
John Conklin II
02d0c7d795
Merge pull request #13454 from danteruiz/mac-fix-general-settings 
make general settings be under settings instead of preferences
 2018-06-27 15:59:16 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
Zach Fox
1b414fbbfe Quick CR comments 2018-06-27 15:11:59 -07:00
Gabriel Calero
e15fc787d3 Remove the duplicated AccountManager used for android 2018-06-27 19:04:27 -03:00
Zach Fox
8ba184db6a Don't use flags; use a bool 2018-06-27 14:59:46 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also 
added the virtual keyword to the createOrb virtual method in OtherAvatar
 2018-06-27 14:31:39 -07:00
Zach Fox
2347634d72 Fixed View Overlays checkbox (thanks Dante) 2018-06-27 14:28:43 -07:00
amantley
7b49ae4950 added the within threshold of height function and to do: the mode computation 2018-06-27 14:23:24 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
amantley
1804422df0 remove orb in the otherAvatar destructor, and check 
_otherAvatarOrbMeshPlaceholder pointer before updating the position
 2018-06-27 11:15:42 -07:00
amantley
3893b7e339 added the head angular velocity check 2018-06-27 10:37:54 -07:00
sabrina-shanman
18219464f1 Fix shutdown crash on Mac in Application::onPresent 2018-06-27 09:56:03 -07:00
Seth Alves
d9f8cd46ea
Merge pull request #13415 from ctrlaltdavid/21896 
Zero avatar velocity if protocol version mismatch so that overlays show
 2018-06-27 09:35:15 -07:00
amantley
8cf59783d1 removed white space 2018-06-27 09:20:46 -07:00
amantley
be6fadbc2d Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-06-27 09:16:43 -07:00
Angus Antley
eba4a27329 added newline to the end of AvatarManager.cpp 2018-06-27 05:59:53 +01:00
amantley
39edc21423 spaced comment fixed 2018-06-26 17:47:36 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
7ecf8c24df Merge remote-tracking branch 'upstream/master' into glowingOrbMaster 
syncing with upstream master
 2018-06-26 16:44:34 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
Sam Gondelman
7fb2e535ff
Merge pull request #13468 from SamGondelman/secondaryShadows 
Disable shadows in secondary camera
 2018-06-26 15:45:44 -07:00
amantley
2b6d470467 Merge remote-tracking branch 'upstream/master' into glowingOrbMaster 
syncing with master
 2018-06-26 15:16:41 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00
Dante Ruiz
3cf36bed55 making small adjustments 2018-06-26 14:57:15 -07:00
Dante Ruiz
1fec900ba6 disable flying by default 2018-06-26 13:31:59 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07:00
SamGondelman
97ee02811c disable shadows in secondary camera 2018-06-26 12:27:59 -07:00
Zach Fox
56b3c125c5
Merge pull request #13459 from zfox23/MS16113_hifikeyPath 
Fix MS16113: Use alternate method for creating backup instructions
 2018-06-26 11:36:03 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
Angus Antley
b8dea4b869 adding changes to add the orb when an avatar is processed by the avatar mixer 
and when a new model is being loaded for an avatar.  The orb is removed
when the geometry has loaded.
 2018-06-26 06:27:18 +01:00
Sam Gondelman
acfd562309
Merge pull request #13435 from gcalero/breakpad_android 
Breakpad integration for android Interface (part II)
 2018-06-25 16:47:07 -07:00
Zach Fox
7a5d794505 Fix MS16113: Use alternate method for creating backup instructions 2018-06-25 14:40:54 -07:00
Dante Ruiz
7f7ca677f0 mac - moving general settings back under settings 2018-06-25 14:23:37 -07:00
Gabriel Calero
0a70e844bf Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-25 17:41:51 -03:00
Gabriel Calero
fedc0a9e61 Support web3d overlays in android 2018-06-25 16:37:03 -03:00
Andrew Meadows
756f34761f don't build AvatarMotionStates until physics enabled 2018-06-25 10:37:54 -07:00
David Rowe
af3861def8 Code review 2018-06-25 16:33:05 +12:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
Simon Walton
0dca842102 Add avatar identity requests to analytics 2018-06-22 17:06:33 -07:00
Simon Walton
269d803812 New approach to tracking no-identity duration 2018-06-22 16:42:37 -07:00
John Conklin II
b7069fff71
Merge pull request #13382 from SamGondelman/particleFix 
Fix Particle Entities
 2018-06-22 13:27:11 -07:00
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