Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dyingIsMainstream
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gamejam-gpn15
dyingIsMainstream
Commits
e41ebd2d
Commit
e41ebd2d
authored
Jun 05, 2015
by
Tim Reiter
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream
parents
05b46512
25fa1ed5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
PlayerControl.cs
Assets/Scripts/PlayerControl.cs
+0
-9
No files found.
Assets/Scripts/PlayerControl.cs
View file @
e41ebd2d
...
@@ -72,11 +72,6 @@ public class PlayerControl : MonoBehaviour
...
@@ -72,11 +72,6 @@ public class PlayerControl : MonoBehaviour
void
onControllerCollider
(
RaycastHit2D
hit
)
void
onControllerCollider
(
RaycastHit2D
hit
)
{
{
//// bail out on plain old ground hits
//if (hit.normal.y == 1f)
// return;
Rigidbody2D
body
=
hit
.
collider
.
gameObject
.
GetComponent
<
Rigidbody2D
>();
Rigidbody2D
body
=
hit
.
collider
.
gameObject
.
GetComponent
<
Rigidbody2D
>();
if
(
body
)
if
(
body
)
{
{
...
@@ -84,12 +79,8 @@ public class PlayerControl : MonoBehaviour
...
@@ -84,12 +79,8 @@ public class PlayerControl : MonoBehaviour
body
.
AddForce
(
_controller
.
getDirectionOfMovement
()
*
pushForce
);
body
.
AddForce
(
_controller
.
getDirectionOfMovement
()
*
pushForce
);
//TODO set is dashing to false
//TODO set is dashing to false
}
}
// logs any collider hits
//Debug.Log( "flags: " + _controller.collisionState + ", hit.normal: " + hit.normal );
}
}
void
Update
()
void
Update
()
{
{
// grab our current velocity to use as a base for all calculations
// grab our current velocity to use as a base for all calculations
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment