Skip to content

Commit

Permalink
Better structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Jerek0 committed Oct 30, 2015
1 parent c1640da commit d17ef4a
Show file tree
Hide file tree
Showing 52 changed files with 58 additions and 174 deletions.
Binary file modified .vs/Workshop/v14/.suo
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Scenes/Game.unity
Original file line number Diff line number Diff line change
Expand Up @@ -5095,7 +5095,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down
9 changes: 9 additions & 0 deletions Assets/Scripts/Entities.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ void FixedUpdate() {
audioSource.PlayOneShot(audioClips[1]);
_jumpReleased = false;
rigidbody.velocity = new Vector2(rigidbody.velocity.x, 5f);
} else if(!_jumpReleased && (keyUpPressed || keySpacePressed)) {
Debug.Log("jumphigher");
} else if(!_jumpReleased && (keyUpPressed || keySpacePressed)) { // JUMP Higher
rigidbody.velocity = new Vector2(rigidbody.velocity.x, rigidbody.velocity.y * 1.03f);

if (!keyUpPressed && !keySpacePressed)
Expand All @@ -154,6 +153,7 @@ void FixedUpdate() {
// Slow down
if(IsGrounded && !IsMoving) rigidbody.velocity = new Vector2(rigidbody.velocity.x * 0.8f, rigidbody.velocity.y);

// Allows to tell the animator if we're going up or down
VelY = rigidbody.velocity.y;
}
}
Expand Down
File renamed without changes.
9 changes: 9 additions & 0 deletions Assets/Scripts/Movement.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions Assets/Scripts/Triggers.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions Assets/Scripts/Util.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ void Update () {
}
}

IEnumerator startListening() {
Debug.Log("start");
IEnumerator startListening() {
yield return new WaitForSeconds(delay);
Debug.Log("end");
listening = true;
}
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions Assets/Sounds/Musics.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions Assets/Sounds/Player.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed Assets/Spritesheets/ramp1.jpg
Binary file not shown.
56 changes: 0 additions & 56 deletions Assets/Spritesheets/ramp1.jpg.meta

This file was deleted.

Binary file removed Assets/Spritesheets/ramp2.jpg
Binary file not shown.
56 changes: 0 additions & 56 deletions Assets/Spritesheets/ramp2.jpg.meta

This file was deleted.

Binary file removed Assets/Spritesheets/ramp3.jpg
Binary file not shown.
56 changes: 0 additions & 56 deletions Assets/Spritesheets/ramp3.jpg.meta

This file was deleted.

0 comments on commit d17ef4a

Please sign in to comment.