stable merge, everything is now extra squicky clean

server/scenes/autoloads/gamestate.gd → server/autoloads/gamestate.gd

@@ -62,10 +62,10 @@ func _playerDisconnected(id):
 
 func startGame():
 	# Instancing the map and adding it to the scene tree
-	var game = preload("res://scenes/levels/game/game.tscn").instance()
+	var game = preload("res://levels/test/game.tscn").instance()
 	get_tree().get_root().add_child(game)
 	
-	var playerScene = preload("res://scenes/entities/player/player.tscn")
+	var playerScene = preload("res://entities/characters/player.tscn")
 
 	var i = 1
 	for peer_id in players:

server/scenes/entities/player/player.gd → server/entities/characters/player.gd

 extends KinematicBody
 
-# duh
+# Speed values
 const MAX_SPEED:float = 8.0
+const MAX_SPRINT_SPEED:float = 12.0
+var motion:float = 0
+var isSprinting:bool = false
 
-# duh 2
+# Acceleration values
 const ACCEL:float = 8.5
 const SPRINT_ACCEL:float = 16.0
 const DEACCEL:float = 16.0
 
-# duh 3: the vengeance
-const MAX_SPRINT_SPEED:float = 12.0
-var isSprinting:bool = false
-
-# duh 4: the return of the vengeance 2
+# Jump and fall values
 const JUMP_SPEED:float = 16.0
 var isJumping:bool = false
-
-# TODO: unreal, try to understand that, genius
+# TODO: unreal, we may want to stick that to the physical value
 const GRAVITY:float = -28.0
 
 # Velocity updated continuously by move_and_slide
 var vel:Vector3 = Vector3()
 
+# move_and_slide need that
 const FLOOR_NORMAL:Vector3 = Vector3(0,1,0)
 
-var motion:float = 0
 
 # called by the engine
 func _physics_process(delta):

server/scenes/entities/player/player.tscn → server/entities/characters/player.tscn

 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://scenes/entities/player/player.gd" type="Script" id=1]
+[ext_resource path="res://entities/characters/player.gd" type="Script" id=1]
+
+
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.175, 0.275, 0.7 )

server/icon.png.import

-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

server/scenes/levels/game/game.tscn → server/levels/test/game.tscn

 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://scenes/levels/game/game.gd" type="Script" id=1]
-[ext_resource path="res://scenes/entities/bloc/bloc.tscn" type="PackedScene" id=2]
+[ext_resource path="res://levels/test/game.gd" type="Script" id=1]
+[ext_resource path="res://levels/test/bloc/bloc.tscn" type="PackedScene" id=2]
+
+
 
 [node name="game" type="Spatial"]
 script = ExtResource( 1 )

server/project.godot

@@ -16,12 +16,12 @@ _global_script_class_icons={
 [application]
 
 config/name="server"
-run/main_scene="res://scenes/levels/lobby/lobby.tscn"
+run/main_scene="res://levels/lobby/lobby.tscn"
 config/icon="res://icon.png"
 
 [autoload]
 
-gamestate="*res://scenes/autoloads/gamestate.gd"
+gamestate="*res://autoloads/gamestate.gd"
 
 [rendering]