Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
callistoAshley committed Dec 30, 2021
1 parent 4b30d20 commit 96152d0
Show file tree
Hide file tree
Showing 70 changed files with 242 additions and 198 deletions.
Binary file modified .vs/space!!!!/v16/.suo
Binary file not shown.
16 changes: 15 additions & 1 deletion Assets/Resources/prefabs/alison.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Rigidbody2D:
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: b843eb015d595bf4e84a0a0050f83413, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
Expand Down Expand Up @@ -289,6 +289,7 @@ GameObject:
m_Component:
- component: {fileID: 6386787409232459589}
- component: {fileID: 3928037881325858692}
- component: {fileID: 2819047099188967498}
m_Layer: 0
m_Name: feet
m_TagString: Untagged
Expand Down Expand Up @@ -336,3 +337,16 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.20581648, y: 0.113859594}
m_EdgeRadius: 0
--- !u!114 &2819047099188967498
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7962685919800002259}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ae7eb96ca7b912498a48474ef4ad1f4, type: 3}
m_Name:
m_EditorClassIdentifier:
onGround: 0
8 changes: 8 additions & 0 deletions Assets/physics.meta

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

11 changes: 11 additions & 0 deletions Assets/physics/player.physicsMaterial2D
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: player
friction: 0
bounciness: 0
8 changes: 8 additions & 0 deletions Assets/physics/player.physicsMaterial2D.meta

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

3 changes: 2 additions & 1 deletion Assets/scripts/Global.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ private void LogMessageHandler(string condition, string stackTrace, LogType type
// ui manager is attached to the canvas
UIManager.instance.transform.position, Quaternion.identity, UIManager.instance.transform);
// set text
g.GetComponentInChildren<Text>().text = $"an exception was encountered:\n\n{condition}\n{stackTrace.Substring(0, 200) + "..."}\n\nthe full stack trace was logged";
// clamp the length of the stack trace substring between 0 and 200 so we don't get an index out of range
g.GetComponentInChildren<Text>().text = $"an exception was encountered:\n\n{condition}\n{stackTrace.Substring(0, Mathf.Clamp(stackTrace.Length, 0, 200)) + "..."}\n\nthe full stack trace was logged";

Debug.Log($"\n===============================\n");

Expand Down
2 changes: 1 addition & 1 deletion Assets/scripts/Parallax.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void UpdateX(Player player)
transform.position = player.transform.position;
}
// only move the parallax further from the player if the player has moved
else if (player.transform.hasChanged && data.moveX)
else if (player.rigidbody2d.transform.hasChanged && data.moveX)
{
int distanceX = player.facingRight ? 1 : -1;
transform.position -= new Vector3(distanceX * player.movementSpeed * moveSpeedMultiplier * Time.deltaTime, 0);
Expand Down
8 changes: 8 additions & 0 deletions Assets/sprites/meta.meta

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

Binary file added Assets/sprites/meta/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions Assets/sprites/meta/icon.png.meta

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

Loading

0 comments on commit 96152d0

Please sign in to comment.