Skip to content
Snippets Groups Projects

Finishing Touch

Merged Finishing Touch
DataBase into development
Merged Schuh Martin requested to merge DataBase into development
  1. Jan 16, 2024
    • Schuh Martin's avatar
      Merge branch 'development' into 'DataBase' · e1408de6
      Schuh Martin authored 
      # Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
      e1408de6
    • Schuh Martin's avatar
      Update: AppSettings.java (added setter methods; both fields now type "double") · 136c127e
      Schuh Martin authored 
      Update. Persistence.java (implemented methods to reset settings)
Update: PlayerStatistics.java (moved method to calculate ingametime in hours from Persistence.java to here)
Update: RuntimeInfo.java (changed method "setGameMap" to get whole instance of MapData Class of chosen map instead of only the string of the actual mapdata; moved method to calculate ingametime in hours to PlayerStatistics.java)
      136c127e