Commit graph

77970 commits

Author SHA1 Message Date
Parker Richard
4df3a29b00 - updated console+server icons, installer+uninstaller graphics, and console notification icon 2019-04-26 14:50:18 -07:00
Shannon Romano
766854081a
Merge pull request #15457 from davidkelly/dk/22291
Tiny logical error in wallet creation
2019-04-25 14:10:00 -07:00
Sam Gondelman
26a0eb3993
Merge pull request #15456 from SamGondelman/openurl
Case 22334: openUrl fix
2019-04-25 14:06:46 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix
Fix crash sending other avatars hands to flow
2019-04-25 12:32:06 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188
Update Record app per Marketplace certification requirements
2019-04-25 20:00:13 +02:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
David Kelly
c63ee8d4f6 Tiny logical error in wallet creation 2019-04-25 09:21:06 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings
Case 22065: Fix mac warnings
2019-04-24 20:32:29 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
2019-04-24 16:35:02 -07:00
Shannon Romano
0051693da8
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings
Case 22298: Persist Mute Settings Between Sessions
2019-04-24 16:34:34 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -07:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master
Case 22333: Master: Fix asset server auto-baking
2019-04-24 16:30:14 -07:00
Shannon Romano
10cfa9557d
Merge pull request #15448 from wayne-chen/fixMarketplaceLoginBug-83
Case 22346: Market -- Please Login -- does not work
2019-04-24 16:13:43 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid
Case 22229: Create Grid ignorePickIntersection
2019-04-24 12:24:27 -07:00
Shannon Romano
1b67042091
Merge pull request #15428 from raveenajain/gltf_debug
case 22347: glTF move debug code
2019-04-24 10:31:49 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Shannon Romano
4148ebfd18
Merge pull request #15447 from SamGondelman/materialData
Case 22329: Don't try to bake materialURL if it points to materialData
2019-04-24 09:26:52 -07:00
Shannon Romano
839aa0ebe8
Merge pull request #15446 from amerhifi/questCrashFix
Case 22340 : turning on blit present for quest
2019-04-24 09:24:24 -07:00
Shannon Romano
26e65b7ca6
Merge pull request #15444 from SamGondelman/warning
Case 22262: Comment out QScript type warning
2019-04-24 09:22:58 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
2019-04-24 09:22:11 -07:00
Shannon Romano
6da5608ae4
Merge pull request #15430 from huffman/fix/domain-baker-not-finishing
Case 22309: Fix domain baker not finishing (merge to master)
2019-04-24 09:19:25 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap
Case 22079: Bake existing materialMap in FST
2019-04-24 09:16:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
2019-04-24 09:13:59 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00
Clement
2c3dd153dd Fix typo 2019-04-23 14:54:12 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
Clement
77c5ea5fa8 Fix Asset Server reporting bad status for textures 2019-04-23 14:54:12 -07:00
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -07:00
SamGondelman
1c888d63f0 don't try to bake materialURL if it points to materialData 2019-04-23 13:44:36 -07:00
Gayathri
50583d337b
Merge pull request #15441 from dback2/materialTargetBadMerge
Case 22195: Fix material target parentIDChanged
2019-04-23 12:24:50 -07:00
Simon Walton
db411cc456
Merge pull request #15431 from SimonWalton-HiFi/readkeys-double-free
Don't double-free an openssl structure in readKeys()
2019-04-23 12:06:19 -07:00
amer cerkic
8a7503ef51 turning on blit present for quest 2019-04-23 11:45:25 -07:00
SamGondelman
48aef3e6d9 build error 2019-04-23 10:46:53 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
2019-04-23 09:32:53 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
Clement
080ef882a8 Update Asset Server redirect and baking conditions 2019-04-22 18:10:34 -07:00
Clement
7f4292440a Fix oven integration in the asset server 2019-04-22 18:10:34 -07:00
SamGondelman
018d249666 Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 16:52:12 -07:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
Shannon Romano
5781ed8afb
Merge pull request #15436 from SamGondelman/version
Case 22288: Fix "Version" not being preserved during baking
2019-04-22 15:50:38 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00