Commit graph

79168 commits

Author SHA1 Message Date
Milad Nazeri
72b9e7ba09 Updated readme with new cmake 2019-06-18 07:40:31 -07:00
Shannon Romano
7c3147fa2c
Merge pull request #15778 from zfox23/SUI/scrollbars
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
2019-06-17 14:38:10 -07:00
Anthony Thibault
57fef21e30
Merge pull request #15775 from AndrewMeadows/fix-crash-bugz702
BUGZ-702: fix crash in btCollisionWorld on shutdown
2019-06-17 13:54:22 -07:00
Zach Fox
1d2ed1985f DEV-142 & DEV-140: Scrollbars in Your Profile and Settings 2019-06-17 12:35:45 -07:00
Shannon Romano
625ec7ca84
Merge pull request #15777 from danteruiz/fix-launcher-typo
BUGZ-707: HQ Launcher says "lastest and greatest"
2019-06-17 12:23:37 -07:00
dante ruiz
11fb7e5b63 fixing typo 2019-06-17 12:16:54 -07:00
Andrew Meadows
ce96ea5bf8 more correct rebuild OtherAvatar detailed pickable shapes 2019-06-17 11:20:42 -07:00
Howard Stearns
723b4ac30f
Merge pull request #15771 from roxanneskelly/bugz516
BUGZ-696 Drop non DS UDP packets when silent domain checkins exceeds 3 seconds
2019-06-14 14:13:33 -07:00
Andy Howell
b1a1d25f6a
Merge pull request #15772 from samcake/nut
BUGZ-694: Excluding all Intel gpu on mac from being deferred capable
2019-06-14 13:57:26 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Sam Gateau
aff139f495 excluding any intel gpu from deferred on mac for the next few days 2019-06-14 12:49:11 -07:00
Sam Gateau
b84a8ce668 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-14 12:45:59 -07:00
Roxanne Skelly
2be828a84c Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-14 11:24:03 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages
remove rebind on silent domain checkin
2019-06-14 10:45:18 -07:00
Howard Stearns
3596b70b4d
Merge pull request #15765 from howard-stearns/stop-rebinding
stop rebinding
2019-06-13 20:23:45 -07:00
howard-stearns
b69d850c8e move constant to the comment that will use it 2019-06-13 19:41:12 -07:00
howard-stearns
c2fe688740 Merge branch 'master' of https://github.com/highfidelity/hifi into stop-rebinding 2019-06-13 19:25:14 -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
Roxanne Skelly
3d2b1dbf2b When missing domain checkins, drop packets not destined for DS 2019-06-13 17:25:35 -07:00
Roxanne Skelly
91dce827a5 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-13 17:05:04 -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
Howard Stearns
11d3f0a629 Merge branch 'master' of github.com:highfidelity/hifi into stop-rebinding 2019-06-13 16:38:40 -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
Howard Stearns
8f9fa4a878 stop rebinding 2019-06-13 14:59:27 -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
Sam Gateau
def0007496 REfining the filter based on the COmputer model name and catching the 2 known problematic models 2019-06-13 11:39:13 -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