Merge branch 'MainmenuMasterMerge' into 'master'
Mainmenu master merge See merge request reswp-2020/galaxytrucker!80
Showing
- core/assets/buttons/battle_overlay.pdn 0 additions, 0 deletionscore/assets/buttons/battle_overlay.pdn
- core/assets/crew/background.png 0 additions, 0 deletionscore/assets/crew/background.png
- core/assets/enemy/battle_overlay.png 0 additions, 0 deletionscore/assets/enemy/battle_overlay.png
- core/assets/ship/barrage/fed_cruiser_2_base.png 0 additions, 0 deletionscore/assets/ship/barrage/fed_cruiser_2_base.png
- core/assets/ship/barrage/fed_cruiser_shields1.png 0 additions, 0 deletionscore/assets/ship/barrage/fed_cruiser_shields1.png
- core/assets/ship/barragebase.png 0 additions, 0 deletionscore/assets/ship/barragebase.png
- core/assets/ship/barragefloor.png 0 additions, 0 deletionscore/assets/ship/barragefloor.png
- core/assets/ship/boarder/circle_cruiser_2_base.png 0 additions, 0 deletionscore/assets/ship/boarder/circle_cruiser_2_base.png
- core/assets/ship/boarder/circle_cruiser_shields1.png 0 additions, 0 deletionscore/assets/ship/boarder/circle_cruiser_shields1.png
- core/assets/ship/boarderbase.png 0 additions, 0 deletionscore/assets/ship/boarderbase.png
- core/assets/ship/boarderfloor.png 0 additions, 0 deletionscore/assets/ship/boarderfloor.png
- core/assets/ship/default/kestral_shields1.png 0 additions, 0 deletionscore/assets/ship/default/kestral_shields1.png
- core/assets/ship/defaultbase.png 0 additions, 0 deletionscore/assets/ship/defaultbase.png
- core/assets/ship/defaultfloor.png 0 additions, 0 deletionscore/assets/ship/defaultfloor.png
- core/assets/ship/killer/shields.png 0 additions, 0 deletionscore/assets/ship/killer/shields.png
- core/assets/ship/killerbase.png 0 additions, 0 deletionscore/assets/ship/killerbase.png
- core/assets/ship/killerfloor.png 0 additions, 0 deletionscore/assets/ship/killerfloor.png
- core/assets/ship/stealthbase.png 0 additions, 0 deletionscore/assets/ship/stealthbase.png
- core/assets/ship/stealthfloor.png 0 additions, 0 deletionscore/assets/ship/stealthfloor.png
- core/assets/ship/tank/rock_cruiser_floor.png 0 additions, 0 deletionscore/assets/ship/tank/rock_cruiser_floor.png
Loading
Please register or sign in to comment