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
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
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
Simon Walton
5e251b1033
Don't double-free an openssl struct
2019-04-19 17:03:43 -07:00
Sam Gateau
4875e52eba
Merge branch 'blackProp' of github.com:samcake/hifi into blackProp
2019-04-19 16:57:57 -07:00
Sam Gateau
ba02aa7098
making luci2 better
2019-04-19 16:56:55 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread
...
(case 22011) Fix model processing occurring on main thread
2019-04-19 15:40:54 -07:00
Ryan Huffman
15e4df2b61
Fix domain baker not finishing (threading, material key)
...
This addresses 2 cases where the domain baker would not finish
1. For material baking, we were storing a value in
_entitiesNeedingRewrite with a different key than what
we use when we later remove it from _entitiesNeedingRewrite
2. The domain baker runs on a worker thread. When starting a
baker for an item in the domain, we do an invokeMethod,
which will happen synchronously if the baker ends up on the
same thread as the thread that the domain baker is on.
This can cause issues if the baker finishes immediately.
The case I saw was a local model url that immediately failed,
and finished before return from the invokeMethod in the domain baker .
2019-04-19 15:32:51 -07:00
raveenajain
f2312f77c1
remove unused var
2019-04-19 22:47:47 +01:00
raveenajain
65f4fac993
move debug code
2019-04-19 21:40:57 +01:00
Shannon Romano
71ca653498
Merge pull request #15360 from thoys/feat/create/editMultipleProperties
...
Case 21228: [Create App] allow editing properties of multiple entities simultaneously
2019-04-19 13:32:59 -07:00
SamGondelman
080cb36170
bake existing materialMap
2019-04-19 13:01:47 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83
...
Case 22283: Fix transparent textures on baked assets
2019-04-19 12:35:20 -07:00
sabrina-shanman
05a2b11c54
Fix mat4FromVariant
2019-04-19 11:29:28 -07:00
sabrina-shanman
74b4b47a2a
Save some bandwidth by not including unity texture transforms in material jsons
2019-04-19 11:29:28 -07:00
