Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

INFOFP - Game Project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a00fb05a

Commit a00fb05a authored 1 year ago by saar

Downloads
- Plain Diff

Merge branch 'main' of https://git.science.uu.nl/7757859/infofp-game-project

# Conflicts: solved
#	src/Controller.hs
#	src/Laser.hs
#	src/View.hs

parents 11c2293e e0416dec

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/Asteroid.hs 6 additions, 1 deletion

src/Asteroid.hs
src/Controller.hs 89 additions, 8 deletions

src/Controller.hs
src/Enemy.hs 4 additions, 4 deletions

src/Enemy.hs
src/Laser.hs 3 additions, 3 deletions

src/Laser.hs
src/Model.hs 6 additions, 2 deletions

src/Model.hs
src/Spaceship.hs 1 addition, 1 deletion

src/Spaceship.hs
src/View.hs 51 additions, 5 deletions

src/View.hs

with 160 additions and 24 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