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

79168 commits

This branch
This branch
All branches
Author SHA1 Message Date
luiscuenca
2a1d5f6a07 add bookmark parameter 2019-06-13 10:05:34 -07:00
dante ruiz
667af8575f add bookmark arg and fixing focus 2019-06-13 10:03:46 -07:00
luiscuenca
20b17291b4 Reset detailed motion states when the workload zone changes 2019-06-13 09:05:55 -07:00
Sam Gateau
43a119cbbc just adding the correct include tobring th edefines 2019-06-12 23:15:53 -07:00
Sam Gateau
b132a42e89 fixing the scroll view 2019-06-12 22:42:05 -07:00
Sam Gateau
fbab3fcde9 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-12 19:15:25 -07:00
Sam Gateau
5004070af9 Grab the name of the renderer no matter what 2019-06-12 17:14:44 -07:00
Anna
22803c7043 testing 2019-06-12 17:14:40 -07:00
Brad Hefta-Gaub
50cfe4531e
Merge pull request #15752 from PrestonB1123/moreToolbarTinkering 
BUGZ-666: Toolbar Artifact Always Present
 2019-06-12 17:14:18 -07:00
Sam Gateau
b2feb0f920 Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air 2019-06-12 16:48:36 -07:00
Preston Bezos
e32d6e96ce code was backwards 2019-06-12 16:12:24 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
Preston Bezos
2eeec3518d one last fix 2019-06-12 16:03:03 -07:00
Preston Bezos
3cd3f1a508 one last fix 2019-06-12 15:56:27 -07:00
Roxanne Skelly
5bff5ce4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-12 15:56:04 -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
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Roxanne Skelly
790d4edb04 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-12 15:25:08 -07:00
Roxanne Skelly
7017cf8437 reinitialize winsock on silent domain checkin 2019-06-12 15:24:43 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
8fa80f8935 fixed some formatting problems 2019-06-12 14:57:37 -07:00
Preston Bezos
038747e645 Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering 2019-06-12 14:55:37 -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
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -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
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -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
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -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