Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Netrunner
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

0610ff00

Commit 0610ff00 authored 2 years ago by Ingrid Louise Lagethon Heck

Downloads
- Plain Diff

Merge branch 'master' into '13-user-gets-affected-by-a-powerup'

Master

See merge request !7

parents 380e42f8 57ee0072

No related branches found

No related tags found

1 merge request!7Master

Pipeline #217143 passed 2 years ago

Stage: test

Changes 6
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

core/src/tdt4240/netrunner/game/GameController.kt 5 additions, 0 deletions

core/src/tdt4240/netrunner/game/GameController.kt
core/src/tdt4240/netrunner/view/GameScreen.kt 30 additions, 2 deletions

core/src/tdt4240/netrunner/view/GameScreen.kt
core/src/tdt4240/netrunner/view/controllers/ParallaxRenderer.kt 74 additions, 0 deletions

...rc/tdt4240/netrunner/view/controllers/ParallaxRenderer.kt
model/src/main/kotlin/tdt4240/netrunner/model/game/components/dynamic/GravityComponent.kt 4 additions, 1 deletion

...trunner/model/game/components/dynamic/GravityComponent.kt
model/src/main/kotlin/tdt4240/netrunner/model/game/factories/PlayerFactory.kt 3 additions, 1 deletion

...n/tdt4240/netrunner/model/game/factories/PlayerFactory.kt
server/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt 17 additions, 4 deletions

...r/src/main/java/tdt4240/netrunner/server/game/GameRoom.kt

with 133 additions and 8 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