diff --git a/project.godot b/project.godot index 3482ecb..78d0165 100644 --- a/project.godot +++ b/project.godot @@ -26,6 +26,8 @@ gdscript/warnings/unsafe_call_argument=2 [display] +window/size/viewport_width=1280 +window/size/viewport_height=720 window/size/borderless=true window/stretch/aspect="ignore" diff --git a/src/player/shot_setup/club_selector/club_selector.tscn b/src/player/shot_setup/club_selector/club_selector.tscn index 92ed1e6..2e9d85c 100644 --- a/src/player/shot_setup/club_selector/club_selector.tscn +++ b/src/player/shot_setup/club_selector/club_selector.tscn @@ -52,7 +52,7 @@ grow_vertical = 2 script = ExtResource("1_cttgc") [node name="Arc" type="Control" parent="."] -custom_minimum_size = Vector2(200, 200) +custom_minimum_size = Vector2(600, 600) layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -65,10 +65,10 @@ offset_right = 100.0 offset_bottom = 100.0 grow_horizontal = 2 grow_vertical = 2 -pivot_offset = Vector2(100, 100) +pivot_offset = Vector2(300, 300) script = ExtResource("2_vijl7") gap_angle = 0.6 -width = 6.0 +width = 36.0 color = Color(0, 0, 0, 0.392157) [node name="AnimationPlayer" type="AnimationPlayer" parent="Arc"] @@ -98,10 +98,10 @@ anchor_left = 1.0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = 120.0 -offset_top = -17.0 -offset_right = 206.0 -offset_bottom = 17.0 +offset_left = 360.0 +offset_top = -19.5 +offset_right = 461.0 +offset_bottom = 19.5 grow_vertical = 2 pivot_offset = Vector2(0, 20) theme_type_variation = &"ClubSelectLabel" @@ -116,10 +116,10 @@ anchor_left = 1.0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = 120.037 -offset_top = 14.235 -offset_right = 193.037 -offset_bottom = 53.235 +offset_left = 349.378 +offset_top = 79.9975 +offset_right = 422.378 +offset_bottom = 118.998 grow_vertical = 2 scale = Vector2(0.618, 0.618) pivot_offset = Vector2(0, 20) @@ -135,10 +135,10 @@ anchor_left = 1.0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = 110.774 -offset_top = 49.1735 -offset_right = 193.774 -offset_bottom = 83.1735 +offset_left = 311.582 +offset_top = 173.073 +offset_right = 407.582 +offset_bottom = 212.073 grow_vertical = 2 scale = Vector2(0.618, 0.618) pivot_offset = Vector2(0, 20) @@ -154,10 +154,10 @@ anchor_left = 1.0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = 92.9291 -offset_top = 77.8023 -offset_right = 156.929 -offset_bottom = 111.802 +offset_left = 249.701 +offset_top = 251.956 +offset_right = 323.701 +offset_bottom = 290.956 grow_vertical = 2 scale = Vector2(0.618, 0.618) pivot_offset = Vector2(0, 20) @@ -173,10 +173,10 @@ anchor_left = 1.0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = 67.8836 -offset_top = 97.903 -offset_right = 169.884 -offset_bottom = 136.903 +offset_left = 168.473 +offset_top = 310.727 +offset_right = 270.474 +offset_bottom = 349.727 grow_vertical = 2 scale = Vector2(0.618, 0.618) pivot_offset = Vector2(0, 20) diff --git a/src/player/shot_setup/shot_setup.gd b/src/player/shot_setup/shot_setup.gd index 8340e0b..af0a482 100644 --- a/src/player/shot_setup/shot_setup.gd +++ b/src/player/shot_setup/shot_setup.gd @@ -104,7 +104,7 @@ var _returning_free_camera := false @onready var ball_impulse_debug: Node3D = %BallImpulseDebug -@onready var camera_distance := camera.position.z: +@onready var camera_distance := zoom.position.z: set = _set_camera_distance @onready var phys_ball_scene := preload("res://src/player/physics_ball/physics_ball.tscn") @@ -367,9 +367,6 @@ func _process(delta: float) -> void: curve_animation.pause() phase = Phase.DOWNSWING Phase.SHOT: - # REMOVEME - if Input.is_action_just_pressed("camera_forward"): - insert_free_cam() if driving_range and Input.is_action_just_pressed("shot_accept"): phase = Phase.AIM return_ball() diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index 57d5048..93d8d38 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -604,7 +604,7 @@ mouse_filter = 1 [node name="WoahNiceFeedback" type="RichTextLabel" parent="ShotUI"] visible = false -custom_minimum_size = Vector2(700, 0) +custom_minimum_size = Vector2(1200, 0) layout_mode = 1 anchors_preset = -1 anchor_left = 0.5 @@ -619,9 +619,9 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) -theme_override_constants/shadow_offset_y = 2 -theme_override_constants/shadow_offset_x = 3 -theme_override_font_sizes/bold_italics_font_size = 96 +theme_override_constants/shadow_offset_y = 4 +theme_override_constants/shadow_offset_x = 6 +theme_override_font_sizes/bold_italics_font_size = 168 bbcode_enabled = true text = "[center][wave][rainbow][i][b]WOAH NICE[/b][/i][/rainbow][/wave][/center]" fit_content = true @@ -722,7 +722,7 @@ offset_right = 50.0 offset_bottom = 50.0 grow_horizontal = 1 grow_vertical = 1 -pivot_offset = Vector2(-200, 0) +pivot_offset = Vector2(-400, 0) [node name="HUDAnimation" type="AnimationPlayer" parent="ShotUI"] libraries = { diff --git a/src/ui/main_theme.tres b/src/ui/main_theme.tres index 0531677..85f4213 100644 --- a/src/ui/main_theme.tres +++ b/src/ui/main_theme.tres @@ -16,10 +16,10 @@ ClubSelectLabel/base_type = &"Label" ClubSelectLabel/colors/font_color = Color(1, 0.933333, 0.894118, 1) ClubSelectLabel/colors/font_outline_color = Color(0, 0, 0, 1) ClubSelectLabel/colors/font_shadow_color = Color(0, 0, 0, 1) -ClubSelectLabel/constants/outline_size = 2 -ClubSelectLabel/constants/shadow_offset_x = 2 +ClubSelectLabel/constants/outline_size = 6 +ClubSelectLabel/constants/shadow_offset_x = 6 ClubSelectLabel/constants/shadow_offset_y = 0 -ClubSelectLabel/font_sizes/font_size = 28 +ClubSelectLabel/font_sizes/font_size = 84 ClubSelectLabel/fonts/font = SubResource("SystemFont_dpm3o") ShotFeedback/base_type = &"Label" ShotFeedback/colors/font_color = Color(0.807843, 1, 1, 1)