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
Wayne Chen
36dbcd41ba
Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged
2018-10-01 16:11:40 -07:00
Wayne Chen
69b547a9fe
text overlays for consistency
2018-10-01 16:11:27 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged
...
Interstitial screen updates
2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2
updating interstitialmode
2018-10-01 15:26:56 -07:00
SamGondelman
1ec481922c
don't render particles without textures
2018-10-01 14:54:34 -07:00
David Rowe
87ff6dd56d
Fix play area sizing and positioning for different base avatar sizes
2018-10-02 10:53:31 +13:00
Roxanne Skelly
010e2091fa
Fixup CPack install items for OSX to hopefully properly handle
...
OSX .app directories
2018-10-01 14:35:47 -07:00
David Rowe
6ccd73ea47
Merge branch 'master' into M18586
2018-10-02 10:17:24 +13:00
SamGondelman
49553e0285
bake default skybox
2018-10-01 14:05:15 -07:00
Dante Ruiz
652ec2210d
fixing loading issues
2018-10-01 13:58:14 -07:00
Roxanne Skelly
c370e064d9
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTrayOsx
2018-10-01 13:36:14 -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
Roxanne Skelly
fbaac4254e
Set build targets properly for client-only install of console
2018-10-01 12:45:56 -07:00
sam gateau
c12115bfda
Addressing the 4.1 pass and make sure it works on windows pc and mac
2018-10-01 11:51:46 -07:00
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
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
