Commit graph

78089 commits

Author SHA1 Message Date
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
Angus Antley
5aee2f35f0 updated the ease in function 2019-04-24 08:27:36 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -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
NissimHadar
6f4ee601fb CR corrections. 2019-04-23 13:27:21 -07:00
NissimHadar
ec69fd38eb Added set minimum GPU texture memory cycles to API. 2019-04-23 12:26:13 -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
amantley
70d8200bdc added on done for movement7 to json 2019-04-23 10:40:37 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -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
Angus Antley
1291ee5ebc added new animations to the resource 2019-04-23 07:43:31 -07:00
David Rowe
7dde764907 Merge branch 'master' into M21956
# Conflicts:
#	libraries/audio/src/Sound.h
2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12: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
Anthony Thibault
d7babe6fbf Added data rates for new hand controller section 2019-04-22 16:16:55 -07:00
NissimHadar
f786f5a4a6 Corrected jsdoc comment. 2019-04-22 16:00:44 -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
Anthony Thibault
e28775b091 Update avatar dissector to account for has flag bit reorder 2019-04-22 15:37:53 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Angus Antley
bac5cf9bbb fixed the debug state info updating 2019-04-22 14:35:04 -07:00
Angus Antley
6d9e4188eb added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk 2019-04-22 14:14:17 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
SamGondelman
7245d1a037 handle texturebakers with same url but different usage 2019-04-22 13:24:34 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
luiscuenca
4a236c3a4b
Fix warnings 2019-04-22 12:40:56 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00