Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
To Do Break Down
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
breakdown
To Do Break Down
Commits
1273f66e
Commit
1273f66e
authored
Jan 30, 2022
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Animated 2nd cutscene, added some pauses in dialogue scrolling
parent
b331f2bc
Changes
16
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
1502 additions
and
207 deletions
+1502
-207
arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.md5
...arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.md5
+3
-0
arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.stex
...rrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.stex
+0
-0
arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.md5
...row-white-normal.png-9453be373a2334317ffab878e1f09d77.md5
+3
-0
arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.stex
...ow-white-normal.png-9453be373a2334317ffab878e1f09d77.stex
+0
-0
arrow-white.png-e40516500a134d00ac7ed373fae1e04f.md5
.import/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.md5
+3
-0
arrow-white.png-e40516500a134d00ac7ed373fae1e04f.stex
...ort/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.stex
+0
-0
Cutscene 0.tscn
Cutscenes/Cutscene 0.tscn
+401
-198
Cutscene 1.gd
Cutscenes/Cutscene 1.gd
+13
-8
Cutscene 1.tscn
Cutscenes/Cutscene 1.tscn
+976
-1
Multi.tscn
Multi.tscn
+1
-0
arrow-white-down.png
assets/Thesis Clickables/arrow-white-down.png
+0
-0
arrow-white-down.png.import
assets/Thesis Clickables/arrow-white-down.png.import
+34
-0
arrow-white-normal.png
assets/Thesis Clickables/arrow-white-normal.png
+0
-0
arrow-white-normal.png.import
assets/Thesis Clickables/arrow-white-normal.png.import
+34
-0
arrow-white.png
assets/Thesis Clickables/arrow-white.png
+0
-0
arrow-white.png.import
assets/Thesis Clickables/arrow-white.png.import
+34
-0
No files found.
.import/arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.md5
0 → 100644
View file @
1273f66e
source_md5="1e5f3486c88a3a69614494030bc71cbb"
dest_md5="d63aec24860e71faa4f62a1ad08534e7"
.import/arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.stex
0 → 100644
View file @
1273f66e
File added
.import/arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.md5
0 → 100644
View file @
1273f66e
source_md5="1610a4a4b09e481f5df32438806e351b"
dest_md5="c779826651db892f89678d9e7372a5f2"
.import/arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.stex
0 → 100644
View file @
1273f66e
File added
.import/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.md5
0 → 100644
View file @
1273f66e
source_md5="c80d144a24c3d389e7f0563832d8c18f"
dest_md5="5599e0d7d722c92cdb834d7c8783255e"
.import/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.stex
0 → 100644
View file @
1273f66e
File added
Cutscenes/Cutscene 0.tscn
View file @
1273f66e
This diff is collapsed.
Click to expand it.
Cutscenes/Cutscene 1.gd
View file @
1273f66e
extends StaticBody2D
extends StaticBody2D
onready var sceneProgress = 0
onready var sceneProgress = 0
onready var
dialogueBox = get_parent().get_node("Dialogue
")
onready var
anim = get_parent().get_node("Animator
")
onready
var tracking = false
export(bool)
var tracking = false
# Called when the node enters the scene tree for the first time.
# Called when the node enters the scene tree for the first time.
func _ready():
func _ready():
...
@@ -11,25 +11,30 @@ func _input(event): # executes when clicked on
...
@@ -11,25 +11,30 @@ func _input(event): # executes when clicked on
if event is InputEventMouseButton:
if event is InputEventMouseButton:
if event.button_index == BUTTON_LEFT and event.pressed:
if event.button_index == BUTTON_LEFT and event.pressed:
if tracking:
if tracking:
dialogueBox.text = getDialogue
()
getShot
()
func get
Dialogue
():
func get
Shot
():
match sceneProgress:
match sceneProgress:
0:
0:
anim.play("Shot 1")
sceneProgress += 1
sceneProgress += 1
return "Dialogue 2"
1:
1:
anim.play("Shot 2")
sceneProgress += 1
sceneProgress += 1
return "Dialogue 3"
2:
2:
anim.play("Shot 2.5")
sceneProgress += 1
sceneProgress += 1
return "Dialogue 4"
3:
3:
anim.play("Shot 3")
sceneProgress += 1
4:
anim.play("Shot 4")
sceneProgress += 1
5:
sceneProgress = 0
sceneProgress = 0
get_parent().queue_free() # dont need that scene anymore
get_parent().queue_free() # dont need that scene anymore
tracking = false
tracking = false
print("Deleting scene 1")
print("Deleting scene 1")
return ""
func start():
func start():
...
...
Cutscenes/Cutscene 1.tscn
View file @
1273f66e
This diff is collapsed.
Click to expand it.
Multi.tscn
View file @
1273f66e
...
@@ -598,6 +598,7 @@ __meta__ = {
...
@@ -598,6 +598,7 @@ __meta__ = {
z_index = 2
z_index = 2
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
visible = false
[node name="1" parent="Cutscenes" instance=ExtResource( 15 )]
[node name="1" parent="Cutscenes" instance=ExtResource( 15 )]
visible = false
visible = false
...
...
assets/Thesis Clickables/arrow-white-down.png
0 → 100644
View file @
1273f66e
2.9 KB
assets/Thesis Clickables/arrow-white-down.png.import
0 → 100644
View file @
1273f66e
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/arrow-white-down.png"
dest_files=[ "res://.import/arrow-white-down.png-5a7b436d0963c0253563aa10a28c2de2.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
assets/Thesis Clickables/arrow-white-normal.png
0 → 100644
View file @
1273f66e
2.89 KB
assets/Thesis Clickables/arrow-white-normal.png.import
0 → 100644
View file @
1273f66e
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/arrow-white-normal.png"
dest_files=[ "res://.import/arrow-white-normal.png-9453be373a2334317ffab878e1f09d77.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
assets/Thesis Clickables/arrow-white.png
0 → 100644
View file @
1273f66e
2.92 KB
assets/Thesis Clickables/arrow-white.png.import
0 → 100644
View file @
1273f66e
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/arrow-white.png"
dest_files=[ "res://.import/arrow-white.png-e40516500a134d00ac7ed373fae1e04f.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment