Skip to content

Commit

Permalink
Merge branch 'release/0.7.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Arvtesh committed Jan 28, 2020
2 parents 726ee12 + 89b84d2 commit 4fbaa70
Show file tree
Hide file tree
Showing 121 changed files with 1,230 additions and 118 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Node.js Package

on:
push:
branches:
- master

jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://registry.npmjs.org/
- run: npm publish Packages/UnityFx.Outline
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

publish-gpr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://npm.pkg.github.com/
- run: npm publish Packages/UnityFx.Outline
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
[Bb]uild/
[Bb]uilds/
[Pp]roject[Ss]ettings/
[Pp]ackages/
[Uu]nity[Pp]ackage[Mm]anager/

Assets/Plugins/UnityFx.Outline/CHANGELOG.md
Assets/Plugins/UnityFx.Outline/CHANGELOG.md.meta
Assets/AssetStoreTools*

# Visual Studio cache directory
Expand Down
4 changes: 1 addition & 3 deletions Assets/Examples.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions Assets/Examples/PostProcessing/PostProcessingProfile.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
m_Name: PostProcessingProfile
m_EditorClassIdentifier:
settings:
- {fileID: 114600372921182068}
--- !u!114 &114600372921182068
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 362f6fe821115814693a671c047d5f31, type: 3}
m_Name: Outline
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
_defaultResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
Resources:
overrideState: 0
value: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
Layers:
overrideState: 0
value: {fileID: 0}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4fbaa70

Please sign in to comment.