Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main menu/ Select level/ Options/ New Level/ Progression/ Jumpchain/ GameOver #9

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Main menu/ Select level/ Options/ New Level/ Progression/ Jumpchain/ GameOver #9

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4487fb
Unity 2017.4.4f1Vers Updt / Main menu / New level / Pause menu / litt…
MageOsiris Jun 4, 2018
d3b1d09
Fix and gameSettings
MageOsiris Jun 5, 2018
9cb6a6c
Fix GameSetting / add Service to manage Stats and Settings
MageOsiris Jun 6, 2018
4b33ad4
change gitignore
MageOsiris Jun 6, 2018
6f85797
Delete file
MageOsiris Jun 6, 2018
6bbb198
Fix last commit
MageOsiris Jun 6, 2018
bd29d5e
Comment and fix
MageOsiris Jun 7, 2018
52b886a
Add ChangeLog
MageOsiris Jun 7, 2018
68a9fa5
Fix tabulation and optimisation
MageOsiris Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Library/
Temp/
.vs/
UnityPackageManager/


.DS_Store
Thumbs.db
*.sln
*.sln
unitydemo-2DPlatformer.csproj

*.unitydemo-2DPlatformer.csproj
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something that we probably should have done here is to add the items from here.

https://github.com/github/gitignore/blob/master/Unity.gitignore

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, it's a much cleaner version than mine.
Since I'm going to make a new commit. Let me to add this version.

42 changes: 22 additions & 20 deletions Assets/Materials/DefaultPixelSnap.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,34 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: DefaultPixelSnap
m_Shader: {fileID: 10753, guid: 0000000000000000e000000000000000, type: 0}
m_ShaderKeywords:
- PIXELSNAP_ON
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA PIXELSNAP_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: PixelSnap
second: 1
- PixelSnap: 1
- _EnableExternalAlpha: 0
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
41 changes: 22 additions & 19 deletions Assets/Materials/Explosion.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Explosion
m_Shader: {fileID: 10753, guid: 0000000000000000e000000000000000, type: 0}
m_ShaderKeywords: []
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: PixelSnap
second: 0
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: .458823532, a: .501960814}
- _Color: {r: 1, g: 1, b: 0.45882353, a: 0.5019608}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
41 changes: 22 additions & 19 deletions Assets/Materials/HalfAlpha.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: HalfAlpha
m_Shader: {fileID: 10753, guid: 0000000000000000e000000000000000, type: 0}
m_ShaderKeywords: []
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: PixelSnap
second: 0
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: .525490224}
- _Color: {r: 1, g: 1, b: 1, a: 0.5254902}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
41 changes: 22 additions & 19 deletions Assets/Materials/Health.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Health
m_Shader: {fileID: 10753, guid: 0000000000000000e000000000000000, type: 0}
m_ShaderKeywords: []
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: PixelSnap
second: 0
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
data:
first:
name: _Color
second: {r: .199999928, g: 1, b: 0, a: 1}
- _Color: {r: 0.19999993, g: 1, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
Loading