Commit graph

78015 commits

Author SHA1 Message Date
NissimHadar
e755e717b1 Restored code. 2019-04-23 15:59:03 -07:00
NissimHadar
f4b1aedbae Minor cleanup. 2019-04-23 15:06:40 -07:00
NissimHadar
68f9b473a6 Updated python interface. 2019-04-23 15:06:17 -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
9b8f079899 Testing. 2019-04-23 13:37:47 -07:00
NissimHadar
d3e3fa5249 Added debug message. 2019-04-23 13:20:13 -07:00
NissimHadar
ffa0902dfc testing. 2019-04-23 13:04:16 -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
NissimHadar
2edf1676ea Corrected filenames for Mac and Ubuntu. 2019-04-23 10:45:33 -07:00
NissimHadar
c9d128ae71 testing 2019-04-23 10:39:52 -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
NissimHadar
0179ba8e67 testing - removed oven. 2019-04-23 09:12:47 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
NissimHadar
2963dd8fa5 testing 2019-04-23 08:18:41 -07:00
NissimHadar
e7b780fcb9 testing 2019-04-23 08:11:09 -07:00
NissimHadar
182799b4ec testing 2019-04-23 08:07:25 -07:00
NissimHadar
55e1841358 testing 2019-04-23 07:58:33 -07:00
NissimHadar
5144c3b0a8 testing 2019-04-23 07:22:29 -07:00
NissimHadar
bffc0e8a85 Re-ordered commands. 2019-04-22 23:28:43 -07:00
NissimHadar
01a838b5cb Updated for Jenkins. 2019-04-22 21:36:35 -07:00
NissimHadar
dd85e224a4 Activate Qt patch. 2019-04-22 20:58:15 -07:00
NissimHadar
d7197dba65 Use QT_CMAKE_PREFIX_PATH only on local builds. 2019-04-22 20:56:32 -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
NissimHadar
24110ebf86 Ready for Mac/Linux testing. 2019-04-22 17:58:20 -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
NissimHadar
4b26ef7c0f Updated with upload to AWS instructions. 2019-04-22 16:19:40 -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
NissimHadar
bfcdec62a2 Before testing. 2019-04-22 15:00:22 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
NissimHadar
0da6e088cb Updated readme. 2019-04-22 13:15:10 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
SamGondelman
98a7e4e711 fix version not being preserved 2019-04-22 11:34:58 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master
(case 22282) Fix some baked models not preserving texture scale (master)
2019-04-22 09:52:36 -07:00
Sam Gateau
97632534e5 REvert unecessary modified files to upstream master, just leaving the true new feature in this branch 2019-04-22 09:14:32 -07:00
Sam Gateau
6539482cc2 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-22 08:46:34 -07:00
NissimHadar
71bf3f2e14 Installation folder can be made. 2019-04-21 20:18:59 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00