diff --git a/.gitignore b/.gitignore index 837f6ed..8a86b61 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,9 @@ !*.tscn !*.blend !*.ttf +!*.cfg !.gitignore !.gitattributes !project.godot +!project.code-workspace .godot/ diff --git a/client/Global.gd b/client/Global.gd index 63922c6..ddfa215 100644 --- a/client/Global.gd +++ b/client/Global.gd @@ -3,7 +3,7 @@ extends Node var camera: Camera3D var player: Player var players: PlayerManager -var instance_id := OS.get_process_id() % 4 -var username := "user%d" % instance_id var account_id: String var interacting_with_ui: bool +var instance_id := OS.get_process_id() % 4 +var username := "user%d" % instance_id diff --git a/project.code-workspace b/project.code-workspace new file mode 100644 index 0000000..f3f01af --- /dev/null +++ b/project.code-workspace @@ -0,0 +1,16 @@ +{ + "folders": [ + { + "name": "client", + "path": "client" + }, + { + "name": "server", + "path": "server" + }, + { + "name": "stresstest", + "path": "stresstest" + } + ] +} \ No newline at end of file