Commit graph

79266 commits

Author SHA1 Message Date
dante ruiz
3af4eaa6c6 re enable log 2019-06-11 15:25:27 -07:00
dante ruiz
9cb0f4a14f Merge branch 'master' of github.com:highfidelity/hifi into more-launcher-bugs 2019-06-11 15:19:15 -07:00
dante ruiz
53c875b8af fixing launcher bugs 2019-06-11 15:19:05 -07:00
Simon Walton
1c03aeac20 Add lock for Connections map 2019-06-11 15:14:01 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33
DOC-33: MyAvatar API JSDoc catch-up
2019-06-11 15:05:06 -07:00
Brad Davis
ee8235358a Fixing the launcher signing 2019-06-11 14:51:43 -07:00
Roxanne Skelly
64e5405391 Merge branch 'bugz516' of https://github.com/roxanneskelly/hifi into bugz516 2019-06-11 14:43:48 -07:00
Roxanne Skelly
071a779930 convert enum reason for disconnect to boolean 2019-06-11 14:38:39 -07:00
Roxanne Skelly
ec91f4dae4 More checkpoint MTBF logging 2019-06-11 14:37:46 -07:00
Brad Davis
56bde0432e Tricking the builds system 2019-06-11 14:25:18 -07:00
Ryan Huffman
a1b7392854 Add --setBookmark and getAddress API 2019-06-11 14:10:09 -07:00
Bradley Austin Davis
8db84b5993
Merge pull request #15739 from jherico/light-launcher-win-signing
DEV-118: Another go at signing
2019-06-11 13:40:33 -07:00
Brad Davis
782e0e63dc Another go at signing 2019-06-11 13:37:56 -07:00
Zach Fox
a88023469b
Merge pull request #15737 from zfox23/SUI/developerMenu
DEV-122: Add a developer menu in Settings
2019-06-11 13:32:14 -07:00
Shannon Romano
1bd8b18110
Merge pull request #15720 from howard-stearns/verbose-logging-2
Verbose logging 2
2019-06-11 13:31:45 -07:00
Bradley Austin Davis
541ee5a4d6
Merge pull request #15738 from jherico/light-launcher-win-signing
DEV-118: More logging on signing / non-signing conditional
2019-06-11 13:17:07 -07:00
Brad Davis
a86e41f898 More logging on signing / non-signing conditional 2019-06-11 13:00:36 -07:00
Zach Fox
7bdd3084e9 DEV-122: Add a developer menu in Settings 2019-06-11 12:56:14 -07:00
Seth Alves
cd1c782aa8 fix warning 2019-06-11 12:54:40 -07:00
Shannon Romano
64a469c729
Merge pull request #15735 from jherico/light-launcher-win-signing
DEV-118: Add signing for the windows launcher
2019-06-11 12:45:07 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Howard Stearns
3111d2fa2e Merge branch 'master' of github.com:highfidelity/hifi into verbose-logging-2 2019-06-11 12:22:46 -07:00
Shannon Romano
acdc5e718d
Merge pull request #15733 from luiscuenca/addLocalScripts
Load simplifiedUI using the windows launcher
2019-06-11 12:11:31 -07:00
Seth Alves
c5e1f2aedc change ContextStats::evalDelta to better handle wrapping values in graphics stats 2019-06-11 11:56:49 -07:00
Zach Fox
97c4726e1e
Merge pull request #15736 from zfox23/SUI/autoSelectAvatar
BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory
2019-06-11 11:50:55 -07:00
Brad Davis
40a20aac0d Add signing for the windows launcher 2019-06-11 11:25:19 -07:00
Zach Fox
9932b1da57
Merge pull request #15734 from zfox23/SUI/recommendedGraphics
Implement BUGZ-633: Change 'Graphics Preset'
2019-06-11 11:24:52 -07:00
Zach Fox
db2ce822b7 BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory 2019-06-11 10:52:45 -07:00
Shannon Romano
7df036c197
Merge pull request #15732 from danteruiz/fix-script-argument
BUGZ-638: simplified UI must work correctly on clean install from launcher
2019-06-11 10:47:58 -07:00
Howard Stearns
bd446192e8 get windows error before calling io 2019-06-11 10:31:22 -07:00
Zach Fox
2d4ba92eeb Implement BUGZ-633: Change 'Graphics Preset' 2019-06-11 09:58:01 -07:00
luiscuenca
c02df55186 Load simplifiedUI using the windows launcher and tabs to spaces 2019-06-11 09:24:27 -07:00
dante ruiz
01fab12942 fixing interface and laucnher script argument 2019-06-11 09:18:20 -07:00
Shannon Romano
973e93aa2f
Merge pull request #15729 from hyperlogic/bug-fix/avatar-data-max-size-computation
AvatarData: Fix avatarDataByteArray max size computation
2019-06-11 08:43:52 -07:00
Zach Fox
b62ab2ea82
Merge pull request #15731 from zfox23/SUI/forwardKeyEvents
Implement BUGZ-226: Forward keypresses made while Top Bar is in focus
2019-06-11 07:52:11 -07:00
Brad Hefta-Gaub
34283097d2
Merge pull request #15730 from SamGondelman/assert
BUGZ-631: Don't normalize zero vector in flipNormalsMyAvatarVsBackfacingTriangles
2019-06-11 07:48:29 -07:00
Zach Fox
9a926abd76 Implement BUGZ-226: Forward keypresses made while Top Bar is in focus 2019-06-10 20:27:03 -07:00
howard-stearns
d7f6685022 Merge branch 'master' of https://github.com/highfidelity/hifi into verbose-logging-2 2019-06-10 19:42:07 -07:00
Bradley Austin Davis
844397d86c
Merge pull request #15689 from jherico/light-launcher-win
DEV-77: Light launcher Windows build
2019-06-10 18:43:44 -07:00
Anthony J. Thibault
897e276188 Compile fix 2019-06-10 18:34:11 -07:00
Anthony J. Thibault
6c4e7cd805 AvatarData: arranged order of size computation reflect order in the packet. 2019-06-10 18:00:54 -07:00
Anthony J. Thibault
889a5d2bda AvatarData: Add FAR_GRAB_JOINTS_SIZE to byteArraySize computation. 2019-06-10 17:58:46 -07:00
Andrew Meadows
250a4490d2
Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations
Adjust run and jog anims to better align head with 1p camera
2019-06-10 17:37:33 -07:00
Simon Walton
d780964cb4 Reset NodeList upon local nework change; abort current socket when rebinding
Also ensure QUdpSocket is owned by LimitedNodeList.
2019-06-10 17:28:49 -07:00
SamGondelman
88003c37d7 fix physics assert 2019-06-10 17:12:56 -07:00
Shannon Romano
77d595e02a
Merge pull request #15726 from AndrewMeadows/fix-crash-bugz511
BUGZ-511: fix crash in MyAvatar::updateStaleAvatarEntityBlobs()
2019-06-10 16:56:00 -07:00
Shannon Romano
04d707dbe0
Merge pull request #15723 from sethalves/zero-size-grid-asan
BUGZ-627: don't divide by zero if a grid entity-item has a zero dimension
2019-06-10 16:54:03 -07:00
Shannon Romano
d43365b6d9
Merge pull request #15725 from hyperlogic/bug-fix/resource-cache-crash
Crash fix for ResourceCache::getResource()
2019-06-10 16:52:59 -07:00
Anthony J. Thibault
2fa16719cf AvatarData: Fix avatarDataByteArray max size computation
The previous size calculation did not take the presence of the hand controller section into account.
This could sometimes result in a buffer overrun of the network buffer as identified in a debug build.

https://highfidelity.atlassian.net/browse/BUGZ-526
2019-06-10 16:52:44 -07:00
Brad Davis
ecfc3613b0 Enable windows launcher build 2019-06-10 16:44:19 -07:00