Commit c1f5866f authored 4 years ago by Leonard

Merge branch 'master' into network

parents 0da2cc42 a152be63

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/AudioUI.java 101 additions, 0 deletions

...rucker/galaxytruckerreloaded/View/UI/Options/AudioUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/ControlUI.java 103 additions, 0 deletions

...cker/galaxytruckerreloaded/View/UI/Options/ControlUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/CreditsUI.java 102 additions, 0 deletions

...cker/galaxytruckerreloaded/View/UI/Options/CreditsUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/GeneralUI.java 138 additions, 0 deletions

...cker/galaxytruckerreloaded/View/UI/Options/GeneralUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java 205 additions, 0 deletions

...ucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java 126 additions, 0 deletions

...er/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/VideoUI.java 148 additions, 0 deletions

...rucker/galaxytruckerreloaded/View/UI/Options/VideoUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/AbstractShip.java 32 additions, 20 deletions

...cker/galaxytruckerreloaded/View/UI/Ship/AbstractShip.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/EnemyShip.java 12 additions, 2 deletions

...trucker/galaxytruckerreloaded/View/UI/Ship/EnemyShip.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java 202 additions, 29 deletions

...ytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/CrewUI.java 140 additions, 39 deletions

...galaxytruckerreloaded/View/UI/ShipInformation/CrewUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java 43 additions, 30 deletions

...laxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java 51 additions, 29 deletions

...galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/RoomUI.java 60 additions, 25 deletions

...galaxytruckerreloaded/View/UI/ShipInformation/RoomUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java 30 additions, 21 deletions

...alaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ShieldUI.java 68 additions, 33 deletions

...laxytruckerreloaded/View/UI/ShipInformation/ShieldUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/SubsystemUI.java 96 additions, 29 deletions

...ytruckerreloaded/View/UI/ShipInformation/SubsystemUI.java
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/WeaponUI.java 65 additions, 14 deletions

...laxytruckerreloaded/View/UI/ShipInformation/WeaponUI.java

with 1722 additions and 271 deletions

Please register or to comment