Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TDT4240 Tank Wars
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Package Registry
- Model registry
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1ed6c774

Commit 1ed6c774 authored 1 year ago by Eli Fjellbirkeland Johannesen

Downloads
- Plain Diff

Merge branch '48-implement-collision-detection' into 'main'

Resolve "implement collision detection"

Closes #48

See merge request !55

parents 605babd3 1ffac2c5

Loading

Checking pipeline status

Changes 7
Pipelines 4

Hide whitespace changes

Inline Side-by-side

Showing

frontend/core/src/com/game/tankwars/CollisionDetection.java 60 additions, 0 deletions

frontend/core/src/com/game/tankwars/CollisionDetection.java
frontend/core/src/com/game/tankwars/model/Box2dWorld.java 17 additions, 0 deletions

frontend/core/src/com/game/tankwars/model/Box2dWorld.java
frontend/core/src/com/game/tankwars/model/Bullet.java 8 additions, 0 deletions

frontend/core/src/com/game/tankwars/model/Bullet.java
frontend/core/src/com/game/tankwars/model/FixtureData.java 26 additions, 0 deletions

frontend/core/src/com/game/tankwars/model/FixtureData.java
frontend/core/src/com/game/tankwars/model/Tank.java 2 additions, 1 deletion

frontend/core/src/com/game/tankwars/model/Tank.java
frontend/core/src/com/game/tankwars/model/Terrain.java 1 addition, 0 deletions

frontend/core/src/com/game/tankwars/model/Terrain.java
frontend/core/src/com/game/tankwars/view/GameScreen.java 34 additions, 4 deletions

frontend/core/src/com/game/tankwars/view/GameScreen.java

with 148 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment