started level-editor server integration
fix join room
merge
Merge branch 'rejoingame' into level-editor-integration
merge level editor
added obstacles
merged with master, some issues with obstacle loading in the game
work in progress : map loads correctly from json
server read map content
obstacles all shown as cubes
Merge branch 'level-editor-integration' of https://github.com/mattzhao92/Planet-Blitz into level-editor-integration
sv
merge server map
not start the gameif only one player plays again
format
working on removing bullets once they hit the wall
Merge branch 'level-editor-integration' of https://github.com/mattzhao92/Planet-Blitz into level-editor-integration
bug: bullets go through the wall
remove game nuber
bullets now stop at walls