diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-19 15:49:26 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-19 15:49:31 +0200 |
| commit | 2a7652bca3aad446c61bad40f3a1a269dd854bc7 (patch) | |
| tree | 1000dbbea069f8fd1234aa1c970b1aadc4ab4e28 /client | |
| parent | 26ae3cf1be9749f72c08ec702897c0975f9da4a0 (diff) | |
| download | hurrycurry-2a7652bca3aad446c61bad40f3a1a269dd854bc7.tar hurrycurry-2a7652bca3aad446c61bad40f3a1a269dd854bc7.tar.bz2 hurrycurry-2a7652bca3aad446c61bad40f3a1a269dd854bc7.tar.zst | |
fix effect missing timeout
Diffstat (limited to 'client')
| -rw-r--r-- | client/player/player.gd | 4 | ||||
| -rw-r--r-- | client/settings.gd | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/client/player/player.gd b/client/player/player.gd index 0630e3a3..4c835ff9 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -155,6 +155,6 @@ func text_message(m: String, _timeout_initial: float, timeout_remaining: float): chat_bubble.set_text(m) clear_timer.start(timeout_remaining) -func effect_message(effect_name: String, _timeout_initial: float, timeout_remaining: float): +func effect_message(effect_name: String): effect.set_effect(effect_name) - clear_timer.start(timeout_remaining) + clear_timer.start(5) diff --git a/client/settings.gd b/client/settings.gd index 8c960621..9152c0e4 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -108,23 +108,24 @@ static func apply_initial(): else: change_hooks_apply[key].call() static func h_aa(mode): + var vp = Global.get_viewport() match mode: "disabled": - Global.get_viewport().msaa_2d = Viewport.MSAA_DISABLED - Global.get_viewport().msaa_3d = Viewport.MSAA_DISABLED - Global.get_viewport().screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED + vp.msaa_2d = Viewport.MSAA_DISABLED + vp.msaa_3d = Viewport.MSAA_DISABLED + vp.screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED "fx": - Global.get_viewport().msaa_2d = Viewport.MSAA_DISABLED - Global.get_viewport().msaa_3d = Viewport.MSAA_DISABLED - Global.get_viewport().screen_space_aa = Viewport.SCREEN_SPACE_AA_FXAA + vp.msaa_2d = Viewport.MSAA_DISABLED + vp.msaa_3d = Viewport.MSAA_DISABLED + vp.screen_space_aa = Viewport.SCREEN_SPACE_AA_FXAA "ms2x": - Global.get_viewport().msaa_2d = Viewport.MSAA_2X - Global.get_viewport().msaa_3d = Viewport.MSAA_2X - Global.get_viewport().screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED + vp.msaa_2d = Viewport.MSAA_2X + vp.msaa_3d = Viewport.MSAA_2X + vp.screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED "ms4x": - Global.get_viewport().msaa_2d = Viewport.MSAA_4X - Global.get_viewport().msaa_3d = Viewport.MSAA_4X - Global.get_viewport().screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED + vp.msaa_2d = Viewport.MSAA_4X + vp.msaa_3d = Viewport.MSAA_4X + vp.screen_space_aa = Viewport.SCREEN_SPACE_AA_DISABLED static func h_taa(enabled): Global.get_viewport().use_taa = enabled |