Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 01:52:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79094 commits 17 branches 0 tags 1.1 GiB
Commit graph

79094 commits

This branch
This branch
All branches
Author SHA1 Message Date
dante ruiz
667af8575f add bookmark arg and fixing focus 2019-06-13 10:03:46 -07:00
Howard Stearns
0c1df749b9
Merge pull request #15746 from roxanneskelly/bugz516 
BUGZ-628 - Add quasi-MTBF logging to track disconnects
 2019-06-12 15:48:45 -07:00
Zach Fox
f360adccbc
Merge pull request #15751 from zfox23/SUI/finalM1 
DEV-128: Update settings screen with latest design
 2019-06-12 14:39:24 -07:00
Zach Fox
6fed581452 DEV-128: Update settings screen with latest design 2019-06-12 14:22:02 -07:00
Shannon Romano
9f57363382
Merge pull request #15750 from luiscuenca/windowsLauncherUpdates 
Windows Launcher fixes and updates
 2019-06-12 13:27:44 -07:00
Shannon Romano
6faa9a81e8
Merge pull request #15749 from danteruiz/luancher-more-updates 
BUGZ-656 & DEV-126: updating org url and trim whitespace for org and username
 2019-06-12 12:48:16 -07:00
Shannon Romano
b62a6d852d
Merge pull request #15724 from danteruiz/loginscreen-error-page 
dev-79: Lilypad Launcher: (Mac) Implement the error state page.
 2019-06-12 12:47:38 -07:00
luiscuenca
c5b1024bac New org http, interface on front and copy all 2019-06-12 12:12:29 -07:00
Roxanne Skelly
ca0c9e236b Cleanup 2019-06-12 11:58:26 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00
dante ruiz
b396256d75 updating org url and trim whitespace for org and username 2019-06-12 11:02:49 -07:00
Zach Fox
5077ae1bd7
Merge pull request #15745 from PrestonB1123/hudRemnant 
BUGZ-355: Persistent UI Element
 2019-06-12 10:40:37 -07:00
Preston Bezos
6c0bbfae76 hopefully good now 2019-06-12 10:02:33 -07:00
Preston Bezos
266c08227f turned an else into an else if 2019-06-12 09:29:43 -07:00
Preston Bezos
53e8051cc2 Merge branch 'hudRemnant' of github.com:PrestonB1123/hifi into hudRemnant 2019-06-12 09:19:30 -07:00
Preston Bezos
a79a75702a reverted a couple of testing changes and added a variable 2019-06-12 09:17:18 -07:00
PrestonB1123
6622aba4ac
Delete diff.patch 2019-06-12 09:13:20 -07:00
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats 
BUGZ-623: Quiet asan gpu stats
 2019-06-12 09:02:13 -07:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63 
DOC-63: Tablet JSDoc
 2019-06-11 16:51:08 -07:00
Brad Hefta-Gaub
d9e3dd2857
Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock 
Add mutex for Socket::_connectionsHash
 2019-06-11 16:41:11 -07:00
Brad Hefta-Gaub
0ff470107c
Merge pull request #15743 from danteruiz/more-launcher-bugs 
BUGZ-592: Lilypad Launcher (Mac): Upon Login Standard/Common Shortcuts Not Enabled
 2019-06-11 16:40:25 -07:00
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