Compare commits

..

No commits in common. "728f37803be883280645c24c9f0a6e2637a27012" and "fc8c1e47b6569458c7a3b7238a2155b469422a27" have entirely different histories.

39 changed files with 11 additions and 2523 deletions

BIN
blends/BlackBoxSlime.png (Stored with Git LFS)

Binary file not shown.

BIN
blends/BlackBoxSlime_darker.png (Stored with Git LFS)

Binary file not shown.

BIN
blends/black_box.blend (Stored with Git LFS)

Binary file not shown.

BIN
blends/levels/creek_platform.blend (Stored with Git LFS)

Binary file not shown.

BIN
blends/obelisk.blend (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +0,0 @@
source_md5="a291f16572ab02002000d168ed14140e"
dest_md5="6a599a6d5d3497b7c20e1029f92c98ad"

View File

@ -1,3 +0,0 @@
source_md5="76aa7c061d857a105d2a57cd14fba893"
dest_md5="4df56ba844a0547939a8bbaee6370f59"

View File

@ -1,10 +1,10 @@
extends AudioStreamPlayer
export var base_volume: float = -15.0
export var base_volume: float = -7.0
export var base_pitch: float = 1.0
export var submerged_volume: float = 5.0
export var submerged_volume: float = 10.0
export var submerged_pitch: float = 0.75
export var pit_volume: float = 2
export var pit_volume: float = 0
export var pit_pitch: float = 0.25
func _ready():

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=2]
[gd_scene load_steps=21 format=2]
[ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
@ -18,8 +18,6 @@
[ext_resource path="res://assets/audio/walkie_talkie/buzz_static.ogg" type="AudioStream" id=16]
[ext_resource path="res://assets/audio/walkie_talkie/low_whale_one.ogg" type="AudioStream" id=17]
[ext_resource path="res://assets/meat_creek/WhaleSounds.gd" type="Script" id=18]
[ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=19]
[ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20]
[sub_resource type="PanoramaSky" id=2]
panorama = ExtResource( 4 )
@ -168,28 +166,6 @@ max_wait = 30.0
[node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"]
one_shot = true
[node name="black_box0" parent="." index="12" instance=ExtResource( 19 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -41.0261, 1.80736, -111.427 )
[node name="black_box1" parent="." index="13" instance=ExtResource( 19 )]
transform = Transform( -0.222825, 0, 0.974859, 0, 1, 0, -0.974859, 0, -0.222825, -35.7068, 1.76987, -64.4388 )
id = 1
[node name="black_box2" parent="." index="14" instance=ExtResource( 19 )]
transform = Transform( 0.473566, 0, -0.880759, 0, 1, 0, 0.880759, 0, 0.473566, 44.7662, 0.822734, -12.0992 )
id = 2
[node name="black_box3" parent="." index="15" instance=ExtResource( 19 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.0576, 3.21833, 30.1744 )
id = 3
[node name="black_box4" parent="." index="16" instance=ExtResource( 19 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.60433, -122.797, -43.5648 )
id = 4
[node name="obelisk" parent="." index="17" instance=ExtResource( 20 )]
transform = Transform( -0.0547934, 0, 0.998498, 0, 1, 0, -0.998498, 0, -0.0547934, 66.6986, 6.79926, -61.306 )
[connection signal="finished" from="AmbientSounds/BottomWhale1" to="AmbientSounds/BottomWhale1" method="_on_sound_finished"]
[connection signal="timeout" from="AmbientSounds/BottomWhale1/Timer" to="AmbientSounds/BottomWhale1" method="_on_Timer_timeout"]
[connection signal="finished" from="AmbientSounds/BottomWhale2" to="AmbientSounds/BottomWhale2" method="_on_sound_finished"]

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,17 +0,0 @@
extends Spatial
export var id: int
func _on_Area_body_entered(body: Node):
if body.get_parent() != Util.player:
return
SavedDialogueProgress.find_blackbox(id)
var ping = get_node_or_null("SignalGenerator")
if ping != null:
ping.destroy()
func _on_Area_body_exited(body):
if body.get_parent() != Util.player:
return
SavedDialogueProgress.hide_blackbox_dialogue(id)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,55 +0,0 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://assets/models/black_box/black_box.glb" type="PackedScene" id=1]
[ext_resource path="res://assets/audio/walkie_talkie/talk.ogg" type="AudioStream" id=2]
[ext_resource path="res://assets/models/walkie_talkie/signal_generator.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/models/black_box/black_box.gd" type="Script" id=4]
[sub_resource type="SphereShape" id=1]
[sub_resource type="Animation" id=2]
resource_name = "Grow"
length = 1.54167
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Blackbox:blend_shapes/Grow")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0.0416667, 0.0833333, 0.125, 0.166667, 0.208333, 0.25, 0.291667, 0.333333, 0.375, 0.416667, 0.458333, 0.5, 0.541667, 0.583333, 0.625, 0.666667, 0.708333, 0.75, 0.791667, 0.833333, 0.875, 0.916667, 0.958333, 1, 1.04167, 1.08333, 1.125, 1.16667, 1.20833, 1.25, 1.29167, 1.33333, 1.375, 1.41667, 1.45833, 1.5, 1.54167 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
"update": 0,
"values": [ 0.0, 0.00725, 0.028, 0.06075, 0.104, 0.15625, 0.216, 0.28175, 0.352, 0.42525, 0.5, 0.57475, 0.648, 0.71825, 0.784, 0.84375, 0.896, 0.93925, 0.972, 0.99275, 1.0, 0.98877, 0.957031, 0.907715, 0.84375, 0.768066, 0.683594, 0.593262, 0.5, 0.406738, 0.316406, 0.231934, 0.15625, 0.0922852, 0.0429688, 0.0112305, 0.0 ]
}
[node name="black_box" instance=ExtResource( 1 )]
script = ExtResource( 4 )
[node name="Blackbox" parent="." index="0"]
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
blend_shapes/Grow = 0.471218
[node name="StaticBody" type="StaticBody" parent="Blackbox" index="0"]
[node name="CollisionShape" type="CollisionShape" parent="Blackbox/StaticBody" index="0"]
transform = Transform( 2.5, 0, 0, 0, 10, 0, 0, 0, 2.5, 0, 0.592816, 0 )
shape = SubResource( 1 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Blackbox" index="1"]
root_node = NodePath("../..")
autoplay = "Grow"
anims/Grow = SubResource( 2 )
[node name="SignalGenerator" parent="." index="1" instance=ExtResource( 3 )]
stream = ExtResource( 2 )
[node name="Area" type="Area" parent="." index="3"]
[node name="CollisionShape" type="CollisionShape" parent="Area" index="0"]
transform = Transform( 4, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0.592816, 0 )
shape = SubResource( 1 )
[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
[connection signal="body_exited" from="Area" to="." method="_on_Area_body_exited"]

Binary file not shown.

BIN
godot/assets/models/obelisk/obelisk.glb (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,3 +0,0 @@
extends Node
export var volume_subtract: int = 0.0

View File

@ -1,20 +1,11 @@
extends AudioStreamPlayer3D
onready var base_unit_volume: int = unit_db
func _ready():
var _ignore = GlobalEventBus.connect("player_walkie_talkie_state_change", self, "state")
func state(is_active: bool):
stream_paused = not is_active
func _process(_delta):
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)
func destroy():
if not $AnimationPlayer.is_playing():
$AnimationPlayer.play("fade_away")

View File

@ -1,61 +1,8 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/models/walkie_talkie/signal_generator.gd" type="Script" id=1]
[ext_resource path="res://assets/models/walkie_talkie/VolumeControl.gd" type="Script" id=2]
[sub_resource type="Animation" id=1]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("VolumeControl:volume_subtract")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 0 ]
}
[sub_resource type="Animation" id=2]
resource_name = "fade_away"
length = 6.0
tracks/0/type = "value"
tracks/0/path = NodePath("VolumeControl:volume_subtract")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 6 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 1,
"values": [ 0, -50 ]
}
tracks/1/type = "method"
tracks/1/path = NodePath(".")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 6 ),
"transitions": PoolRealArray( 1 ),
"values": [ {
"args": [ ],
"method": "queue_free"
} ]
}
[node name="SignalGenerator" type="AudioStreamPlayer3D"]
autoplay = true
stream_paused = true
script = ExtResource( 1 )
[node name="VolumeControl" type="Node" parent="."]
script = ExtResource( 2 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/RESET = SubResource( 1 )
anims/fade_away = SubResource( 2 )

View File

@ -1,21 +0,0 @@
{
"color": "#ffffffff",
"description": "",
"display_name": "",
"display_name_bool": false,
"id": "character-1672267793.json",
"mirror_portraits": false,
"name": "Blackbox",
"nickname": "",
"nickname_bool": false,
"offset_x": 0,
"offset_y": 0,
"portraits": [
{
"name": "Default",
"path": ""
}
],
"scale": 100,
"theme": ""
}

View File

@ -11,8 +11,7 @@
"character-1667667675.json",
"character-1667667693.json",
"character-1667667711.json",
"character-1667767751.json",
"character-1672267793.json"
"character-1667767751.json"
],
"folders": {
@ -62,12 +61,7 @@
"timeline-1667671061.json",
"timeline-1667673517.json",
"timeline-1667693704.json",
"timeline-1667764079.json",
"timeline-1672265563.json",
"timeline-1672267820.json",
"timeline-1672267850.json",
"timeline-1672267872.json",
"timeline-1672267892.json"
"timeline-1667764079.json"
],
"folders": {

View File

@ -1,15 +0,0 @@
{
"events": [
{
"character": "character-1672267793.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "You found blackbox 0"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672265563.json",
"name": "blackbox_0"
}
}

View File

@ -1,15 +0,0 @@
{
"events": [
{
"character": "character-1672267793.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "You found blackbox 1"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672267820.json",
"name": "blackbox_1"
}
}

View File

@ -1,15 +0,0 @@
{
"events": [
{
"character": "character-1672267793.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "You found blackbox 2"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672267850.json",
"name": "blackbox_2"
}
}

View File

@ -1,15 +0,0 @@
{
"events": [
{
"character": "character-1672267793.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "You found blackbox 3"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672267872.json",
"name": "blackbox_3"
}
}

View File

@ -1,15 +0,0 @@
{
"events": [
{
"character": "character-1672267793.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "You found blackbox 4"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672267892.json",
"name": "blackbox_4"
}
}

View File

@ -31,11 +31,7 @@ dof_blur_near_distance = 1.33
dof_blur_near_amount = 0.66
dof_blur_near_quality = 2
glow_enabled = true
glow_intensity = 1.0
glow_strength = 0.76
glow_bloom = 1.0
glow_blend_mode = 0
glow_high_quality = true
[node name="WorldEnvironment" type="WorldEnvironment"]
environment = SubResource( 3 )

View File

@ -1,7 +1,7 @@
extends Node
var objective_who: WeakRef = weakref(null)
var objective_distance: float = 999999999999999.0
var objective_distance: float = 0.0
func _ready():
var _ignored = GlobalEventBus.connect("player_objective_ping", self, "update_objective_distance")

View File

@ -121,6 +121,5 @@ func decrease_velocity_factor(by: Vector3):
func _physics_process(delta):
process_velocity(delta)
# velocity = move_and_slide(velocity, Vector3.UP, true, 4, 1.3217304764)
velocity = move_and_slide(velocity, Vector3.UP, true, 4)
velocity = move_and_slide(velocity, Vector3.UP, true, 4, 1.3217304764)
process_falling()

View File

@ -87,7 +87,6 @@ config/icon="res://icon.png"
Util="*res://util.gd"
GlobalEventBus="*res://global_event_bus.gd"
SavedDialogueProgress="*res://saved_dialogue_progress.gd"
[display]

View File

@ -1,29 +0,0 @@
extends Node
var found_blackbox_count = 0
var found_blackboxes = []
var blackbox_dialogues = []
func find_blackbox(id: int):
if found_blackboxes.size() < (id+1):
found_blackboxes.resize(id+1)
blackbox_dialogues.resize(id+1)
if not found_blackboxes[id]:
found_blackboxes[id] = true
found_blackbox_count += 1
var dialog
if blackbox_dialogues[id] == null or blackbox_dialogues[id].get_ref() == null:
dialog = Dialogic.start("blackbox_" + str(id))
blackbox_dialogues[id] = weakref(dialog)
else:
dialog = blackbox_dialogues[id].get_ref()
get_tree().root.add_child(dialog)
func hide_blackbox_dialogue(id: int):
if blackbox_dialogues[id] == null or blackbox_dialogues[id].get_ref() == null:
return
var dialog = blackbox_dialogues[id].get_ref()
if get_tree().root.is_a_parent_of(dialog):
get_tree().root.remove_child(dialog)

View File

@ -1,32 +0,0 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2]
[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=4]
[sub_resource type="CubeMesh" id=1]
[sub_resource type="ConcavePolygonShape" id=2]
data = PoolVector3Array( -1, 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1 )
[node name="Spatial" type="Spatial"]
[node name="Player" parent="." instance=ExtResource( 1 )]
[node name="WorldEnvironment" parent="." instance=ExtResource( 3 )]
[node name="shader" parent="." instance=ExtResource( 2 )]
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 26.5765, 0, 0, 0, 1, 0, 0, 0, 60.3427, 0, -1.1977, -45.0648 )
mesh = SubResource( 1 )
skeleton = NodePath("../shader")
[node name="StaticBody" type="StaticBody" parent="MeshInstance"]
[node name="CollisionShape" type="CollisionShape" parent="MeshInstance/StaticBody"]
shape = SubResource( 2 )
[node name="black_box" parent="." instance=ExtResource( 4 )]
transform = Transform( 0.183677, 0, -0.982987, 0, 1, 0, 0.982987, 0, 0.183677, 0, -0.23726, -10.6352 )

BIN
meatpics/downscaled/oldmeat.jpg (Stored with Git LFS)

Binary file not shown.