Zach Fox
eac435e2cd
Merge pull request #15622 from zfox23/SUI/audioListFixes
...
Fix a bunch of Simplified UI issues (see description)
2019-05-23 14:26:56 -07:00
Zach Fox
da011fd042
Fix BUGZ-312; fix BUGZ-311
2019-05-23 13:37:25 -07:00
Zach Fox
dc370d676a
Fix BUGZ-203
2019-05-23 13:07:47 -07:00
Zach Fox
ee226f7e44
Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes
2019-05-23 12:53:52 -07:00
Zach Fox
3232b1a028
Merge pull request #15621 from zfox23/moveSimplifiedScripts
...
BUGZ-340: Move SimplifiedUI folder and create new defaultScripts.js
2019-05-23 12:53:14 -07:00
Zach Fox
053576e29f
Move SimplifiedUI folder and create new defaultScripts.js
2019-05-23 11:31:42 -07:00
hifi-gustavo
4735b9f19a
Merge pull request #15620 from highfidelity/revert-15612-domaincheckin
...
Revert "BUGZ-322 - add domain checkin lag logging"
2019-05-23 10:35:28 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging"
2019-05-23 10:27:05 -07:00
Zach Fox
4bbbaa8c19
Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes
2019-05-23 09:39:38 -07:00
Shannon Romano
bc4a88beb7
Merge pull request #15617 from Atlante45/fix/logout-reset
...
BUGZ-320: Fix nodelist reset on logout/username change
2019-05-22 17:31:41 -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
Clement
55f1929de2
Fix nodelist reset on logout/username change
2019-05-22 16:09:20 -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
Shannon Romano
5944af5cca
Merge pull request #15612 from roxanneskelly/domaincheckin
...
BUGZ-322 - add domain checkin lag logging
2019-05-22 15:49:24 -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
Roxanne Skelly
b331bb0683
Initialize structure member as per code review suggestion.
2019-05-22 15:03:39 -07:00
Zach Fox
7a88c8362b
naming CR feedback
2019-05-22 15:01:22 -07: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
Roxanne Skelly
4ca77ba3ac
BUGZ-322 - add domain checkin lag logging
2019-05-22 13:51:43 -07:00
Shannon Romano
19503d45ab
Merge pull request #15609 from sabrina-shanman/crash_hfm_tangents
...
(BUGZ-298) Fix crash calculating tangents without texcoords
2019-05-22 13:36:44 -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
sabrina-shanman
3849450c66
Fix crash calculating tangents without texcoords
2019-05-22 11:57:20 -07:00
Zach Fox
6f7557b00d
Implement BUGZ-305 and BUGZ-306
2019-05-22 09:56:28 -07:00
Shannon Romano
930018a924
Merge pull request #15603 from roxanneskelly/bugz223
...
BUGZ-223 - Fix crash when adding a tracked entity to the safe landing code
2019-05-21 19:38:01 -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
Gayathri
009068222f
Merge pull request #15595 from amerhifi/feature/platform
...
BUGZ-296: Linux platform implementation
2019-05-21 16:01:33 -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
Brad Hefta-Gaub
f8797e0d34
Merge pull request #15591 from ctrlaltdavid/M22493
...
Case 22493: Script JSDoc
2019-05-21 15:13:05 -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
Shannon Romano
b1edfdcaef
Merge pull request #15596 from AndrewMeadows/fix-crash-bugz178
...
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model (redux)
2019-05-21 12:50:26 -07:00
Roxanne Skelly
10db88c07b
Fix ubuntu warning
2019-05-21 12:32:01 -07:00
Shannon Romano
11f4252a30
Merge pull request #15599 from sabrina-shanman/bug_hfm_normal-map
...
(BUGZ-167) Always calculate tangents
2019-05-21 12:06:06 -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
