Compare commits

...

2 Commits

Author SHA1 Message Date
Jay 698cc12615 0.17 2020-02-02 12:00:10 +00:00
Jay 94c5c8fb92 0.17 2020-02-01 15:06:13 +00:00
3 changed files with 17 additions and 8 deletions

View File

@ -40,7 +40,6 @@ local function setupCharacterLocally(client, char)
end end
local function characterSpawnedHandler(newClientId) local function characterSpawnedHandler(newClientId)
repeat wait() until engine.networking.me -- we shouldnt need to do this
print("spawning", newClientId, engine.networking.me.id) print("spawning", newClientId, engine.networking.me.id)
if engine.networking.me.id == newClientId then if engine.networking.me.id == newClientId then
print("waiting") print("waiting")
@ -63,10 +62,6 @@ local function characterSpawnedHandler(newClientId)
end end
end end
for _,v in pairs(engine.networking.clients.children) do
characterSpawnedHandler(v.id)
end
engine.networking.clients:clientConnected(function (client) engine.networking.clients:clientConnected(function (client)
characterSpawnedHandler(client.id) characterSpawnedHandler(client.id)
end) end)
@ -174,4 +169,7 @@ engine.input:keyReleased(function (inputObj)
end end
end) end)
repeat print(engine.networking.me) wait() until engine.networking.me
characterSpawnedHandler(engine.networking.me.id)
return controller return controller

View File

@ -10,3 +10,12 @@ require("tevgit:core/client/debug.lua")
require("tevgit:core/client/chat.lua") require("tevgit:core/client/chat.lua")
require("tevgit:core/client/playerList.lua") require("tevgit:core/client/playerList.lua")
require("tevgit:core/client/characterController.lua") require("tevgit:core/client/characterController.lua")
workspace.camera.position = vector3(40, 15, 0)
workspace.camera:lookAt(vector3(0, 0, 0))
engine.construct("block", workspace, {
position = vector3(0, 10, 0),
static = false,
colour = colour(0.3, 0.3, 0.3)
})

View File

@ -40,11 +40,13 @@ return {
name = "blueSphere", name = "blueSphere",
colour = colour(0, 0, 1), colour = colour(0, 0, 1),
size = vector3(1, 1, 1), size = vector3(1, 1, 1),
position = vector3(0.5, 1, 0), position = vector3(0.5, 5, 0),
mesh = "primitive:sphere", mesh = "primitive:sphere",
roughness = 0.5, roughness = 0.5,
metalness = 0.8 metalness = 0.8,
static = false
}) })
engine.physics:resume()
end, end,
setupEnvironment = function () setupEnvironment = function ()