Merge branch 'master' into plugin-autostart

This commit is contained in:
Lucien Greathouse 2019-05-04 21:43:10 -07:00
commit 6b709e7619
14 changed files with 181 additions and 232 deletions

View file

@ -6,13 +6,13 @@
"$path": "src"
},
"Roact": {
"$path": "modules/roact/lib"
"$path": "modules/roact/src"
},
"Promise": {
"$path": "modules/promise/lib"
},
"t": {
"$path": "modules/t/lib/t.lua"
"$path": "modules/t/lib"
}
}
}

@ -1 +1 @@
Subproject commit 8da5b298059382499df05102d62ba01a20bd4e1e
Subproject commit 41af74df730723ed39c02f54cae7c6c97c6c5d9c

@ -1 +1 @@
Subproject commit a3a80ebf0a45f435c38cc3e719844ad1b6245cec
Subproject commit f643b50682c24ec8d6ac3e11f41ee8cbbb2bcecb

View file

@ -13,13 +13,13 @@
"$path": "src"
},
"Roact": {
"$path": "modules/roact/lib"
"$path": "modules/roact/src"
},
"Promise": {
"$path": "modules/promise/lib"
},
"t": {
"$path": "modules/t/lib/t.lua"
"$path": "modules/t/lib"
}
},
"TestEZ": {

View file

@ -1,34 +0,0 @@
{
"name": "rojo",
"servePort": 8000,
"partitions": {
"plugin": {
"path": "src",
"target": "ReplicatedStorage.Rojo.Plugin"
},
"modules/roact": {
"path": "modules/roact/lib",
"target": "ReplicatedStorage.Rojo.Roact"
},
"modules/rodux": {
"path": "modules/rodux/lib",
"target": "ReplicatedStorage.Rojo.Rodux"
},
"modules/roact-rodux": {
"path": "modules/roact-rodux/lib",
"target": "ReplicatedStorage.Rojo.RoactRodux"
},
"modules/promise": {
"path": "modules/promise/lib",
"target": "ReplicatedStorage.Rojo.Promise"
},
"modules/testez": {
"path": "modules/testez/lib",
"target": "ReplicatedStorage.TestEZ"
},
"tests": {
"path": "testBootstrap.server.lua",
"target": "TestService.testBootstrap"
}
}
}