Commit graph

29409 commits

Author SHA1 Message Date
Sam Gateau
a5d17883d0
Merge pull request #15602 from SamGondelman/tests
BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD
2019-05-24 11:29:04 -07:00
Brad Hefta-Gaub
5765957fe1
Merge pull request #15618 from luiscuenca/addCredentials
Pass tokens as params for automatic login
2019-05-24 09:13:53 -07:00
luiscuenca
050682c84c
Keep logged in after first run 2019-05-23 19:53:37 -07:00
luiscuenca
42c1f4be33
fix typo and entry on first run when --url is set 2019-05-23 17:07:06 -07:00
Shannon Romano
aaf4bef34e
Merge pull request #15625 from zfox23/SUI/BUGZ-336
Fix BUGZ-336: Microphone test does not stop unless you press the button to "stop test"
2019-05-23 15:17:37 -07:00
Anthony Thibault
fecd488b4b
Merge pull request #15623 from AndrewMeadows/plug-otherAvatar-resource-leak
BUGZ 345: avoid resource leak in AvatarManger::_otherAvatarsToChangeInPhysics
2019-05-23 14:51:29 -07:00
Zach Fox
78fdd2d673 Fix BUGZ-336 2019-05-23 14:25:06 -07:00
Andrew Meadows
940c122f46 clear _otherAvatarsToChangeInPhysics after processing it 2019-05-23 13:38:54 -07:00
Zach Fox
da011fd042 Fix BUGZ-312; fix BUGZ-311 2019-05-23 13:37:25 -07:00
luiscuenca
8db3d03772
add display name as param 2019-05-23 10:21:47 -07:00
Zach Fox
4bbbaa8c19 Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes 2019-05-23 09:39:38 -07:00
luiscuenca
6d824ff22d
Fix logout 2019-05-22 20:27:42 -07:00
Zach Fox
934ea76966
Merge pull request #15613 from zfox23/SUI/newAudioProperties
Fix the janky audio output settings UI
2019-05-22 16:45:02 -07:00
Zach Fox
8a2132ca9b
Merge pull request #15616 from zfox23/SUI/errorStatesAvatar
Define/show some error states in the Avatar app
2019-05-22 16:44:38 -07:00
Brad Hefta-Gaub
74770eb54a
Merge pull request #15614 from ctrlaltdavid/M22513
Case 22513: Selection JSDoc
2019-05-22 16:38:21 -07:00
Zach Fox
d75fe04038 Fix BUGZ-311 2019-05-22 16:24:40 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login 2019-05-22 16:18:30 -07:00
Zach Fox
8df706abcb Handle the case when the user doesn't have any avatars yet 2019-05-22 15:51:46 -07:00
Zach Fox
3ed47b4f23 Show error states in Avatar app (BUGZ-310) 2019-05-22 15:45:18 -07:00
Zach Fox
46ee148a69 Fix a bug and remove magic numbers 2019-05-22 15:24:33 -07:00
David Rowe
2c591ba196 Doc review 2019-05-23 10:18:03 +12:00
David Rowe
04573da96b Selection JSDoc revision 2019-05-23 09:51:30 +12:00
Zach Fox
0c90b7c4c2 JSdocs 2019-05-22 14:51:11 -07:00
Zach Fox
3a4bf2e8f7 Fix the janky audio output settings UI 2019-05-22 14:27:06 -07:00
Zach Fox
ddb299a387
Merge pull request #15608 from zfox23/SUI/envVol
Fix environment volume slider (BUGZ-213); optimize sliders
2019-05-22 14:11:57 -07:00
Zach Fox
257ac12bf9
Merge pull request #15606 from zfox23/SUI/bugFixes1
Simplified UI - two quick fixes.
2019-05-22 12:53:26 -07:00
jennaingersoll
38a379cb38
Merge pull request #15605 from ctrlaltdavid/M22528
Case 22528: Snapshot JSDoc
2019-05-22 12:27:33 -07:00
jennaingersoll
416e2799ad
Merge pull request #15604 from ctrlaltdavid/M22527
Case 22527: Settings JSDoc
2019-05-22 12:08:27 -07:00
Zach Fox
30c13fd988 Fix environment volume slider (BUGZ-213); optimize sliders 2019-05-22 12:01:38 -07:00
Zach Fox
6f7557b00d Implement BUGZ-305 and BUGZ-306 2019-05-22 09:56:28 -07:00
David Rowe
a246e40815 Fix taking snapshot example 2019-05-22 14:14:06 +12:00
David Rowe
30da972a14 Snapshot JSDoc 2019-05-22 14:13:42 +12:00
David Rowe
1f3bffca4a Settings JSDoc polish 2019-05-22 12:08:14 +12:00
Roxanne Skelly
bad421cb59 Fix crash when adding a tracked entity to the safe landing code
when it's not been fully set up yet.
2019-05-21 16:58:49 -07:00
Zach Fox
39d32025a3
Merge pull request #15601 from zfox23/SUI/integratedStatusEtc
Simplified UI: Updates! (See Description)
2019-05-21 16:15:09 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
SamGondelman
a672b79cd8 add version to default skybox 2019-05-21 15:35:43 -07:00
Shannon Romano
fa7a998cca
Merge pull request #15600 from roxanneskelly/bugz223
BUGZ-223 - Physics was not starting in TheSpot-dev
2019-05-21 15:15:16 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
2019-05-21 15:08:02 -07:00
Zach Fox
5749392e83 New bg color; Final status indicator design; Fixed HMD icon 2019-05-21 14:10:27 -07:00
Roxanne Skelly
10db88c07b Fix ubuntu warning 2019-05-21 12:32:01 -07:00
Anthony Thibault
0e87ab6e55
Merge pull request #15598 from SamGondelman/skeletonModelURL
BUGZ-283: Fix MyAvatar.skeletonModelURL
2019-05-21 12:05:30 -07:00
Roxanne Skelly
dddb171b52 BUGZ-223 - Physics was not starting in TheSpot-dev
This was caused by two issues involving the SafeLanding system:
* Race condition on domain load
The domain is hard-reset twice during typical start, first after
login completes, and second, when ice/domain renegotiation occurs
Entities added during the first reset caused an add to the safe landing
system which, because those adds were queued, possibly happened after
the second hard reset.

Second, Safe landing checks whether physics is ready on entities before
letting physics start.  Physics is ready when the entities have a
physics shape associated with them if they're static meshes.  The
physics shape is only generated if the entity is in Region 1 or 2.
Safe landing, however, was not checking the region of the entity
and was therefore waiting on entities that were not in region 1 or 2
2019-05-21 11:23:04 -07:00
Sam Gateau
54c14340ef
Merge pull request #15597 from amerhifi/master
Case BUGZ-277 :  Android build error (on windows host) stat properties missing (please review suggestion)
2019-05-21 11:11:29 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
Shannon Romano
8d36b90b8b
Merge pull request #15594 from huffman/feat/appconfig
DEV-54: Add support for application config
2019-05-21 10:01:19 -07:00
amerhifi
b3285050ed moving the properties out of the define since the values are going to be the same either way 2019-05-21 09:43:09 -07:00
Zach Fox
e79518e092 Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc 2019-05-21 09:28:02 -07:00
amerhifi
56d8e0123f resolving qt moc error with propertie missing for android 2019-05-21 09:19:56 -07:00
Ryan Huffman
d9f164ba3b Add support for application config 2019-05-20 22:00:26 -07:00