Merge branch 'master' into objective

README.md

@@ -19,6 +19,7 @@ Ideas for characters:
 - More active
   - Blink (Tracer) - no cooldown, but loses all speed on hitting walls
   - Heavy guy - Slow, but very heavy for the see-saw
+  - Flying, of course
 - More supportive
   - Merge - combines with someone to boost their speed
   - Boost - Area of effect or zarya-like cast, speeds people up

bootstrap.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import os
+
+if os.path.exists("project.godot"):
+	# Update
+	os.system("git pull")
+	os.system("godot")
+else:
+	# Initial download
+	os.system("git clone --depth 1 https://github.com/CosineGaming/nv-moba .")
+	os.system("godot")

plans.md

@@ -0,0 +1,9 @@
+Big ideas:
+
+Smaller TODOs:
+- Make see-saw not as buggy
+  - Do we need to return players to being rigidbodies? we probably do for that see-saw but i don't wanna :(
+
+When you have a workable demo: @mention @turion@mastodon.art
+
+

scenes/player.tscn

@@ -97,6 +97,8 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
+text = "+"
+align = 1
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1

scripts/heroes/0.gd

@@ -1,7 +1,13 @@
 extends "res://scripts/player.gd"
 
-const wallride_speed = 0.5
+const wallride_speed = 0
 const wallride_speed_necessary = 15
+const wallride_leap_height = 10
+const wallride_leap_side = 10
+
+var since_on_wall = 0
+var last_wall_normal = Vector3()
+var wallride_forgiveness = .150
 
 func control_player(delta):
 	wallride(delta)
@@ -9,15 +15,16 @@ func control_player(delta):
 
 func wallride(delta):
 	# If our feet aren't touching, but we are colliding, we are wall-riding
-	if is_on_wall() and velocity.length() > wallride_speed_necessary:
+	if is_on_wall() and not is_on_floor() and velocity.length() > wallride_speed_necessary:
+		since_on_wall = 0
+		last_wall_normal = get_slide_collision(0).normal
+	else:
+		since_on_wall += delta
+	if since_on_wall < wallride_forgiveness:
 		var aim = get_node("Yaw").get_global_transform().basis
-		var direction = Vector3()
-		if Input.is_action_pressed("move_forwards"):
-			direction -= aim[2]
-		if Input.is_action_pressed("move_backwards"):
-			direction += aim[2]
-		velocity += direction * wallride_speed
+		# Add zero gravity
 		velocity.y = -gravity # So it's undone in super
-	else:
-		pass
-		# We need to return to falling (we aren't riding anymore)
+		# Allow jumping (for wall hopping!)
+		if Input.is_action_just_pressed("jump"):
+			velocity.y += wallride_leap_height
+			velocity += wallride_leap_side * last_wall_normal

scripts/player.gd

@@ -8,9 +8,7 @@ var view_sensitivity = 0.25
 var yaw = 0
 var pitch = 0
 
-const air_accel = 0.02
-
-var gravity = -1
+var gravity = -.8
 var velocity = Vector3()
 slave var slave_tf = Basis()
 slave var slave_vel = Vector3()
@@ -20,12 +18,15 @@ var timer = 0
 # Walking speed and jumping height are defined later.
 var walk_speed = 3
 var jump_speed = 15
+const air_accel = .5
 
 var weight = 1
 var health = 100
 var stamina = 10000
 var ray_length = 10
 
+var debug_node
+
 
 func _ready():
 	set_process_input(true)
@@ -33,21 +34,20 @@ func _ready():
 	# Capture mouse once game is started:
 	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 
-	#set_physics_process(true)
-	get_node("Crosshair").set_text("+")
-	
+	debug_node = get_node("/root/world/Debug")
+
 	if is_network_master():
 		get_node("Yaw/Camera").make_current()
 
 func _input(event):
 	if is_network_master():
-		
+
 		if event is InputEventMouseMotion:
 			yaw = fmod(yaw - event.relative.x * view_sensitivity, 360)
 			pitch = max(min(pitch - event.relative.y * view_sensitivity, 85), -85)
 			get_node("Yaw").set_rotation(Vector3(0, deg2rad(yaw), 0))
 			get_node("Yaw/Camera").set_rotation(Vector3(deg2rad(pitch), 0, 0))
-	
+
 		# Toggle mouse capture:
 		if Input.is_action_pressed("toggle_mouse_capture"):
 			if (Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED):
@@ -56,7 +56,7 @@ func _input(event):
 			else:
 				Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 				view_sensitivity = 0.25
-	
+
 		# Quit the game:
 		if Input.is_action_pressed("quit"):
 			quit()
@@ -87,8 +87,7 @@ func control_player(delta):
 		direction += aim[0]
 
 	direction = direction.normalized()
-	var ray = get_node("Ray")
-	
+
 	var friction
 
 	if is_on_floor():
@@ -108,13 +107,15 @@ func control_player(delta):
 		velocity.z *= friction
 		velocity.y += gravity
 		velocity += direction * air_accel
-	
+
 	# Just for testing TODO
 	if Input.is_action_pressed("jump"):
 		velocity.y += jump_speed * 0.1
 
-	move_and_slide(velocity, Vector3(0, 1, 0))
-	
+	debug_node.set_text("%8.f,%8.f,%8.f" % [velocity.x, velocity.y, velocity.z])
+
+	velocity = move_and_slide(velocity, Vector3(0, 1, 0))
+
 	for i in range(get_slide_count()):
 		var collision = get_slide_collision(i)
 		if collision.collider.is_in_group("objective"):