Conjure/MeltedBananasOJam2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/MeltedBananasOJam2016.git synced 2026-03-24 02:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
antoine.mcnabb 2016-06-25 11:57:36 -04:00
commit 62d518a8e1
9 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/FirstPersonView.unity Normal file
View File

Binary file not shown.

8
Assets/FirstPersonView.unity.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e30c07fb6559541af858338a37440da7
timeCreated: 1466818119
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Red_Brick_Wall.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 MiB

57
Assets/Red_Brick_Wall.jpg.meta Normal file
View File

@ -0,0 +1,57 @@
fileFormatVersion: 2
guid: 11f13d469daed41edb2648f1d1b461b2
timeCreated: 1466818973
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 1
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 1
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: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0
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: 0
textureType: 1
buildTargetSettings: []
spriteSheet:
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Scripts.meta
View File

@ -1,7 +1,13 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 40764ebe822b819449a2b0cf923f4c2e guid: 40764ebe822b819449a2b0cf923f4c2e
folderAsset: yes folderAsset: yes
timeCreated: 1466858656 timeCreated: 1466858656
=======
guid: 585294b74b6b54cae92293ffbd3a2088
folderAsset: yes
timeCreated: 1466869142
>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
userData: userData:

5
Assets/Scripts/PlayerMovement.cs.meta
View File

@ -1,6 +1,11 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e02d4438d816e344abb40991894780c3 guid: e02d4438d816e344abb40991894780c3
timeCreated: 1466858657 timeCreated: 1466858657
=======
guid: 55ee7f3d2d53247daa31f81beccb99d8
timeCreated: 1466869142
>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
licenseType: Free licenseType: Free
MonoImporter: MonoImporter:
serializedVersion: 2 serializedVersion: 2

5
Assets/Scripts/ViewControl.cs.meta
View File

@ -1,6 +1,11 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e0d46d2696637bd4994804f7b9e4d3fe guid: e0d46d2696637bd4994804f7b9e4d3fe
timeCreated: 1466858657 timeCreated: 1466858657
=======
guid: 2c2ae6eb7fab0437791fe2f4ad415052
timeCreated: 1466818849
>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
licenseType: Free licenseType: Free
MonoImporter: MonoImporter:
serializedVersion: 2 serializedVersion: 2

BIN
Assets/TestMaterial.mat Normal file
View File

Binary file not shown.

8
Assets/TestMaterial.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 852c4d218cedd4ae5b088ddcdedccad4
timeCreated: 1466818559
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant: