milad
46475c23c1
removed log
2019-05-24 13:59:01 -07:00
milad
27c4841887
Updated Nametag to use the sessionDisplayName or the displayName as default
2019-05-24 13:57:18 -07:00
milad
83171a7cde
Merge branch 'master' of github.com:highfidelity/hifi
2019-05-24 13:55:54 -07:00
Zach Fox
2bf95fe683
Merge pull request #15630 from zfox23/SUI/settingsFixes02
...
Fix BUGZ-312; BUGZ-311
2019-05-24 13:07:43 -07:00
Zach Fox
6cf2145c16
Fix BUGZ-312; BUGZ-311
2019-05-24 12:58:38 -07:00
Zach Fox
26fd5f4302
Merge pull request #15629 from zfox23/BUGZ-344
...
Fix BUGZ-344: Avatar Menu says "You have not created any avatars" but I have
2019-05-24 12:25:16 -07:00
Zach Fox
51d22c1988
Fix BUGZ-344
2019-05-24 12:12:55 -07:00
Zach Fox
6c9c3f76ed
Merge pull request #15628 from zfox23/moveDefaultScriptsAgain
...
Move SimplifiedUI folder again, and make the associated defaultScripts.js actually work
2019-05-24 11:29:23 -07:00
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
Zach Fox
f69e4cd47d
Move default scripts again and make them actually work
2019-05-24 10:05:54 -07:00
SamGondelman
dc3b2d97e3
fix the actual problem
2019-05-24 09:36:37 -07:00
Brad Hefta-Gaub
f9773dfdd8
Merge pull request #15615 from jherico/feature/post-build-script
...
DEV-50: Add postbuild script
2019-05-24 09:17:37 -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
milad
fb9ad762a2
merge conflict fix
2019-05-23 22:33:11 -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
49f6794789
Merge pull request #15624 from hyperlogic/feature/qt-5.12.3-windows-symbols
...
Update windows build with symbols for release qt-5.12.3
2019-05-23 16:18:58 -07:00
Anthony J. Thibault
a394145239
Merge branch 'master' into feature/qt-5.12.3-windows-symbols
2019-05-23 15:45:49 -07:00
Shannon Romano
aadac2e5ce
Merge pull request #15607 from sethalves/fix-ubuntu-18.10
...
only worry about Ubuntu major versions when selecting Qt package
2019-05-23 15:22:06 -07:00
Shannon Romano
cc2e5af34d
Merge pull request #15619 from kencooke/audio-mac-callback-crashfix
...
BUGZ-158: Crash when switching audio devices on Mac
2019-05-23 15:20:08 -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
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
78fdd2d673
Fix BUGZ-336
2019-05-23 14:25:06 -07:00
Anthony J. Thibault
a7874fa556
Update windows build with symbols for release qt-5.12.3
...
hifi_vcpkg.py will now download a new version of qt that contains release symbols.
made minor changes to bullet3/portfile.cmake to trigger a new vkpkg hash.
2019-05-23 14:10: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
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
Brad Davis
cdf71f40d5
Add postbuild script for CI server
2019-05-23 10:55:39 -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
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
Ken Cooke
135dc7f2b1
assert() on over-filling the audio callback buffer
2019-05-23 08:54:47 -07:00
Ken Cooke
ba3282e12b
Fix rounding error in allOrNothing mode
2019-05-23 08:03:59 -07:00
Ken Cooke
0d0a9fbd09
Never return more than maxSamples from the audio ringbuffer
2019-05-23 07:54:08 -07:00
luiscuenca
6d824ff22d
Fix logout
2019-05-22 20:27:42 -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
luiscuenca
206e353264
Pass tokens as params for automatic login
2019-05-22 16:18:30 -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
