Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UPM package generation issues for UWP #406

Merged
merged 48 commits into from
May 15, 2019
Merged

Fix UPM package generation issues for UWP #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1ae1353
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
3189a4c
Fix missing Integrations .meta file position
ei2kpi-ptc Apr 16, 2019
2531da1
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
03fdae4
Build script updates to properly support UWP with UPM compliant package
ei2kpi-ptc Apr 16, 2019
9081e88
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
658bb48
Fix missing Integrations .meta file position
ei2kpi-ptc Apr 16, 2019
b425c07
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
4d77390
Build script updates to properly support UWP with UPM compliant package
ei2kpi-ptc Apr 16, 2019
454392f
Merge branch 'master' of https://github.com/ei2kpi-ptc/UnityGLTF
ei2kpi-ptc Apr 16, 2019
c5de2bb
Fixing Travis build environment issues
ei2kpi-ptc Apr 16, 2019
1e77076
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
618e7fc
Fix missing Integrations .meta file position
ei2kpi-ptc Apr 16, 2019
bde9f8e
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
6510efe
Build script updates to properly support UWP with UPM compliant package
ei2kpi-ptc Apr 16, 2019
d537816
Fixing Travis build environment issues
ei2kpi-ptc Apr 16, 2019
3b11d75
Pull down upstream changes
ei2kpi-ptc Apr 16, 2019
fec3917
Merge branch 'master' of https://github.com/ei2kpi-ptc/UnityGLTF
ei2kpi-ptc Apr 16, 2019
0256aef
Fixing merge conflict
ei2kpi-ptc Apr 16, 2019
1268354
Add Roughness float values to MetalRoughMap.cs
Apr 16, 2019
ec7ee91
Add names to textures created by GLTFSceneImporter
Apr 16, 2019
0d0d69a
Fix texture memory leak
Apr 16, 2019
72ab445
Add task cancellation support
Apr 17, 2019
7276371
Add image name to texture name
Apr 22, 2019
bf563f2
Update UnityGLTF/Assets/UnityGLTF/Scripts/Cache/RefCountedCacheData.cs
AdamMitchell-ms Apr 22, 2019
a1cdacb
Change cancellation in ConstructMesh
Apr 22, 2019
b62aeed
Merge pull request #409 from rferrese/MemLeak
sbtron Apr 22, 2019
c5b4a79
Merge pull request #408 from rferrese/TextureNames
sbtron Apr 22, 2019
15eaedd
Merge pull request #407 from rferrese/RoughnessFactor
sbtron Apr 22, 2019
046c7e2
Merge pull request #412 from rferrese/TaskCancellation
sbtron Apr 22, 2019
4d9782b
Camera in test scenes now moves only when dragged (mousedown) and the…
AdamMitchell-ms Apr 24, 2019
f97889a
Fix loading time issue (#414)
AdamMitchell-ms Apr 26, 2019
ca479b5
Add missing meta file for integration test directory (#419)
admachina Apr 29, 2019
e04883a
Add a component to display the list of models from gltf-Sample-Models…
AdamMitchell-ms Apr 30, 2019
740bbb8
OrbitCamera now supports right mouse buttons to change position (#422)
AdamMitchell-ms May 3, 2019
eaebdb0
Set the correct filter mode when loading texture samplers (#421)
AdamMitchell-ms May 3, 2019
03d7894
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
6752e09
Fix missing Integrations .meta file position
ei2kpi-ptc Apr 16, 2019
d11a940
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
ff148a9
Build script updates to properly support UWP with UPM compliant package
ei2kpi-ptc Apr 16, 2019
8e34f65
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
ae9e685
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
e4c461b
Fixing Travis build environment issues
ei2kpi-ptc Apr 16, 2019
3bee462
Include .asmdef files for correct UPM package generation
ei2kpi-ptc Apr 6, 2019
0417355
Splitting out UnityGLTFEditor scripts with its own asmdef file
ei2kpi-ptc Apr 16, 2019
24f6c49
Pull down upstream changes
ei2kpi-ptc Apr 16, 2019
0afe060
Fixing merge conflict
ei2kpi-ptc Apr 16, 2019
ee841ab
Merge branch 'master' of https://github.com/ei2kpi-ptc/UnityGLTF
ei2kpi-ptc May 7, 2019
661944e
Enable Azure Pipelines UPM releases (#2)
ei2kpi-ptc May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ install:
- sudo python2 ./scripts/install-unity.py --package Unity 2017.1.1f1
before_script:
- sudo chmod -R a+rwx /Applications/Unity
- sudo chmod +x ./scripts/export-upm-package.sh
script:
- msbuild ./GLTFSerialization/GLTFSerialization.sln /t:GLTFSerialization /p:TargetFramework=net35
- "./scripts/export-upm-package.sh"
- "./scripts/export-unity-package.sh"
deploy:
provider: releases
file:
- "./current-package/UnityGLTF.unitypackage"
- "./current-package/org.khronos.UnityGLTF.zip"
skip_cleanup: true
on:
repo: KhronosGroup/UnityGLTF
branch: releases
tags: true
api-key:
secure: "KBs5cOzqEoTDzsBv6AurzlFMtgfctKbJWsGorUW9BE/+B8pnriGQxc1Lt83kzkvHkcF+MgqD5M1KK6SebB/lgpE2Xo/Zu/al1Sr0M6MNijRgHCx0aqea+/mjXfHS7qhbOqgEqQHYoR4kOqIKFhJZOohtLBylnDgFojG42Z2UFnbSelZaAT8qISxndX5qjIqV9+CgkRlpwyY4tnQ2fzVwuyFMvEqSBUzAegzPa+nQu1HgJzx64OP0ONmoTPJnUr0C741GtsD1fA6SMjSpwhjiYezQXapN2a/YoZufEkrd5wYq8Q1UVNMDmkmtg1zA0LkmK1u6dEhE7VCjxL7CW13FWGWEMKR9h2afTl+QkRIZxNRxjVHcWG122oTSCOXaAwBtNHMnWEgBy+DYFWAYD/bMmZ+g70EZ2/bFEfPprhyOvK59No5V65FOyoIMSBZvgU1z2Kl3PPTUl/0vEljX3RiON6BvIbOxU7OdR+OI35naSfos76YWK58+b99fRC0rJq6egwhNTACPItrtdmZq13k/5PWfGSJ0IAegdoXCB1eFP6SqcoXDsxLJph8/nHrEHqyjtl9PYBturvzVfQThTzL4FQuB7Fypwql/PXB7mdG7HkOvcM5jJWiupIsQxw5VkArZhnBk188ds+UC42tUhF701ZrPJz6GF0Kqem7/Fr/6l7A="

Loading