Compare commits
No commits in common. "16e10fd007b79c0e2e8539eea73cd190f2c8619a" and "a0a559c4ca4301924a39012787407e3c142871f8" have entirely different histories.
16e10fd007
...
a0a559c4ca
|
|
@ -1,3 +0,0 @@
|
|||
source_md5="0d1325b97cf461ec5ec7808bc913ef42"
|
||||
dest_md5="a023f068c0e8827fb675e4fbbb048cbb"
|
||||
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
source_md5="3a385e14d6eb6923ccf91dd1cb28189d"
|
||||
dest_md5="eb2c9ffbc38a068cbf20a25840d223c7"
|
||||
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
source_md5="396555959e9e945bee2624e8e2a46459"
|
||||
dest_md5="66fc2f88861c6a2cd6edd88297df06de"
|
||||
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
source_md5="e94f463023ac83e135ac0a075d4dca04"
|
||||
dest_md5="14b63a4d8594a89694c3941fd900d484"
|
||||
|
||||
Binary file not shown.
BIN
godot/assets/audio/drones/level1.ogg (Stored with Git LFS)
BIN
godot/assets/audio/drones/level1.ogg (Stored with Git LFS)
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="ogg_vorbis"
|
||||
type="AudioStreamOGGVorbis"
|
||||
path="res://.import/level1.ogg-f0f277926746794903cf4697a70f0e4c.oggstr"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/audio/drones/level1.ogg"
|
||||
dest_files=[ "res://.import/level1.ogg-f0f277926746794903cf4697a70f0e4c.oggstr" ]
|
||||
|
||||
[params]
|
||||
|
||||
loop=true
|
||||
loop_offset=0
|
||||
BIN
godot/assets/audio/drones/level2.ogg (Stored with Git LFS)
BIN
godot/assets/audio/drones/level2.ogg (Stored with Git LFS)
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="ogg_vorbis"
|
||||
type="AudioStreamOGGVorbis"
|
||||
path="res://.import/level2.ogg-6452fe14260edca86c1a236af0796152.oggstr"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/audio/drones/level2.ogg"
|
||||
dest_files=[ "res://.import/level2.ogg-6452fe14260edca86c1a236af0796152.oggstr" ]
|
||||
|
||||
[params]
|
||||
|
||||
loop=true
|
||||
loop_offset=0
|
||||
BIN
godot/assets/audio/drones/level3.ogg (Stored with Git LFS)
BIN
godot/assets/audio/drones/level3.ogg (Stored with Git LFS)
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="ogg_vorbis"
|
||||
type="AudioStreamOGGVorbis"
|
||||
path="res://.import/level3.ogg-18e4672c1d31a79b63f24bf4c382578d.oggstr"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/audio/drones/level3.ogg"
|
||||
dest_files=[ "res://.import/level3.ogg-18e4672c1d31a79b63f24bf4c382578d.oggstr" ]
|
||||
|
||||
[params]
|
||||
|
||||
loop=true
|
||||
loop_offset=0
|
||||
BIN
godot/assets/audio/drones/level4.ogg (Stored with Git LFS)
BIN
godot/assets/audio/drones/level4.ogg (Stored with Git LFS)
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="ogg_vorbis"
|
||||
type="AudioStreamOGGVorbis"
|
||||
path="res://.import/level4.ogg-97d7f319d1a0afd0cc3c7d019cb66d14.oggstr"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/audio/drones/level4.ogg"
|
||||
dest_files=[ "res://.import/level4.ogg-97d7f319d1a0afd0cc3c7d019cb66d14.oggstr" ]
|
||||
|
||||
[params]
|
||||
|
||||
loop=true
|
||||
loop_offset=0
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
extends Area
|
||||
|
||||
|
||||
|
||||
func _on_Area_body_entered(body):
|
||||
if body.get_parent() == Util.player:
|
||||
var d = Dialogic.start("password")
|
||||
add_child(d)
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
extends AudioStreamPlayer
|
||||
|
||||
func _ready():
|
||||
yield(GlobalEventBus, "new_ambient_music_start")
|
||||
stop()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=19 format=2]
|
||||
[gd_scene load_steps=17 format=2]
|
||||
|
||||
[ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=2]
|
||||
|
|
@ -15,8 +15,6 @@
|
|||
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
|
||||
[ext_resource path="res://assets/meat_bore/obelisk_ring.tscn" type="PackedScene" id=14]
|
||||
[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.tscn" type="PackedScene" id=15]
|
||||
[ext_resource path="res://assets/audio/ambient_drone.ogg" type="AudioStream" id=16]
|
||||
[ext_resource path="res://assets/meat_bore/SurfaceAmbientMusic.gd" type="Script" id=17]
|
||||
|
||||
[sub_resource type="Environment" id=3]
|
||||
background_mode = 2
|
||||
|
|
@ -139,9 +137,4 @@ transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0
|
|||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.746, 0 )
|
||||
|
||||
[node name="guy" parent="." instance=ExtResource( 15 )]
|
||||
transform = Transform( 1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, -0.524274, 0.652003, 82.3411 )
|
||||
|
||||
[node name="SurfaceAmbientMusic" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource( 16 )
|
||||
autoplay = true
|
||||
script = ExtResource( 17 )
|
||||
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.524274, 0.652003, 82.3411 )
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,7 +5,6 @@ func _on_AmbientAudioRegion_body_entered(body):
|
|||
return
|
||||
$AmbientAudio.play()
|
||||
$AnimationPlayer.play("fade")
|
||||
GlobalEventBus.emit_signal("new_ambient_music_start")
|
||||
|
||||
|
||||
func _on_AmbientAudioRegion_body_exited(body):
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=2]
|
||||
[gd_scene load_steps=7 format=2]
|
||||
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=2]
|
||||
|
|
@ -6,14 +6,12 @@
|
|||
[ext_resource path="res://assets/meat_bore/Swquish.tscn" type="PackedScene" id=4]
|
||||
[ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.tscn" type="PackedScene" id=5]
|
||||
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=6]
|
||||
[ext_resource path="res://assets/audio/drones/level3.ogg" type="AudioStream" id=7]
|
||||
|
||||
[node name="level_alexis" type="Spatial"]
|
||||
|
||||
[node name="meat_module_3" parent="." instance=ExtResource( 1 )]
|
||||
transform = Transform( -0.341905, 0, -0.939734, 0, 1, 0, 0.939734, 0, -0.341905, 0, -229.622, 0 )
|
||||
texture = ExtResource( 3 )
|
||||
audio = ExtResource( 7 )
|
||||
|
||||
[node name="Swquish" parent="." instance=ExtResource( 4 )]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -247.072, 0 )
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=10 format=2]
|
||||
[gd_scene load_steps=9 format=2]
|
||||
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png" type="Texture" id=2]
|
||||
|
|
@ -6,7 +6,6 @@
|
|||
[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=4]
|
||||
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5]
|
||||
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=6]
|
||||
[ext_resource path="res://assets/audio/drones/level2.ogg" type="AudioStream" id=7]
|
||||
[ext_resource path="res://assets/meat_bore/npcs/inherited/clark.tscn" type="PackedScene" id=8]
|
||||
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
|
||||
|
||||
|
|
@ -29,7 +28,6 @@ shadow_enabled = true
|
|||
[node name="meat_module_2" parent="." instance=ExtResource( 1 )]
|
||||
transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 )
|
||||
texture = ExtResource( 2 )
|
||||
audio = ExtResource( 7 )
|
||||
|
||||
[node name="meatcircle" parent="." instance=ExtResource( 3 )]
|
||||
transform = Transform( -0.0599631, -2.54901, 3.84308, 4.72262, 0.154299, -0.0388896, -0.0780571, 5.51163, 4.34052, 16.0579, -173.995, -14.3824 )
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ transform = Transform( 4.51801e-05, -600, 4.63546e-06, -30.6993, 2.31773e-06, 59
|
|||
script = ExtResource( 6 )
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="Heart_2/Area"]
|
||||
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 0.062, 0, 0, 0 )
|
||||
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 0.085, 0, 0, 0 )
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="black_box" parent="." instance=ExtResource( 9 )]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5]
|
||||
[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=6]
|
||||
[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=7]
|
||||
[ext_resource path="res://assets/audio/drones/level1.ogg" type="AudioStream" id=8]
|
||||
[ext_resource path="res://assets/audio/ambient_drone.ogg" type="AudioStream" id=8]
|
||||
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
|
||||
|
||||
[node name="level_lee" type="Spatial"]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=12 format=2]
|
||||
[gd_scene load_steps=11 format=2]
|
||||
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png" type="Texture" id=2]
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=8]
|
||||
[ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=9]
|
||||
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=10]
|
||||
[ext_resource path="res://assets/audio/drones/level4.ogg" type="AudioStream" id=11]
|
||||
|
||||
[node name="level_wally" type="Spatial"]
|
||||
|
||||
|
|
@ -29,7 +28,6 @@ transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 1.93413, 4.80014, -404.599,
|
|||
[node name="meat_module_4" parent="." instance=ExtResource( 1 )]
|
||||
transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 )
|
||||
texture = ExtResource( 2 )
|
||||
audio = ExtResource( 11 )
|
||||
|
||||
[node name="bridge" parent="." instance=ExtResource( 5 )]
|
||||
transform = Transform( 0.930046, 0, -0.367443, 0, 1, 0, 0.367443, 0, 0.930046, 7.31136, -410.338, 21.682 )
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ shape = SubResource( 1 )
|
|||
[node name="StaticBody" type="StaticBody" parent="."]
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
|
||||
transform = Transform( 0.5, 0, 0, 0, 9.984, 0, 0, 0, 0.5, -0.00283813, 0.00507665, 0.0029031 )
|
||||
transform = Transform( 1, 0, 0, 0, 9.98379, 0, 0, 0, 1, 0, 0, 0 )
|
||||
shape = SubResource( 2 )
|
||||
|
||||
[node name="SignalGenerator" parent="." instance=ExtResource( 1 )]
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ max_wait = 30.0
|
|||
one_shot = true
|
||||
|
||||
[node name="guy" parent="." index="15" instance=ExtResource( 24 )]
|
||||
transform = Transform( -1.49997, 0, -0.0094773, 0, 1.5, 0, 0.0094773, 0, -1.49997, -65.889, 1.74389, -97.945 )
|
||||
transform = Transform( -0.99998, 0, -0.00631814, 0, 1, 0, 0.00631814, 0, -0.99998, -65.889, 1.74389, -97.945 )
|
||||
initial_dialogic_timeline = "guy_creek"
|
||||
|
||||
[node name="dialogue_platform" parent="guy" index="4" instance=ExtResource( 25 )]
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,8 +10,6 @@ func state(is_active: bool):
|
|||
stream_paused = not is_active
|
||||
|
||||
func _process(_delta):
|
||||
if Util.player == null:
|
||||
return
|
||||
unit_db = base_unit_volume - $VolumeControl.volume_subtract
|
||||
var distance = (transform.origin - Util.player.camera_position()).length()
|
||||
GlobalEventBus.emit_signal("player_objective_ping", self, distance)
|
||||
|
|
|
|||
|
|
@ -81,8 +81,7 @@
|
|||
"timeline-1672719153.json",
|
||||
"timeline-1672725696.json",
|
||||
"timeline-1672727997.json",
|
||||
"timeline-1672812380.json",
|
||||
"timeline-1672859304.json"
|
||||
"timeline-1672812380.json"
|
||||
],
|
||||
"folders": {
|
||||
|
||||
|
|
|
|||
|
|
@ -170,19 +170,9 @@
|
|||
"event_id": "dialogic_011",
|
||||
"value": ""
|
||||
},
|
||||
{
|
||||
"anchor_id": "anchor-1634488067",
|
||||
"event_id": "dialogic_016"
|
||||
},
|
||||
{
|
||||
"event_id": "dialogic_013"
|
||||
},
|
||||
{
|
||||
"event_id": "dialogic_015",
|
||||
"id": "anchor-1634488067",
|
||||
"index": 0,
|
||||
"name": "listening"
|
||||
},
|
||||
{
|
||||
"character": "character-1667667711.json",
|
||||
"event_id": "dialogic_001",
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"events": [
|
||||
{
|
||||
"character": "",
|
||||
"event_id": "dialogic_001",
|
||||
"portrait": "",
|
||||
"text": "Password: GHYF12FGXNMQ"
|
||||
}
|
||||
],
|
||||
"metadata": {
|
||||
"dialogic-version": "1.4.5",
|
||||
"file": "timeline-1672859304.json",
|
||||
"name": "password"
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ signal player_entered_meat_sink
|
|||
signal player_exited_meat_sink
|
||||
signal player_walkie_talkie_state_change(is_active)
|
||||
signal player_objective_ping(who, distance)
|
||||
signal new_ambient_music_start
|
||||
|
||||
|
||||
# This is only here to remove warnings about these signals not getting called (they get called by other nodes)
|
||||
func never_called():
|
||||
|
|
@ -13,4 +13,3 @@ func never_called():
|
|||
emit_signal("player_exited_meat_sink")
|
||||
emit_signal("player_walkie_talkie_state_change", false)
|
||||
emit_signal("player_objective_ping", null, 0.0)
|
||||
emit_signal("new_ambient_music_start")
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ func _input(event):
|
|||
if Input.is_action_just_pressed("ui_cancel"):
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||
else:
|
||||
if event is InputEventMouseButton:
|
||||
if event is InputEventMouseButton and Input.is_action_just_pressed("ui_cancel"):
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
|
||||
var look_relative = Vector2(
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ extends Spatial
|
|||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
$blackscreen.visible = false
|
||||
var dialog = Dialogic.start("end")
|
||||
add_child(dialog)
|
||||
$AnimationPlayer.play_backwards("camera pan")
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
#func _process(delta):
|
||||
# pass
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ tracks/0/imported = false
|
|||
tracks/0/enabled = true
|
||||
tracks/0/keys = PoolRealArray( 0, 1, -46.689, 16.1053, -2.91671, 0, -0.707107, 0, 0.707107, 1, 1, 1, 2, 1, -34.2336, 16.1053, -2.91671, 0, -0.707107, 0, 0.707107, 1, 1, 1, 3, 1, -25.3341, 16.1053, -2.91671, -0.183013, -0.683013, -0.183013, 0.683013, 1, 1, 1, 5, 1, -8.57989, 16.1053, -2.91671, -0.430459, -0.560986, -0.430459, 0.560986, 1, 1, 1, 7.5, 1, -8.57989, 9.14282, -2.91671, -0.430459, -0.560986, -0.430459, 0.560986, 1, 1, 1, 10, 1, -8.57989, -34.7238, -2.91671, -0.430459, -0.560985, -0.430459, 0.560985, 1, 1, 1 )
|
||||
tracks/1/type = "value"
|
||||
tracks/1/path = NodePath("blackscreen:modulate")
|
||||
tracks/1/path = NodePath("blackscreen:visible")
|
||||
tracks/1/interp = 1
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/imported = false
|
||||
tracks/1/enabled = true
|
||||
tracks/1/keys = {
|
||||
"times": PoolRealArray( 0.1, 1.8, 10 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ) ]
|
||||
"times": PoolRealArray( 0, 9.8 ),
|
||||
"transitions": PoolRealArray( 1, 2.82843 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
|
||||
[sub_resource type="PanoramaSky" id=2]
|
||||
|
|
@ -74,10 +74,11 @@ script = ExtResource( 5 )
|
|||
transform = Transform( 0, 0, -1, 0, 1, 0, 1, 0, 0, -46.689, 16.1053, -2.91671 )
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||
autoplay = "camera pan"
|
||||
"anims/camera pan" = SubResource( 1 )
|
||||
|
||||
[node name="blackscreen" type="ColorRect" parent="."]
|
||||
modulate = Color( 1, 1, 1, 0 )
|
||||
visible = false
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
mouse_filter = 2
|
||||
|
|
|
|||
Loading…
Reference in New Issue