Commit a6be7621 authored 4 years ago by Leonard Haddad

Merge branch 'persistence' into 'master'

persistence done so far

See merge request reswp-2020/galaxytrucker!67

parents 7c731215 267a111e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 0 additions, 10 deletions

build.gradle
core/database.mv.db 0 additions, 0 deletions

core/database.mv.db
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java 1 addition, 3 deletions

.../galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java 16 additions, 9 deletions

...axytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java 11 additions, 9 deletions

...galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java 8 additions, 10 deletions

...galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java 9 additions, 21 deletions

...c/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java 3 additions, 8 deletions

...ker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java 2 additions, 4 deletions

...rucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java 10 additions, 7 deletions

...ytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java 2 additions, 4 deletions

...rucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java 6 additions, 14 deletions

...rucker/galaxytruckerreloaded/Model/ShipLayout/System.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java 8 additions, 6 deletions

.../galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java 5 additions, 2 deletions

...c/com/galaxytrucker/galaxytruckerreloaded/Model/User.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java 2 additions, 4 deletions

...laxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java 5 additions, 5 deletions

...trucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java 2 additions, 4 deletions

...ker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java 2 additions, 4 deletions

...er/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java 2 additions, 4 deletions

...axytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java
core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java 2 additions, 4 deletions

...xytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java

with 96 additions and 132 deletions

Please register or to comment