Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gadig
four
Commits
a66d7cf4
Commit
a66d7cf4
authored
Oct 27, 2016
by
Ashley
Browse files
Merge branch 'master' of git.gmu.edu:gadig/FOUR
parents
0157e41f
269330bb
Changes
46
Hide whitespace changes
Inline
Side-by-side
Assets/Prefabs/blue.prefab
View file @
a66d7cf4
No preview for this file type
Assets/Prefabs/blue.prefab.meta
View file @
a66d7cf4
fileFormatVersion: 2
guid:
6447dc2c5563810409fde3b2d66630cc
timeCreated: 1477
613639
guid:
d3fd44e8ccb7ad54b8f9d534900cdb93
timeCreated: 1477
085344
licenseType: Free
NativeFormatImporter:
userData:
...
...
Assets/Prefabs/white.prefab
View file @
a66d7cf4
No preview for this file type
Assets/Prefabs/white.prefab.meta
View file @
a66d7cf4
fileFormatVersion: 2
guid:
610ddd4392217474b923bb8ef67b3344
timeCreated: 1477
613638
guid:
d84b90404a95ff74c813d205e25dfd0c
timeCreated: 1477
085344
licenseType: Free
NativeFormatImporter:
userData:
...
...
Assets/Resources/Levels/.txt
deleted
100644 → 0
View file @
0157e41f
Assets/Resources/Levels/0.png
0 → 100644
View file @
a66d7cf4
5.01 KB
Assets/Resources/Levels/0.png.meta
0 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: 74d7f1f922d265a4cb8e8989f9608bbf
timeCreated: 1477086866
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: 1
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: 100
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 5
buildTargetSettings: []
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Levels/0.txt
0 → 100644
View file @
a66d7cf4
Assets/Resources/Prefab/1_front.prefab
0
0
0
Assets/Resources/Prefab/5_back.prefab
255
255
255
Assets/Resources/Prefab/crate_16.prefab
255
0
0
Assets/Resources/Prefab/Tree_01.prefab
0
255
0
Assets/
Scripts/Heap.cs
.meta
→
Assets/
Resources/Levels/0.txt
.meta
View file @
a66d7cf4
fileFormatVersion: 2
guid:
243bb794b9f808b409bcd50557270e5b
timeCreated: 14770
07304
guid:
b994f2c1c032bdf47a3135af993751bf
timeCreated: 14770
86128
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefab/1_front.prefab
0 → 100644
View file @
a66d7cf4
File added
Assets/Resources/Prefab/1_front.prefab.meta
0 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: 87ed77aef35072942a2705888df1a98f
timeCreated: 1477086529
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefab/5_back.prefab
0 → 100644
View file @
a66d7cf4
File added
Assets/Resources/Prefab/5_back.prefab.meta
0 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: fe45769cb9d72ef458a5450c4d6cb5f6
timeCreated: 1477086550
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefab/Tree_01.prefab
0 → 100644
View file @
a66d7cf4
File added
Assets/Resources/Prefab/Tree_01.prefab.meta
0 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: 47cd14cbf89bb8c4e9312e93e76b8811
timeCreated: 1477086506
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes.meta
View file @
a66d7cf4
fileFormatVersion: 2
guid: 9
f2b9f8232e8aef43b9a2de4500b7fff
guid: 9
286c3aa67775f045a5055f3f164abde
folderAsset: yes
timeCreated: 1477
6136
34
timeCreated: 1477
085
34
2
licenseType: Free
DefaultImporter:
userData:
...
...
Assets/Scenes/Map Loader.unity
0 → 100644
View file @
a66d7cf4
File added
Assets/
spr
it
e
.meta
→
Assets/
Scenes/Map Loader.un
it
y
.meta
100755 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: a25513e707cbe794aa471c196b40ee22
folderAsset: yes
timeCreated: 1475761198
guid: 9ebfaa068bf3ce248a1b8b8036d59c46
timeCreated: 1477086128
licenseType: Free
DefaultImporter:
userData:
...
...
Assets/Scenes/Map Maker.unity
0 → 100644
View file @
a66d7cf4
File added
Assets/
s
cene.meta
→
Assets/
S
cene
s/Map Maker.unity
.meta
100755 → 100644
View file @
a66d7cf4
fileFormatVersion: 2
guid: 647a00acb440c0c4aa002d9f0ae2ffd5
folderAsset: yes
timeCreated: 1475761198
guid: d9bbbcc5e70ac6c4bbd42b3651aefea7
timeCreated: 1477611955
licenseType: Free
DefaultImporter:
userData:
...
...
Prev
1
2
3
Next
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