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

Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016

Browse Source
This commit is contained in:
jparent 2016-01-31 12:07:35 -05:00
commit 9f091574fc
10 changed files with 106 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/materials/unnamed.mat
View File

@ -36,13 +36,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _ParallaxMap
@ -78,6 +71,13 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
@ -91,6 +91,10 @@ Material:
first:
name: _Cutoff
second: .5
data:
first:
name: _Parallax
second: .0419000015
data:
first:
name: _ZWrite
@ -98,19 +102,11 @@ Material:
data:
first:
name: _Glossiness
second: .458999991
data:
first:
name: _Metallic
second: .057
second: .074000001
data:
first:
name: _BumpScale
second: 1.10000002
data:
first:
name: _Parallax
second: .0467999987
data:
first:
name: _OcclusionStrength
@ -127,6 +123,10 @@ Material:
first:
name: _Mode
second: 0
data:
first:
name: _Metallic
second: .0979999974
m_Colors:
data:
first:

8
Assets/prefabs/RoomObject.obj
View File

@ -270,10 +270,10 @@ vt 0.005497 0.810803
vt 0.104897 0.505564
vt 0.408631 0.503644
vt 0.514794 0.810803
vt 0.100673 0.505044
vt 0.100673 0.152331
vt 0.453387 0.152331
vt 0.453387 0.505044
vt 0.009173 0.511284
vt 0.009173 0.015874
vt 0.489080 0.015874
vt 0.489080 0.511284
vn 0.000000 0.914300 0.404900
vn -0.404900 0.914300 0.000000
vn 0.404900 0.914300 0.000000

BIN
Assets/prefabs/basic_room.blend
View File

Binary file not shown.

BIN
Assets/prefabs/basic_room.blend1
View File

Binary file not shown.

2
Assets/scripts/LevelManager.cs
View File

@ -90,7 +90,7 @@ public class LevelManager : MonoBehaviour {
StartCoroutine(MoveSelectorToTile(tile));
SoundManager.Instance.PlayRunePickup();
//Do something
if (player.hasWon())
{

BIN
Assets/textures/basic_room.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 423 KiB

BIN
Assets/textures/basic_room_UVs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

55
Assets/textures/basic_room_UVs.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: ad527bcb58b6d4de381e12ab5d28382c
timeCreated: 1454255675
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: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/textures/basic_room_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 239 KiB

60
ProjectSettings/InputManager.asset
View File

@ -14,7 +14,7 @@ InputManager:
altNegativeButton: a
altPositiveButton: d
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -30,7 +30,7 @@ InputManager:
altNegativeButton: a
altPositiveButton: d
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -46,7 +46,7 @@ InputManager:
altNegativeButton: a
altPositiveButton: d
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -62,7 +62,7 @@ InputManager:
altNegativeButton: s
altPositiveButton: w
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -78,7 +78,7 @@ InputManager:
altNegativeButton: s
altPositiveButton: w
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -94,7 +94,7 @@ InputManager:
altNegativeButton: s
altPositiveButton: w
gravity: 3
dead: 0.001
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
@ -110,7 +110,7 @@ InputManager:
altNegativeButton:
altPositiveButton: mouse 0
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -126,7 +126,7 @@ InputManager:
altNegativeButton:
altPositiveButton: mouse 1
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -142,7 +142,7 @@ InputManager:
altNegativeButton:
altPositiveButton: mouse 2
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -158,7 +158,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -175,7 +175,7 @@ InputManager:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: 0.1
sensitivity: .100000001
snap: 0
invert: 0
type: 1
@ -191,7 +191,7 @@ InputManager:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: 0.1
sensitivity: .100000001
snap: 0
invert: 0
type: 1
@ -207,7 +207,7 @@ InputManager:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: 0.1
sensitivity: .100000001
snap: 0
invert: 0
type: 1
@ -217,12 +217,12 @@ InputManager:
m_Name: Horizontal
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
negativeButton: a
positiveButton: d
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 0
@ -238,7 +238,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 0
@ -254,7 +254,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 0
@ -265,12 +265,12 @@ InputManager:
m_Name: Vertical
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
negativeButton: w
positiveButton: s
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 1
@ -286,7 +286,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 1
@ -302,7 +302,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0.19
dead: .189999998
sensitivity: 1
snap: 0
invert: 1
@ -318,7 +318,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -334,7 +334,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -350,7 +350,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -366,7 +366,7 @@ InputManager:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -382,7 +382,7 @@ InputManager:
altNegativeButton:
altPositiveButton: joystick button 0
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -398,7 +398,7 @@ InputManager:
altNegativeButton:
altPositiveButton: space
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
@ -414,7 +414,7 @@ InputManager:
altNegativeButton:
altPositiveButton: joystick button 1
gravity: 1000
dead: 0.001
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0