Sam Gateau
|
12f8c7486b
|
getting rescaling to work for forward yop
|
2019-06-14 00:48:07 -07:00 |
|
Sam Gateau
|
c0d64ce4e2
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-06-13 18:43:34 -07:00 |
|
Shannon Romano
|
491af66a0e
|
Merge pull request #15767 from sethalves/fix-drawcalls-stat
BUGZ-686: fix drawcalls stat broken in pr-15721
|
2019-06-13 17:57:01 -07:00 |
|
Shannon Romano
|
e6ea4839e0
|
Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3
BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody
|
2019-06-13 17:55:59 -07:00 |
|
Sam Gateau
|
4ba34f9a85
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-06-13 17:42:52 -07:00 |
|
Sam Gateau
|
5288314d02
|
Drafting ways to rescale in forward
|
2019-06-13 17:42:32 -07:00 |
|
Shannon Romano
|
d6859a42d9
|
Merge pull request #15762 from annabrewer/quest-login-keybrd
BUGZ-531: Quest tablet login missing keyboard
|
2019-06-13 16:44:49 -07:00 |
|
Zach Fox
|
503fc18d70
|
Make this slightly more robust
|
2019-06-13 16:08:29 -07:00 |
|
Zach Fox
|
6739e6e9d1
|
Merge pull request #15769 from RebeccaStankus/mutedOverlaybug
Increased bottom margin on muted overlay
|
2019-06-13 16:07:53 -07:00 |
|
RebeccaStankus
|
772bad58ca
|
Increased bottom margin on muted overlay
|
2019-06-13 15:55:49 -07:00 |
|
Shannon Romano
|
12e79fa8a8
|
Merge pull request #15768 from huffman/feat/mac-launcher-icon
DEV-133: Update mac launcher icon
|
2019-06-13 15:40:44 -07:00 |
|
Andy Howell
|
1697e08ed5
|
Merge pull request #15766 from luiscuenca/winLauncherNewIcon
DEV-132 : Update window launcher icon
|
2019-06-13 15:38:07 -07:00 |
|
Ryan Huffman
|
f87b166271
|
Update mac launcher icon
|
2019-06-13 15:37:44 -07:00 |
|
Seth Alves
|
431ff0d1de
|
fix drawcalls stat broken in pr-15721
|
2019-06-13 15:35:08 -07:00 |
|
luiscuenca
|
21796d4d2a
|
Update window launcher icon
|
2019-06-13 15:14:28 -07:00 |
|
Shannon Romano
|
bc70abfa10
|
Merge pull request #15764 from AndrewMeadows/rollback-bugz512
BUGZ-512: rollback fixes for bugz512
|
2019-06-13 14:43:56 -07:00 |
|
Shannon Romano
|
b4f708f4ad
|
Merge pull request #15755 from samcake/nut
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
|
2019-06-13 14:32:36 -07:00 |
|
Andrew Meadows
|
db3c7b9194
|
rollback fixes for bugz512
|
2019-06-13 13:57:18 -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 |
|
Anna
|
7099b04911
|
appeasing jenkins
|
2019-06-13 12:21:41 -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 |
|
Sam Gateau
|
97236570d8
|
FIlter on the gpu model name for ththe 2 known cases
|
2019-06-13 10:28:34 -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 |
|
Sam Gateau
|
d6f90c497f
|
FIlter on the gpu model name for ththe 2 known cases
|
2019-06-13 10:16:57 -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 |
|
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 |
|
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 |
|
Anna
|
4b30065ad1
|
fixed keyboard on quest login and cleaned up qml files
|
2019-06-12 15:17:37 -07:00 |
|