Sam Gateau
|
5288314d02
|
Drafting ways to rescale in forward
|
2019-06-13 17:42:32 -07:00 |
|
Zach Fox
|
6485809c82
|
Merge pull request #15763 from zfox23/SUI/disableInterstitialReferences
BUGZ-676: Remove references to interstitial from SUI version of progress.js
|
2019-06-13 13:52:05 -07:00 |
|
Zach Fox
|
1a0002db0c
|
BUGZ-676: Remove references to interstitial from SUI version of progress.js
|
2019-06-13 13:06:40 -07:00 |
|
Brad Hefta-Gaub
|
c347d46454
|
Merge pull request #15758 from danteruiz/launcher-bookmarks
DEV-123 & BUGZ-602: Adding bookmark arg and making launcher appear on top
|
2019-06-13 12:13:39 -07:00 |
|
Shannon Romano
|
a37ce9f89d
|
Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512
BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit
|
2019-06-13 12:13:04 -07:00 |
|
Shannon Romano
|
17ef393ef0
|
Merge pull request #15757 from luiscuenca/winLauncherAddBookmark
DEV-124 : Windows Launcher add Home Bookmark parameter
|
2019-06-13 11:45:27 -07:00 |
|
Zach Fox
|
fcda85a3d1
|
Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2
BUGZ-658: Don't let the user switch avatar models to Woody
|
2019-06-13 10:55:55 -07:00 |
|
Andrew Meadows
|
b08bb93ff7
|
add comment about why WebEntityRenderer::onRemoveFromSceneTyped()
|
2019-06-13 10:53:55 -07:00 |
|
Zach Fox
|
431ec0bfd0
|
Merge pull request #15760 from zfox23/SUI/betterHomeBookmark
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
|
2019-06-13 10:49:58 -07:00 |
|
Zach Fox
|
289e948d6b
|
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
|
2019-06-13 10:27:18 -07:00 |
|
Andrew Meadows
|
f9467ccbde
|
Merge pull request #15756 from luiscuenca/fixPickOnOtherAvatars
BUGZ-543:Fix avatar picking not working on some avatars
|
2019-06-13 10:23:16 -07:00 |
|
Zach Fox
|
4ccd7bd808
|
BUGZ-658: Don't let the user switch avatar models to Woody
|
2019-06-13 10:17:14 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|