j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic

Browse Source
This commit is contained in:
John 2021-11-23 22:44:59 -06:00
commit 5bf690c779
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.md5
View File

@ -1,3 +1,3 @@
source_md5="0c3b093adc89f8510e8a21974e8bd791" source_md5="005f64fb1ff8de71218d3545cc20441c"
dest_md5="7a852f2b077030872d047aaa67ad1ee9" dest_md5="dcee8e0391b5bffbc76299f1b93a1100"

BIN
godot_ship/.import/splash_image.png-6121c2cee560834f4965fe53dd93125b.stex
View File

Binary file not shown.

3
godot_ship/.import/splash_image.png-f3ec9b087a00e67c0fd1d6f7f949a801.md5 Normal file
View File

@ -0,0 +1,3 @@
source_md5="a177b00b79bd7412a6b0c6aa07f5020b"
dest_md5="2bf8d94b2316e0d5b19647de6827b854"

BIN
godot_ship/.import/splash_image.png-f3ec9b087a00e67c0fd1d6f7f949a801.stex Normal file
View File

Binary file not shown.

BIN
godot_ship/assets/backgrounds/splash_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

12
godot_ship/scenes/Credits.tscn
View File

@ -59,10 +59,12 @@ __meta__ = {
[node name="Developmental Team" type="Label" parent="."] [node name="Developmental Team" type="Label" parent="."]
margin_left = 64.0 margin_left = 64.0
margin_top = 104.0 margin_top = 99.0
margin_right = 576.0 margin_right = 576.0
margin_bottom = 120.0 margin_bottom = 115.0
custom_fonts/font = SubResource( 2 ) custom_fonts/font = SubResource( 2 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_y = 4
text = "Developmental Team" text = "Developmental Team"
align = 1 align = 1
valign = 1 valign = 1
@ -180,10 +182,12 @@ __meta__ = {
[node name="Assets" type="Label" parent="."] [node name="Assets" type="Label" parent="."]
margin_left = 64.0 margin_left = 64.0
margin_top = 208.0 margin_top = 203.0
margin_right = 576.0 margin_right = 576.0
margin_bottom = 224.0 margin_bottom = 219.0
custom_fonts/font = SubResource( 2 ) custom_fonts/font = SubResource( 2 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_y = 4
text = "Assets" text = "Assets"
align = 1 align = 1
valign = 1 valign = 1