Merge branch 'master' of https://gitlab.com/toontownunited/src

2024-10-31 08:47:54 +00:00 · 2015-03-12 08:14:13 -04:00 · 2015-03-12 08:14:13 -04:00 · 31c19154bc
commit 31c19154bc
parent 8fcd496874 df21215297
7 changed files with 3 additions and 5 deletions
--- a/start_ai_server.bat
+++ b/start_ai_server.bat
--- a/all.bat
+++ b/all.bat
@ -0,0 +1,3 @@
+start astron
+start ai
+start ud
--- a/start_astron_cluster.bat
+++ b/start_astron_cluster.bat
--- a/start_game.bat
+++ b/start_game.bat
--- a/otp/settings/Settings.py
+++ b/otp/settings/Settings.py
@ -2,11 +2,9 @@ import collections
 import json
 import os

-
 class Settings(collections.MutableMapping):
    def __init__(self, filename):
        self.filename = filename
-
        self.store = {}
        self.read()

--- a/start_all_server.bat
+++ b/start_all_server.bat
@ -1,3 +0,0 @@
-start start_astron_cluster
-start start_ai_server
-start start_uberdog_server
--- a/start_uberdog_server.bat
+++ b/start_uberdog_server.bat