set loop points for music (fixes #171)
This commit is contained in:
parent
876dabddda
commit
aab9a99f25
22 changed files with 29 additions and 53 deletions
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/BBBBBBBB.ogg-cc9e6a4bb1b385b89207987440a19675.oggstr
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=12.091
|
||||||
|
|
Binary file not shown.
|
@ -1,15 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="ogg_vorbis"
|
|
||||||
type="AudioStreamOGGVorbis"
|
|
||||||
path="res://.import/bumpy_ride.ogg-62ed9ac773150c367bf21b6787de62b2.oggstr"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://audio/music/bumpy_ride.ogg"
|
|
||||||
dest_files=[ "res://.import/bumpy_ride.ogg-62ed9ac773150c367bf21b6787de62b2.oggstr" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
loop=true
|
|
||||||
loop_offset=0
|
|
Binary file not shown.
|
@ -1,15 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="ogg_vorbis"
|
|
||||||
type="AudioStreamOGGVorbis"
|
|
||||||
path="res://.import/burnt_in.ogg-5771350ae6e2877e32aaf932b22c784c.oggstr"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://audio/music/burnt_in.ogg"
|
|
||||||
dest_files=[ "res://.import/burnt_in.ogg-5771350ae6e2877e32aaf932b22c784c.oggstr" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
loop=true
|
|
||||||
loop_offset=0
|
|
BIN
audio/music/burnt_out.ogg
Normal file
BIN
audio/music/burnt_out.ogg
Normal file
Binary file not shown.
15
audio/music/burnt_out.ogg.import
Normal file
15
audio/music/burnt_out.ogg.import
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="ogg_vorbis"
|
||||||
|
type="AudioStreamOGGVorbis"
|
||||||
|
path="res://.import/burnt_out.ogg-330f5bc87b626c0f8fed84e8c4c6a359.oggstr"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://audio/music/burnt_out.ogg"
|
||||||
|
dest_files=[ "res://.import/burnt_out.ogg-330f5bc87b626c0f8fed84e8c4c6a359.oggstr" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
loop=true
|
||||||
|
loop_offset=42.507
|
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/cryokiller.ogg-d287a2f5c24b6c8114a93e405fe3c292.oggs
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=71.924
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="ogg_vorbis"
|
|
||||||
type="AudioStreamOGGVorbis"
|
|
||||||
path="res://.import/cryokiller0.ogg-2bd75e8d9f0865d8cc54c203db8d22fd.oggstr"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://audio/music/cryokiller0.ogg"
|
|
||||||
dest_files=[ "res://.import/cryokiller0.ogg-2bd75e8d9f0865d8cc54c203db8d22fd.oggstr" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
||||||
loop=false
|
|
||||||
loop_offset=0
|
|
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/dusk_park.ogg-66b2f58b4fbcb15fb39169e2ef3dc572.oggst
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=14.25
|
||||||
|
|
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/klystron.ogg-2dce5b1690502308cf909f0b9eda8d99.oggstr
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=6.775
|
||||||
|
|
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/precision_parasite.ogg-48c1edc2a47c76aa62b0460e1c855
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=16.684
|
||||||
|
|
Binary file not shown.
|
@ -12,4 +12,4 @@ dest_files=[ "res://.import/smokestack.ogg-e5ff6f583a64a996a107e20d41fd576d.oggs
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
loop=true
|
loop=true
|
||||||
loop_offset=0
|
loop_offset=10.519
|
||||||
|
|
|
@ -10,6 +10,7 @@ onready var ac_cheat = $CodeEntrySound
|
||||||
onready var ac_boss = $BossSound
|
onready var ac_boss = $BossSound
|
||||||
onready var ac_shard = $ShardSound
|
onready var ac_shard = $ShardSound
|
||||||
onready var ac_pause_music = $PauseMusic
|
onready var ac_pause_music = $PauseMusic
|
||||||
|
onready var ac_looping_music = $LoopingMusic
|
||||||
#Sounds
|
#Sounds
|
||||||
const a_gold = preload("res://audio/sounds/key.wav")
|
const a_gold = preload("res://audio/sounds/key.wav")
|
||||||
const a_arrow = preload("res://audio/sounds/arrow_collect.ogg")
|
const a_arrow = preload("res://audio/sounds/arrow_collect.ogg")
|
||||||
|
@ -40,6 +41,9 @@ const a_shard_results = preload("res://audio/sounds/shard_results.ogg")
|
||||||
const a_fail_shard = preload("res://audio/sounds/fail_shard.ogg")
|
const a_fail_shard = preload("res://audio/sounds/fail_shard.ogg")
|
||||||
const a_final_score = preload("res://audio/sounds/final_score.ogg")
|
const a_final_score = preload("res://audio/sounds/final_score.ogg")
|
||||||
|
|
||||||
|
var loop_section = null
|
||||||
|
var has_looped = false
|
||||||
|
|
||||||
#Plays a sound
|
#Plays a sound
|
||||||
func play_sound(snd,player):
|
func play_sound(snd,player):
|
||||||
player.set_stream(snd)
|
player.set_stream(snd)
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=24]
|
[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=24]
|
||||||
[ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=25]
|
[ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=25]
|
||||||
[ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=26]
|
[ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=26]
|
||||||
[ext_resource path="res://audio/music/burnt_in.ogg" type="AudioStream" id=27]
|
[ext_resource path="res://audio/music/burnt_out.ogg" type="AudioStream" id=27]
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id=2]
|
[sub_resource type="RectangleShape2D" id=2]
|
||||||
extents = Vector2( 24, 20 )
|
extents = Vector2( 24, 20 )
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=28 format=2]
|
[gd_scene load_steps=29 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=1]
|
[ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=1]
|
||||||
[ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
|
[ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
|
||||||
|
@ -13,6 +13,7 @@
|
||||||
[ext_resource path="res://maps/map.gd" type="Script" id=11]
|
[ext_resource path="res://maps/map.gd" type="Script" id=11]
|
||||||
[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12]
|
[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12]
|
||||||
[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13]
|
[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13]
|
||||||
|
[ext_resource path="res://audio/music/BBBBBBBB.ogg" type="AudioStream" id=15]
|
||||||
[ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16]
|
[ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16]
|
||||||
[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17]
|
[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17]
|
||||||
[ext_resource path="res://objects/environment/switches/button.tscn" type="PackedScene" id=19]
|
[ext_resource path="res://objects/environment/switches/button.tscn" type="PackedScene" id=19]
|
||||||
|
@ -48,6 +49,7 @@ animations = [ {
|
||||||
[node name="Map3" type="Node2D" groups=["map"]]
|
[node name="Map3" type="Node2D" groups=["map"]]
|
||||||
pause_mode = 1
|
pause_mode = 1
|
||||||
script = ExtResource( 11 )
|
script = ExtResource( 11 )
|
||||||
|
music = ExtResource( 15 )
|
||||||
|
|
||||||
[node name="Sprite" type="Sprite" parent="."]
|
[node name="Sprite" type="Sprite" parent="."]
|
||||||
position = Vector2( 128, 96 )
|
position = Vector2( 128, 96 )
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue