Master (!7) · Merge requests · Olivia Foshaug Ingvaldsen / Netrunner · GitLab

Snippets Groups Projects

Merged Helle Stige requested to merge master into 13-user-gets-affected-by-a-powerup 1 year ago

Apr 19, 2023
- Merge branch '37-countdown-for-the-beginning-of-the-game' into 'master' · 57ee0072
  Olivia Foshaug Ingvaldsen authored 1 year ago
```
Resolve "Countdown for the beginning of the game"

Closes #37

See merge request !6
```
  57ee0072
- Fix game init order · 88472667
  Olivia Foshaug Ingvaldsen authored 1 year ago
  
  88472667
Apr 18, 2023
- Merge branch 'master' into 37-countdown-for-the-beginning-of-the-game · 2287131b
  karinlie authored 1 year ago
  
  2287131b
- ferdig! fungerer nå i androidlauncer · a14e9be3
  karinlie authored 1 year ago
  
  a14e9be3
Apr 17, 2023
- Merge branch 'dev-paralax' · 7701113b
  Olivia Foshaug Ingvaldsen authored 1 year ago
  
  7701113b
- Disable parallax when the player isn't moving in the x direction · 29777973
  Olivia Foshaug Ingvaldsen authored 1 year ago
  
  29777973
- Rename controller because I canẗ spell · 85f33193
  Olivia Foshaug Ingvaldsen authored 1 year ago
  
  85f33193
- Initial parallax · 2faadd60
  Olivia Foshaug Ingvaldsen authored 1 year ago
  
  2faadd60
- Merge branch '8-create-movement' into 'master' · f83302b0
  Ingrid Louise Lagethon Heck authored 1 year ago
```
Added jump with gravity component

Closes #8

See merge request !5
```
  f83302b0
- Added jump with gravity component · 38d38985
  INGRID HECK authored 1 year ago
  
  38d38985
- har lagt inn text, fungerer kanskje men får ikke teste det når serveren er nede · 38e04025
  karinlie authored 1 year ago
  
  38e04025
- har lagt inn text, fungerer kanskje men får ikke teste det når serveren er nede · ac52c790
  karinlie authored 1 year ago
  
  ac52c790
Apr 14, 2023
- koblet sammen backend og frontend, mangler å printe på frontend test · 7083dc6e
  karinlie authored 1 year ago
  
  7083dc6e
- koblet sammen backend og frontend, mangler å printe på frontend · a70177bd
  karinlie authored 1 year ago
  
  a70177bd