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

godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5

@@ -0,0 +1,3 @@
+source_md5="b0989b0b32639e93e7bb9de031cc630c"
+dest_md5="c7494eb2c4518e849d04bd411a623706"
+

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.03, 0.21, 0.26, 1 )
+bg_color = Color( 0.2, 0.23, 0.31, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1

godot/assets/audio/squirrel.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr"
+
+[deps]
+
+source_file="res://assets/audio/squirrel.ogg"
+dest_files=[ "res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

godot/assets/meat_bore/meat_module/meat_module.tscn

@@ -24,7 +24,7 @@ tracks/0/keys = {
 "times": PoolRealArray( 0, 3 ),
 "transitions": PoolRealArray( 1, 1 ),
 "update": 0,
-"values": [ -50.0, 0.0 ]
+"values": [ -50.0, 20.0 ]
 }
 
 [node name="meat_module" instance=ExtResource( 1 )]

godot/dialogic/settings.cfg

@@ -27,4 +27,4 @@ canvas_layer=50.0
 
 [QuickTimelineTest]
 
-timeline_file="timeline-1672875631.json"
+timeline_file="timeline-1672859304.json"

godot/dialogic/timelines/timeline-1667668097.json

@@ -1,11 +1,5 @@
 {
 	"events": [
-		{
-			"condition": "!=",
-			"definition": "1667703692-648",
-			"event_id": "dialogic_012",
-			"value": "true"
-		},
 		{
 			"event_id": "dialogic_024",
 			"set_theme": "theme-1671745159.cfg"
@@ -56,47 +50,20 @@
 			"event_id": "dialogic_024",
 			"set_theme": "theme-1671748561.cfg"
 		},
+		{
+			"block_input": true,
+			"event_id": "dialogic_050",
+			"wait_time": 0
+		},
 		{
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Initializing...)"
+			"text": "initializing..."
 		},
 		{
-			"definition": "1667703692-648",
+			"change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
-			"event_id": "dialogic_014",
+			"event_id": "dialogic_041"
-			"operation": "=",
-			"random_upper_limit": 100,
-			"set_random": false,
-			"set_value": "true"
-		},
-		{
-			"change_timeline": "timeline-1672719153.json",
-			"event_id": "dialogic_020"
-		},
-		{
-			"event_id": "dialogic_022",
-			"transition_duration": 1
-		},
-		{
-			"event_id": "dialogic_013"
-		},
-		{
-			"condition": "",
-			"definition": "1667703692-648",
-			"event_id": "dialogic_012",
-			"value": "true"
-		},
-		{
-			"change_timeline": "timeline-1672719153.json",
-			"event_id": "dialogic_020"
-		},
-		{
-			"event_id": "dialogic_022",
-			"transition_duration": 1
-		},
-		{
-			"event_id": "dialogic_013"
 		}
 	],
 	"metadata": {

godot/dialogic/timelines/timeline-1672719153.json

@@ -13,6 +13,17 @@
 			"portrait": "",
 			"question": ""
 		},
+		{
+			"choice": "Chapter 0- Intro",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"change_scene": "res://screens/Intro.tscn",
+			"event_id": "dialogic_041"
+		},
 		{
 			"choice": "Chapter 1- Black Boxes",
 			"condition": "",

godot/dialogic/timelines/timeline-1672859304.json

@@ -18,6 +18,14 @@
 			"file": "res://assets/audio/synthsparkle.wav",
 			"volume": 0
 		},
+		{
+			"audio": "play",
+			"audio_bus": "Master",
+			"event_id": "dialogic_030",
+			"event_name": "AudioEvent",
+			"file": "res://assets/audio/squirrel.ogg",
+			"volume": 0
+		},
 		{
 			"character": "character-1672875775.json",
 			"event_id": "dialogic_001",

godot/dialogic/timelines/timeline-1672875631.json

@@ -34,12 +34,6 @@
 			"event_id": "dialogic_001",
 			"portrait": "",
 			"text": "I never want to leave..."
-		},
-		{
-			"character": "",
-			"event_id": "dialogic_001",
-			"portrait": "",
-			"text": "I wonder what's at the top?"
 		}
 	],
 	"metadata": {

godot/project.godot

@@ -94,6 +94,8 @@ _global_script_class_icons={
 
 config/name="meat_madness_redux"
 run/main_scene="res://screens/TitleScreen_Planet.tscn"
+boot_splash/show_image=false
+boot_splash/bg_color=Color( 0, 0, 0, 1 )
 config/icon="res://meat_madness_icon.png"
 
 [autoload]

godot/screens/Intro.gd

@@ -0,0 +1,4 @@
+extends Control
+
+func _ready():
+	add_child(Dialogic.start("intro"))

godot/screens/Intro.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://screens/Intro.gd" type="Script" id=1]
+[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2]
+
+[node name="Intro" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+
+[node name="ColorRect" type="ColorRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+color = Color( 0, 0, 0, 1 )
+
+[node name="shader" parent="." instance=ExtResource( 2 )]

godot/screens/TitleMenu.gd

@@ -8,7 +8,7 @@ func _on_PlayButton_pressed():
 	$BlackoutSound.play()
 	$ButtonContainer.visible = false
 	$BlackoutScreen.visible = true
-	var dialog = Dialogic.start("intro")
+	var dialog = Dialogic.start("chapterselect")
 	add_child(dialog)
 
 func _on_Credits_pressed():