dante ruiz
|
fc1f7615f4
|
fix errors
|
2019-06-11 16:30:21 -07:00 |
|
Preston Bezos
|
b32a715496
|
fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1
|
2019-06-11 16:29:32 -07:00 |
|
Roxanne Skelly
|
8704a36d07
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516
|
2019-06-11 16:26:55 -07:00 |
|
dante ruiz
|
77a49cb04b
|
Merge branch 'master' of github.com:highfidelity/hifi into loginscreen-error-page
|
2019-06-11 16:05:43 -07:00 |
|
Roxanne Skelly
|
67cb5821bc
|
Update packet headers / add connect 'reason'
|
2019-06-11 16:00:49 -07:00 |
|
Bradley Austin Davis
|
cafb2d9e8b
|
Merge pull request #15744 from jherico/launcher_signing_final
Fix launcher signing for windows
|
2019-06-11 15:55:27 -07:00 |
|
Brad Davis
|
595fe0cdfe
|
Fix launcher signing for windows
|
2019-06-11 15:52:25 -07:00 |
|
David Rowe
|
92eb418690
|
Doc review
|
2019-06-12 10:50:37 +12:00 |
|
Seth Alves
|
2fe8979206
|
fix warning
|
2019-06-11 15:46:12 -07:00 |
|
Roxanne Skelly
|
3c9edb90d8
|
Log formatting fix
|
2019-06-11 15:35:50 -07:00 |
|
Shannon Romano
|
453085f992
|
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks
BUGZ-484: Add --setBookmark and getAddress API
|
2019-06-11 15:31:41 -07:00 |
|
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 |
|