Commit graph

65767 commits

Author SHA1 Message Date
NissimHadar
9b9b62d0e4 Transition to hover if falling and height above ground is greater than the threshold. 2018-03-09 15:20:51 -08:00
samcake
fec30b8363 Fixing the menu for Shadow and AO to do the correct path to engine config 2018-03-09 15:04:14 -08:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api
use correct scripting api  for audio in Audio.qml
2018-03-09 13:41:20 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Sam Gateau
d0de5b2d96
Merge pull request #12496 from AndrewMeadows/faster-raypick
faster per-entity raypick culling and time-boxed picks
2018-03-09 13:01:52 -08:00
Cristian Luis Duarte
3d933e1810 Android - Joystick hidden when opening login and shown after Cancel. 2018-03-09 17:41:05 -03:00
NissimHadar
317d9a8dbc Correct can cast shadow flag being visible on entities that can't cast shadows. 2018-03-09 11:45:39 -08:00
John Conklin II
9044c9b472
Merge pull request #12600 from zfox23/preventSendingEmptyKeys
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
2018-03-09 11:38:59 -08:00
John Conklin II
25b93d9fd7
Merge pull request #12606 from ElderOrb/FB12956_RC65
Fix for broken 'toggle audio meter' button
2018-03-09 11:20:27 -08:00
Zach Fox
8d047184bb
Merge pull request #12592 from zfox23/fixUncertifiedPurchases
Don't default unknown Marketplace item types to 'Entity'
2018-03-09 11:11:12 -08:00
Dante Ruiz
e21c4988fb stereo checkbox text change 2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one
clear wallet when picking a new one
2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one
clear wallet when picking a new one
2018-03-09 10:09:24 -08:00
John Conklin II
209dd7fb43
Merge pull request #12602 from zfox23/RC65_fixFontsAgain
RC65: Fix font loading for MacOS via completely different font loading method
2018-03-09 09:53:46 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain
Fix font loading for MacOS via completely different font loading method
2018-03-09 09:49:56 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub
6b55fa1fcd
Merge pull request #12539 from ctrlaltdavid/21702
Remove deprecated Window.location.protocolVersion() function from API
2018-03-09 08:52:55 -08:00
Brad Hefta-Gaub
8e44b429d8
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
2018-03-09 08:49:07 -08:00
Brad Hefta-Gaub
5437ffb2c8
Merge pull request #12536 from ctrlaltdavid/21700
Remove deprecated Window.openFileChanged() signal from API
2018-03-09 08:47:57 -08:00
Brad Hefta-Gaub
806e077387
Merge pull request #12609 from Atlante45/new-master
Merge RC65 back into master
2018-03-09 08:47:12 -08:00
Dante Ruiz
8703e9e002 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-09 08:42:50 -08:00
Andrew Meadows
858b02f29d more readable code 2018-03-09 08:35:18 -08:00
Andrew Meadows
3f1944eb8a fix variable name typo 2018-03-09 08:35:18 -08:00
Andrew Meadows
9eecd3cb80 update styluses first: they are cheap 2018-03-09 08:35:18 -08:00
Andrew Meadows
f83c6000df use 'auto' for very long type 2018-03-09 08:35:18 -08:00
Andrew Meadows
24635b0451 remove unused debug cruft variable 2018-03-09 08:35:18 -08:00
Andrew Meadows
7a39bd5c81 remove tab whitespace 2018-03-09 08:35:18 -08:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c move rayHitsSphere logic to AABox method 2018-03-09 08:35:18 -08:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
Andrew Meadows
6ab85d5800 cleanup and a few small optimizations 2018-03-09 08:35:18 -08:00
Andrew Meadows
79b9fec900 add rayHitsSphere() util method 2018-03-09 08:35:18 -08:00
Andrew Meadows
81de668c1e faster per-entity raypick culling 2018-03-09 08:35:18 -08:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
NissimHadar
77901e5089 Corrected MacOS warnings. 2018-03-08 20:11:35 -08:00
NissimHadar
aad41a56b2 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-08 19:33:54 -08:00
David Rowe
f1ef085b4b Add canCastShadows and castShadows properties 2018-03-09 15:34:56 +13:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
Brad Davis
47b08d7228 Update Hifi icon 2018-03-08 15:38:13 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes
tablet scale and position changes
2018-03-08 15:36:06 -08:00
John Conklin II
fe0d354d26
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
2018-03-08 15:30:19 -08:00
Alexander Ivash
b427d6c326 FB12956 - Audio Meter Toggle Button Broken 2018-03-09 02:20:34 +03:00
NissimHadar
6026044526
Merge pull request #12558 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
2018-03-08 15:04:19 -08:00
Cristian Luis Duarte
4c3ee195de Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front). 2018-03-08 19:58:15 -03:00
Zach Fox
c22d79041d Cleanup after cherry-pick 2018-03-08 14:35:56 -08:00
howard-stearns
883528488c clear wallet when picking a new one 2018-03-08 14:35:43 -08:00
Zach Fox
ec6f66ee52 Try this 2018-03-08 14:31:56 -08:00
Zach Fox
747a6b07ce Fix font loading for MacOS via different font loading method 2018-03-08 14:31:48 -08:00