Merge remote-tracking branch 'origin/task_ship_view' into task_ship_view

vegastrike · Oct 28, 2024 · 5a79352 · 5a79352
2 parents 1270946 + 1a458e5
commit 5a79352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -176,6 +176,7 @@ INSTALL(FILES weapons.json DESTINATION share/vegastrike)
 # Linux specific locations from here on out.
 
 INSTALL(FILES vegastrike.config DESTINATION share/vegastrike)
+INSTALL(FILES config.json DESTINATION share/vegastrike)
 
 INSTALL(FILES vegastrike.desktop DESTINATION share/applications)
 INSTALL(FILES vegasettings.desktop DESTINATION share/applications)

diff --git a/config.json b/config.json
@@ -6,7 +6,7 @@
     "resolution_y": 1600,
     "screen": 0
 },
-
+  
 "components": {
     "drive": {
         "non_combat_mode_multiplier": 100
@@ -16,6 +16,6 @@
 "constants": {
     "megajoules_multiplier": 100
 },
-
+  
 "advanced": {}
 }