Commit graph

72339 commits

Author SHA1 Message Date
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1
Fix some Mac rendering issues
2018-10-01 16:35:57 -07:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build
get interface building and working with clang-7 on ubuntu 18
2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
Simple avatar transit
2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation
Fix edit rotation handle fidgeting
2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061
use current wearable index, not joint index!
2018-10-01 16:14:33 -07:00
Brad Hefta-Gaub
526d69f1b8
Merge pull request #14020 from wayne-chen/fixMainTextContainerQML
Login Dialog UI improvements
2018-10-01 16:13:59 -07:00
Brad Hefta-Gaub
a3310be3fe
Merge pull request #14013 from gcalero/fix_android_login
Fix android login infinite loading (case 18459)
2018-10-01 16:13:29 -07:00
Brad Hefta-Gaub
6eae178389
Merge pull request #13997 from gcalero/case_18057
Fix switch from Top View to My View
2018-10-01 16:13:07 -07:00
David Rowe
87ff6dd56d Fix play area sizing and positioning for different base avatar sizes 2018-10-02 10:53:31 +13:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
NissimHadar
b0dee3a802 Use correct URL for "serverless" 2018-10-01 13:09:15 -07:00
NissimHadar
39d55a6612 Use correct URL for "serverless" 2018-10-01 13:08:44 -07:00
luiscuenca
f3c89dd9d7 Same mutex 2018-10-01 13:08:14 -07:00
luiscuenca
c1aa5e9308 Add mutex to setter 2018-10-01 12:54:47 -07:00
luiscuenca
2c6003e40b Add mutex 2018-10-01 11:44:08 -07:00
Clement
073b3ae57d Merge branch 'master' of github.com:highfidelity/hifi into feat/audio-mixer-throttle-equation 2018-10-01 10:50:28 -07:00
Clement
1997191e77 Fix MSVC warnings 2018-10-01 10:49:04 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Thijs Wenker
eeda7400c9 check if id matches in filtered getMultipleEntityProperties 2018-10-01 19:36:53 +02:00
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML 2018-10-01 09:48:42 -07:00
NissimHadar
5ce02c23c7 Add UAC warning if install fails. 2018-09-30 17:40:05 -07:00
NissimHadar
632f6647dd Add UAC warning if install fails. 2018-09-30 17:11:01 -07:00
Seth Alves
90d9af35b5 minimize diff 2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c static_cast can be used here rather than dynamic 2018-09-30 15:49:42 -07:00
Seth Alves
f784b33eed get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor 2018-09-30 15:25:21 -07:00
Seth Alves
749b02cfb8 get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor 2018-09-30 15:12:49 -07:00
David Rowe
7560a2a923 Short circuit unnecessary repetition 2018-09-29 16:00:44 +12:00
David Rowe
9dfbaa9201 Remove "Reset Sensors" button from Settings > Controls 2018-09-29 14:17:55 +12:00
David Rowe
2449868ea9 Fix mini tablet sizing for different sizes of avatar 2018-09-29 13:51:00 +12:00
Thijs Wenker
e266e2ebbf filter getEntity(Multiple)Properties entities unitTest 2018-09-29 02:44:11 +02:00
David Rowe
8464a70c9e Fix initial tablet scale 2018-09-29 12:42:41 +12:00
John Conklin II
130e8dfbe9
Merge pull request #14023 from dback2/selectEntityEveryFrameFix
Only call selectEntity once triggered when using edit handles
2018-09-28 16:38:10 -07:00
John Conklin II
1135228b3b
Merge pull request #14095 from kencooke/audio-hrtf-reset
Audio-mixer optimizations
2018-09-28 16:34:38 -07:00
Anthony Thibault
58df72af60 Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast 2018-09-28 16:32:12 -07:00
John Conklin II
789062d0b9
Merge pull request #14103 from howard-stearns/shorter-handshake
minimal time handshake
2018-09-28 16:29:38 -07:00
Ryan Huffman
feb230b3bd Remove old comment in entitySelectionTool.js 2018-09-28 16:17:52 -07:00
John Conklin II
11492ce8ee
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
don't call enterEntity before the entity's script is loaded
2018-09-28 16:07:08 -07:00
Seth Alves
bbe9b5c26f code review, remove some unneeded automoc includes 2018-09-28 16:04:40 -07:00
Clement
585c278400 streamline mix operation 2018-09-28 15:45:56 -07:00
NissimHadar
dd8d651c69 Changed TestEdit fields to LineEdit. 2018-09-28 15:36:52 -07:00
NissimHadar
a0af0b4d2d Add enabling/disabling of Suite ID 2018-09-28 15:35:45 -07:00
NissimHadar
7d60c4c850 Add HostName to Test Run name. 2018-09-28 15:35:09 -07:00
NissimHadar
574be7614c Deal with blanks in path. 2018-09-28 15:34:22 -07:00
Ken Cooke
ac6dd57a30 HRTF starts in silent state 2018-09-28 15:00:52 -07:00
Ken Cooke
2dc89f81a5 Add HRTF reset() 2018-09-28 15:00:52 -07:00
Stephen Birarda
b18d8e2254 pull out removal and adding of streams to sep functions 2018-09-28 15:00:52 -07:00
Stephen Birarda
7e4cfd3c78 fix for injected audio going to unreachable 2018-09-28 14:54:50 -07:00
Stephen Birarda
b7c6fa003d guard against incorrectly sized AudioStreamStats from packet 2018-09-28 14:54:50 -07:00
Stephen Birarda
2ac1445683 remove double scoping of the frame check timer 2018-09-28 14:54:50 -07:00