Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
four
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
gadig
four
Commits
b1edcb29
Commit
b1edcb29
authored
Oct 14, 2016
by
Shellby Grehawick
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'crate_16' into 'master'
Crate 16 closes
#71
See merge request
!2
parents
82d4c87d
155ed1e7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
74 additions
and
0 deletions
+74
-0
Assets/resource/Prefab.meta
Assets/resource/Prefab.meta
+9
-0
Assets/resource/Prefab/crate_16.prefab
Assets/resource/Prefab/crate_16.prefab
+0
-0
Assets/resource/Prefab/crate_16.prefab.meta
Assets/resource/Prefab/crate_16.prefab.meta
+8
-0
Assets/sprite/crate_16.png
Assets/sprite/crate_16.png
+0
-0
Assets/sprite/crate_16.png.meta
Assets/sprite/crate_16.png.meta
+57
-0
No files found.
Assets/resource/Prefab.meta
0 → 100644
View file @
b1edcb29
fileFormatVersion: 2
guid: 23488e1df8bc4dc4a9f405df41ec5fb3
folderAsset: yes
timeCreated: 1476402444
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/resource/Prefab/crate_16.prefab
0 → 100644
View file @
b1edcb29
File added
Assets/resource/Prefab/crate_16.prefab.meta
0 → 100644
View file @
b1edcb29
fileFormatVersion: 2
guid: 991cd4abf4f00e44b8d6bb62b0c51e3f
timeCreated: 1476402447
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/sprite/crate_16.png
0 → 100644
View file @
b1edcb29
346 Bytes
Assets/sprite/crate_16.png.meta
0 → 100644
View file @
b1edcb29
fileFormatVersion: 2
guid: 37282add7b55267488434bf72f538bbb
timeCreated: 1475802603
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: 0
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 16
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment