Commit 8b02b44a authored by Andrew Hayzen's avatar Andrew Hayzen

Merge branch '14-correct-width' into 'master'

Resolve "Correct window width"

Closes #14

See merge request !14
parents b5126587 4809969b
src/assets/ui/boot.png

24.7 KB | W: | H:

src/assets/ui/boot.png

24.7 KB | W: | H:

src/assets/ui/boot.png
src/assets/ui/boot.png
src/assets/ui/boot.png
src/assets/ui/boot.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -7,10 +7,10 @@ path="res://.import/boot.png-537000f4fd1abf4e7188b207a6df7721.stex"
[deps]
source_file="res://assets/ui/boot.png"
source_md5="0405da149c28942be719c782e0dfde43"
source_md5="08831c1f2248b67a770e0428d384a841"
dest_files=[ "res://.import/boot.png-537000f4fd1abf4e7188b207a6df7721.stex" ]
dest_md5="a9f51f640e00a6dcfb653bcb91a825ab"
dest_md5="ba726a6cda3669cc8a83b2e8fac4efbf"
[params]
......
......@@ -9,14 +9,14 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1260"
width="1280"
height="720"
viewBox="0 0 333.37499 190.50001"
viewBox="0 0 338.66666 190.50001"
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
sodipodi:docname="boot.svg"
inkscape:export-filename="/home/andrew/Workspace/Projects/volleyball2d/volleyball2d-godot/splash/boot.png"
inkscape:export-filename="/home/andrew/Workspace/Projects/volleyball2d/volleyball2d-godot/src/assets/ui/boot.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
......@@ -38,7 +38,7 @@
inkscape:showpageshadow="true"
showguides="true"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-height="1025"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
......@@ -65,33 +65,33 @@
transform="translate(0,-106.49998)">
<rect
id="rect10"
width="333.375"
width="338.66666"
height="190.5"
x="-333.375"
x="-338.66666"
y="106.49998"
style="stroke-width:0.56124324;fill:#cccccc;fill-opacity:1"
style="fill:#cccccc;fill-opacity:1;stroke-width:0.56568003"
transform="scale(-1,1)" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.578825px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26447061"
x="91.595535"
x="94.2425"
y="195.83096"
id="text4489"
transform="scale(0.99957408,1.0004261)"><tspan
sodipodi:role="line"
id="tspan4487"
x="91.595535"
x="94.2425"
y="195.83096"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25.39999962px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;stroke-width:0.26447061">Volleyball 2D</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="138.87239"
x="141.51822"
y="218.67696"
id="text4497"><tspan
sodipodi:role="line"
id="tspan4495"
x="138.87239"
x="141.51822"
y="218.67696"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.69999981px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;stroke-width:0.26458332">Loading...</tspan></text>
</g>
......
......@@ -7,10 +7,10 @@ path="res://.import/boot.svg-17189210b9949ece6ba234f5b3438db5.stex"
[deps]
source_file="res://assets/ui/boot.svg"
source_md5="a3d8b959a8c641affa20b413362b4fb1"
source_md5="29373b3bc0e65bffffaad1eb8b10ddec"
dest_files=[ "res://.import/boot.svg-17189210b9949ece6ba234f5b3438db5.stex" ]
dest_md5="b34ffa080d084a0d38b31e3ec1b0f9fa"
dest_md5="6d1be24a9430ce4f7186955fb82a3117"
[params]
......
......@@ -30,7 +30,7 @@ settings/fps/force_fps=60
[display]
window/size/width=1260
window/size/width=1280
window/size/height=720
window/vsync/use_vsync=false
window/stretch/mode="2d"
......
......@@ -8,9 +8,10 @@
[ext_resource path="res://ui/button.tscn" type="PackedScene" id=6]
[ext_resource path="res://ui/pause_popup.tscn" type="PackedScene" id=7]
[node name="game" index="0" instance=ExtResource( 1 )]
[node name="game" instance=ExtResource( 1 )]
script = ExtResource( 2 )
ball_start_player = "player"
[node name="clock" parent="." index="12" instance=ExtResource( 3 )]
......
......@@ -6,7 +6,7 @@
[ext_resource path="res://ui/button.tscn" type="PackedScene" id=4]
[ext_resource path="res://assets/fonts/ubuntu/Ubuntu-M.ttf" type="DynamicFontData" id=5]
[sub_resource type="DynamicFont" id=2]
[sub_resource type="DynamicFont" id=1]
size = 32
use_mipmaps = true
......@@ -14,7 +14,7 @@ use_filter = true
font_data = ExtResource( 5 )
_sections_unfolded = [ "Settings" ]
[sub_resource type="DynamicFont" id=1]
[sub_resource type="DynamicFont" id=2]
size = 32
use_mipmaps = true
......@@ -37,9 +37,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = -630.0
margin_left = -640.0
margin_top = -360.0
margin_right = 630.0
margin_right = 640.0
margin_bottom = 360.0
rect_pivot_offset = Vector2( 0, 0 )
mouse_filter = 1
......@@ -56,7 +56,7 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 630.0
margin_right = 640.0
margin_bottom = 720.0
rect_pivot_offset = Vector2( 0, 0 )
mouse_filter = 0
......@@ -184,7 +184,7 @@ mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
custom_fonts/font = SubResource( 2 )
custom_fonts/font = SubResource( 1 )
text = "Mode description"
align = 1
valign = 1
......@@ -200,8 +200,8 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 630.0
margin_right = 1260.0
margin_left = 640.0
margin_right = 1280.0
margin_bottom = 720.0
rect_pivot_offset = Vector2( 0, 0 )
mouse_filter = 0
......@@ -209,6 +209,7 @@ mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 3
color = Color( 0, 0, 0, 0.25 )
_sections_unfolded = [ "Rect" ]
[node name="label" type="Label" parent="container/right" index="0"]
......@@ -224,7 +225,7 @@ mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 0
custom_fonts/font = SubResource( 1 )
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 1, 1, 1, 1 )
text = "Help Text"
align = 1
......
......@@ -8,7 +8,7 @@
[ext_resource path="res://components/boundary.tscn" type="PackedScene" id=6]
[ext_resource path="res://components/ball.tscn" type="PackedScene" id=7]
[node name="game" type="Node2D" index="0"]
[node name="game" type="Node2D"]
script = ExtResource( 1 )
......@@ -29,7 +29,7 @@ texture = ExtResource( 3 )
[node name="boundary_left" parent="." index="2" instance=ExtResource( 4 )]
position = Vector2( -640, -440 )
position = Vector2( -650, -440 )
rotation = 1.5708
scale = Vector2( 8, 1 )
friction = 0.0
......@@ -45,7 +45,7 @@ _sections_unfolded = [ "Transform" ]
[node name="boundary_right" parent="." index="4" instance=ExtResource( 4 )]
position = Vector2( 640, -440 )
position = Vector2( 650, -440 )
rotation = 1.5708
scale = Vector2( 8, 1 )
friction = 0.0
......
......@@ -12,7 +12,7 @@ use_filter = true
font_data = ExtResource( 2 )
_sections_unfolded = [ "Font", "Settings" ]
[node name="pause_popup" type="Popup" index="0"]
[node name="pause_popup" type="Popup"]
pause_mode = 2
anchor_left = 0.0
......@@ -35,9 +35,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = -630.0
margin_left = -640.0
margin_top = -360.0
margin_right = 630.0
margin_right = 640.0
margin_bottom = 360.0
rect_pivot_offset = Vector2( 0, 0 )
mouse_filter = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment