Merge remote-tracking branch 'origin/master' into spencer

godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres

@@ -5,7 +5,7 @@ content_margin_left = 10.0
 content_margin_right = 10.0
 content_margin_top = 10.0
 content_margin_bottom = 10.0
-bg_color = Color( 0.2, 0.23, 0.31, 1 )
+bg_color = Color( 0.03, 0.21, 0.26, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1

godot/dialogic/definitions.json

@@ -21,18 +21,6 @@
 			"type": 0,
 			"value": "false"
 		},
-		{
-			"id": "1667770005-207",
-			"name": "joined meat",
-			"type": 0,
-			"value": "false"
-		},
-		{
-			"id": "1672699872-250",
-			"name": "meat_creek_tutorial_given",
-			"type": 0,
-			"value": "false"
-		},
 		{
 			"id": "1672699752-574",
 			"name": "bb_counter",
@@ -50,6 +38,30 @@
 			"name": "have seen elevator",
 			"type": 0,
 			"value": "false"
+		},
+		{
+			"id": "1672783730-648",
+			"name": "enable_glide",
+			"type": 0,
+			"value": "false"
+		},
+		{
+			"id": "1672699872-250",
+			"name": "meat_creek_tutorial_given",
+			"type": 0,
+			"value": "false"
+		},
+		{
+			"id": "1672784130-787",
+			"name": "meat_bore_tutorial_given",
+			"type": 0,
+			"value": "false"
+		},
+		{
+			"id": "1667770005-207",
+			"name": "joined meat",
+			"type": 0,
+			"value": "false"
 		}
 	]
 }

godot/dialogic/folder_structure.json

@@ -32,7 +32,9 @@
 				"1672699752-574",
 				"1672699872-250",
 				"1672728461-648",
-				"1672730872-648"
+				"1672730872-648",
+				"1672783730-648",
+				"1672784130-787"
 			],
 			"folders": {
 

godot/dialogic/settings.cfg

@@ -26,4 +26,4 @@ canvas_layer=50.0
 
 [QuickTimelineTest]
 
-timeline_file="timeline-1667693704.json"
+timeline_file="timeline-1667764079.json"

godot/dialogic/timelines/timeline-1667667789.json

@@ -4,6 +4,19 @@
 			"event_id": "dialogic_024",
 			"set_theme": "default-theme.cfg"
 		},
+		{
+			"condition": "",
+			"definition": "1672784130-787",
+			"event_id": "dialogic_012",
+			"value": "true"
+		},
+		{
+			"anchor_id": "anchor-1634488067",
+			"event_id": "dialogic_016"
+		},
+		{
+			"event_id": "dialogic_013"
+		},
 		{
 			"condition": "!=",
 			"definition": "1667755202-648",
@@ -22,7 +35,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)"
+			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -46,7 +59,7 @@
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh."
+			"text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh"
 		},
 		{
 			"event_id": "dialogic_013"
@@ -69,13 +82,13 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)"
+			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh."
+			"text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -106,25 +119,25 @@
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples."
+			"text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": " Just walk up to a crew member to collect a neural scan. The lab rats will use it to clone them back on the homeworld."
+			"text": " Just walk up to a crew member to collect a neural scan. The lab rats will use it to clone them back on the homeworld"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too."
+			"text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "That's what the lab rats tell me, anyway."
+			"text": "That's what the lab rats tell me, anyway"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -161,22 +174,108 @@
 			"event_id": "dialogic_013"
 		},
 		{
-			"character": "character-1667667572.json",
+			"definition": "1672784130-787",
-			"event_id": "dialogic_001",
+			"event_id": "dialogic_014",
-			"portrait": "",
+			"operation": "=",
-			"text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain."
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "true"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Word is IngestiCorp will pay top dollar to get her back."
+			"text": "There's one last thing..."
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Don’t make me wait for too long, Stuart. This place gives me the creeps."
+			"text": "Well rookie, do you want me to enable the gliding function on your suit? "
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though"
+		},
+		{
+			"event_id": "dialogic_015",
+			"id": "anchor-1634488067",
+			"index": 0,
+			"name": "glider/briefing"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_010",
+			"options": [
+
+			],
+			"portrait": "",
+			"question": "Still want the glider? The costs are coming out of your end"
+		},
+		{
+			"choice": "Yes",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Fine. Hold (Space)/(R1) to slow your fall. Should make climbing down easier"
+		},
+		{
+			"definition": "1672783730-648",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "true"
+		},
+		{
+			"choice": "No",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Brave. Heh. Well, suit yourself"
+		},
+		{
+			"definition": "1672783730-648",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "false"
+		},
+		{
+			"event_id": "dialogic_013"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Word is IngestiCorp will pay top dollar to get her back"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Don’t make me wait for too long, Stuart. This place gives me the creeps"
 		},
 		{
 			"event_id": "dialogic_022",

godot/dialogic/timelines/timeline-1667764079.json

@@ -8,7 +8,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "[speed=0]Use WASD/Mouse or Joysticks to move and look around\n\nPress Space or R1 to jump and hold Shift or L1 to run\n\nPress F or Y to toggle your flashlight and C or X to toggle your walkie talkie\n\nUse the Arrow Keys or D-pad to select between dialog options and press Enter or A to select"
+			"text": "[speed=0]Use WASD/Mouse or Joysticks to move and look around\n\nPress and hold Space or R1 to jump and glide and hold Shift or L1 to run\n\nPress F or Y to toggle your flashlight and C or X to toggle your walkie talkie\n\nUse the Arrow Keys or D-pad to select between dialog options and press Enter or A to select"
 		}
 	],
 	"metadata": {

godot/dialogic/timelines/timeline-1672725696.json

@@ -26,7 +26,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Looks the the only way out is down...)"
+			"text": "(Looks the the only way to go is down)"
 		},
 		{
 			"character": "",
@@ -38,7 +38,13 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Why do I feel that light in the distance pushing me away?)"
+			"text": "(Why do I feel like something is watching me?)"
+		},
+		{
+			"character": "",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "(I'm not alone)"
 		},
 		{
 			"event_id": "dialogic_013"

godot/player/OnFootPhysics.gd

@@ -46,7 +46,8 @@ func process_velocity(delta: float):
 	# Uses the input from MovementInput to compute and update this node's velocity
 	# velocity_acceleration controls gradual speedup whereas velocity_friction
 	# controls gradual slowdown
-	
+	if Dialogic.get_variable("enable_glide") == "true":
+		can_glide = true
 	# Gravity
 	# You can buffer jumps by pressing releaseing the space bar and then pressing it again
 	if not is_on_floor():

godot/screens/EndScreen_Planet.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2]
 [ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=3]
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=4]
-[ext_resource path="res://tests/test_endscreen_planet/EndMenu.gd" type="Script" id=5]
+[ext_resource path="res://screens/EndMenu.gd" type="Script" id=5]
 [ext_resource path="res://assets/audio/menu_music.ogg" type="AudioStream" id=6]
 [ext_resource path="res://assets/audio/button_press.ogg" type="AudioStream" id=7]
 [ext_resource path="res://assets/ui_theme.tres" type="Theme" id=8]
@@ -22,7 +22,7 @@ tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/keys = PoolRealArray( 0.3, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1, 29.4, 1, 0, -50, 0, -0.707107, 6.18172e-08, 6.18172e-08, 0.707107, 1, 1, 1, 59.2, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1 )
+tracks/0/keys = PoolRealArray( 0, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1, 30, 1, 0, -50, 0, -0.707107, 6.18172e-08, 6.18172e-08, 0.707107, 1, 1, 1, 59.2, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1 )
 
 [sub_resource type="PanoramaSky" id=2]
 panorama = ExtResource( 11 )
@@ -56,8 +56,16 @@ glow_bloom = 1.0
 
 [node name="endscreen_planet" type="Spatial"]
 
+[node name="void" type="OmniLight" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -128.2, 0 )
+light_energy = 300.0
+light_indirect_energy = 300.0
+light_negative = true
+light_specular = 0.0
+omni_range = 30.0
+
 [node name="Camera" type="Camera" parent="."]
-transform = Transform( -0.964225, 0.265085, -2.98023e-08, -2.98023e-08, 0, 1, 0.265085, 0.964225, 0, 0, 50, 0 )
+transform = Transform( -0.964225, 0.265085, 0, 0, 0, 1, 0.265085, 0.964225, 0, 0, 50, 0 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Camera"]
 autoplay = "camera descend"

godot/smooth_icon.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/smooth_icon.png-11111123e491159fd0c2d41967dd2dbc.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://smooth_icon.png"
-dest_files=[ "res://.import/smooth_icon.png-11111123e491159fd0c2d41967dd2dbc.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
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0