Add back files from old deployment branch.

This commit is contained in:
Alexander 2015-08-14 02:23:24 -04:00
parent 21ce879162
commit ad81064fb7
5 changed files with 43 additions and 4 deletions

View file

@ -6,6 +6,9 @@ The source code for Toontown Stride.
* Game Development
### Submodule info.
* First, Clone and then run: git submodule init then run: git submodule update
### Info
* Do not erase or revert another person's commit without first consulting them.

View file

@ -2,7 +2,21 @@
distribution dev
# Art assets:
model-path ../resources/
vfs-mount resources/phase_3 /phase_3
vfs-mount resources/phase_3.5 /phase_3.5
vfs-mount resources/phase_4 /phase_4
vfs-mount resources/phase_5 /phase_5
vfs-mount resources/phase_5.5 /phase_5.5
vfs-mount resources/phase_6 /phase_6
vfs-mount resources/phase_7 /phase_7
vfs-mount resources/phase_8 /phase_8
vfs-mount resources/phase_9 /phase_9
vfs-mount resources/phase_10 /phase_10
vfs-mount resources/phase_11 /phase_11
vfs-mount resources/phase_12 /phase_12
vfs-mount resources/phase_13 /phase_13
vfs-mount resources/server /server
model-path /
# Server:
server-version tts-dev

View file

@ -21,3 +21,12 @@ def inspect(anObject):
__builtins__['inspect'] = inspect
taskMgr.finalInit()
# The VirtualFileSystem, which has already initialized, doesn't see the mount
# directives in the config(s) yet. We have to force it to load those manually:
from panda3d.core import VirtualFileSystem, ConfigVariableList, Filename
vfs = VirtualFileSystem.getGlobalPtr()
mounts = ConfigVariableList('vfs-mount')
for mount in mounts:
mountfile, mountpoint = (mount.split(' ', 2) + [None, None, None])[:2]
vfs.mount(Filename(mountfile), Filename(mountpoint), 0)

View file

@ -16,20 +16,20 @@ class DNABulkLoader:
def loadDNABulk(dnaStorage, file):
dnaLoader = DNALoader()
fileu = '../resources/' + file
fileu = '/' + file
dnaLoader.loadDNAFile(dnaStorage, fileu)
def loadDNAFile(dnaStorage, file):
print 'Reading DNA file...', file
dnaLoader = DNALoader()
fileu = '../resources/' + file
fileu = '/' + file
node = dnaLoader.loadDNAFile(dnaStorage, fileu)
if node.node().getNumChildren() > 0:
return node.node()
def loadDNAFileAI(dnaStorage, file):
dnaLoader = DNALoader()
fileu = '../resources/' + file
fileu = '/' + file
data = dnaLoader.loadDNAFileAI(dnaStorage, fileu)
return data

View file

@ -71,6 +71,15 @@ from direct.directnotify.DirectNotifyGlobal import directNotify
notify = directNotify.newCategory('ToontownStart')
notify.setInfo(True)
# The VirtualFileSystem, which has already initialized, doesn't see the mount
# directives in the config(s) yet. We have to force it to load those manually:
from panda3d.core import VirtualFileSystem, ConfigVariableList, Filename
vfs = VirtualFileSystem.getGlobalPtr()
mounts = ConfigVariableList('vfs-mount')
for mount in mounts:
mountfile, mountpoint = (mount.split(' ', 2) + [None, None, None])[:2]
vfs.mount(Filename(mountfile), Filename(mountpoint), 0)
from otp.settings.Settings import Settings
from otp.otpbase import OTPGlobals
@ -98,6 +107,10 @@ if 'language' not in settings:
settings['language'] = 'English'
if 'cogInterface' not in settings:
settings['cogInterface'] = True
if 'speedchatPlus' not in settings:
settings['speedchatPlus'] = True
if 'trueFriends' not in settings:
settings['trueFriends'] = True
if 'tpTransition' not in settings:
settings['tpTransition'] = True
if 'fov' not in settings: