diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-02 00:59:21 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-02 00:59:21 +0200 |
| commit | 9cffa5019b017045b7dbdf6577c89b70b8a11a50 (patch) | |
| tree | 2a274bb7a446dc9400731da4b8851aaff6393495 | |
| parent | 5fde584021fa0d073d068ab7edde44aff6098bed (diff) | |
| parent | b9fb88e52c5351392882bc0b470108da9d41d3a9 (diff) | |
| download | hurrycurry-9cffa5019b017045b7dbdf6577c89b70b8a11a50.tar hurrycurry-9cffa5019b017045b7dbdf6577c89b70b8a11a50.tar.bz2 hurrycurry-9cffa5019b017045b7dbdf6577c89b70b8a11a50.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/map/map.gd | 8 | ||||
| -rw-r--r-- | client/map/progress.gdshader | 7 | ||||
| -rw-r--r-- | client/player/onscreen_controls/controls.gd | 4 | ||||
| -rw-r--r-- | client/player/onscreen_controls/controls.tscn | 5 |
4 files changed, 15 insertions, 9 deletions
diff --git a/client/map/map.gd b/client/map/map.gd index 092a488a..f711c603 100644 --- a/client/map/map.gd +++ b/client/map/map.gd @@ -44,10 +44,10 @@ func gi_bake_blocking(): var extent_min = Vector2(0,0) var extent_max = Vector2(0,0) for e in tile_by_pos.values(): - extent_min.x = min(extent_min.x, e[0].x) - extent_min.y = min(extent_min.y, e[0].y) - extent_max.x = max(extent_max.x, e[0].x) - extent_max.y = max(extent_max.y, e[0].y) + extent_min.x = min(extent_min.x, e[0].x) - 0.5 + extent_min.y = min(extent_min.y, e[0].y) - 0.5 + extent_max.x = max(extent_max.x, e[0].x) + 0.5 + extent_max.y = max(extent_max.y, e[0].y) + 0.5 var center = (extent_max + extent_min) / 2 var size = extent_max - extent_min diff --git a/client/map/progress.gdshader b/client/map/progress.gdshader index 6e0d06ba..9567bcac 100644 --- a/client/map/progress.gdshader +++ b/client/map/progress.gdshader @@ -1,6 +1,7 @@ /* Undercooked - a game about cooking Copyright 2024 nokoe + Copyright 2024 tpart This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +17,21 @@ */ shader_type spatial; +render_mode unshaded; uniform float progress = 0.; uniform bool bad = false; void fragment() { - vec3 color = vec3(0., 1., 0.); + vec3 color = vec3(0., .5, 0.); float alpha_fac = 1.; if (bad) { color = vec3(1., 0., 0.); alpha_fac = sin(TIME * 15.) * .5 + 1.; } if (UV.x > progress) { - ALPHA = 0.1; + ALPHA = 1.; + color = vec3(0.1, 0.1, 0.1); } ALPHA *= alpha_fac; ALBEDO = color; diff --git a/client/player/onscreen_controls/controls.gd b/client/player/onscreen_controls/controls.gd index 395f6665..be7fe67e 100644 --- a/client/player/onscreen_controls/controls.gd +++ b/client/player/onscreen_controls/controls.gd @@ -16,8 +16,8 @@ extends CanvasLayer @onready var buttons = $Buttons -@onready var boost = $Control/Boost -@onready var interact = $Control/Interact +@onready var boost = $Buttons/Boost +@onready var interact = $Buttons/Interact @onready var modulate_color = $MovementStick.pressed_color func _ready(): diff --git a/client/player/onscreen_controls/controls.tscn b/client/player/onscreen_controls/controls.tscn index 960a48b1..53acc922 100644 --- a/client/player/onscreen_controls/controls.tscn +++ b/client/player/onscreen_controls/controls.tscn @@ -9,8 +9,11 @@ script = ExtResource("1_rnoki") [node name="MovementStick" parent="." instance=ExtResource("1_4k4lh")] +modulate = Color(1, 1, 1, 0.752941) +joystick_mode = 1 [node name="Buttons" type="Control" parent="."] +modulate = Color(1, 1, 1, 0.752941) layout_mode = 3 anchors_preset = 3 anchor_left = 1.0 @@ -28,7 +31,7 @@ scale = Vector2(0.5, 0.5) texture_normal = ExtResource("2_i4ife") [node name="Interact" type="TouchScreenButton" parent="Buttons"] -position = Vector2(0, 150) +position = Vector2(150, 150) scale = Vector2(0.5, 0.5) texture_normal = ExtResource("3_37rne") |