luiscuenca
2c6003e40b
Add mutex
2018-10-01 11:44:08 -07:00
Roxanne Skelly
f8409b3977
dd server-console to client build
2018-10-01 11:29:55 -07:00
SamGondelman
de90ce5f2b
move stage frames to varyings
2018-10-01 11:26:02 -07:00
sabrina-shanman
b988382918
Remove smaller RayPick constructor
2018-10-01 11:07:02 -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
Roxanne Skelly
d05de53293
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup
2018-10-01 10:07:26 -07:00
Wayne Chen
5f05be554f
check for hard refusal to 404
2018-10-01 10:06:13 -07:00
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML
2018-10-01 09:48:42 -07:00
Dante Ruiz
ad92b172cb
removing comment
2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0
merging from master
2018-10-01 09:44:54 -07:00
sabrina-shanman
7a89f959d1
Fix not mentioning pick parenting in all pick parenting jsdocs for
...
parentID
2018-10-01 09:34:21 -07:00
Wayne Chen
eab57633a5
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-01 09:21:26 -07:00
sabrina-shanman
0cf7e954cc
Simplify a RayPick and StylusTip constructor
2018-10-01 09:20:59 -07:00
sabrina-shanman
f0de3ef31c
jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex
2018-10-01 09:18:52 -07:00
sabrina-shanman
728f8aeecd
Scale Parabola Pick acceleration before rotating it
2018-10-01 09:02:46 -07:00
sam gateau
305ea80a18
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-10-01 08:37:19 -07:00
Sam Gateau
5842416ae6
Exploring the possible packing schemes and trying to debug the tangent
2018-09-30 23:11:36 -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
Roxanne Skelly
113ad3d917
Fixes for OSX
...
App Translocation makes it nearly impossible to find the interface
executable from the running server-console, specifically in downloaded
builds launched from the Finder. To enable OSX detection and and
launch of the interface, the code has been changed to:
* Assume interface is installed on OSX as we don't produce a server-only
build.
* Launch the interface by using 'open' with the appid.
NOTE: This may launch the wrong version of the app if
multiple instances of the app are installed, but this
is the best we can do for now. For most users, the
behavior should be as expected.
Second, polling was happening even if interface couldn't be
detected if it was previously enabled.
2018-09-30 13:11:15 -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
sam gateau
1ff4c54c1c
Packing normal and tangents
2018-09-28 17:49:52 -07: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
Roxanne Skelly
b6877bca57
Revert ""Add temporary code to test for interface paths"""
...
This reverts commit edd354d109
2018-09-28 16:26:44 -07:00
Ryan Huffman
feb230b3bd
Remove old comment in entitySelectionTool.js
2018-09-28 16:17:52 -07:00
sabrina-shanman
f3f9976cfb
Cache ParabolaPick speed
2018-09-28 16:10:17 -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
sabrina-shanman
b60a62da8f
Move pathWidth variable in PathPointer back down to specialized classes
2018-09-28 16:04:34 -07:00
Clement
585c278400
streamline mix operation
2018-09-28 15:45:56 -07:00
sabrina-shanman
0c3f55d6ef
Code style for floating point literal
2018-09-28 15:39:37 -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
