Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Visual upgrade + code changes #56

Merged
merged 27 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
39e84fb
visual upgrade + code refactor
b7g Jun 27, 2022
3c6a21f
reversed api readme change
b7g Jun 27, 2022
270dd52
translation keycode changed
Numenter Jun 28, 2022
3d157b8
changed overlooked keycodes
Numenter Jun 28, 2022
86ed6c1
Merge pull request #1 from Numenter/translations
b7g Jun 28, 2022
8b1208a
Remove white square while keeping blur shader
RedstoneMedia Jun 28, 2022
503e925
replaced splash video with scene + highscore when needed + bug fixes
b7g Jun 28, 2022
4c41424
Merge branch 'next-level-visual' into next-level-visual-fix-issues
RedstoneMedia Jun 28, 2022
d380483
Changed forgotten TextureRect to a ColorRect
RedstoneMedia Jun 28, 2022
24d8e9d
fixed crash when game ends
b7g Jun 28, 2022
f7c7e23
Merge pull request #3 from RedstoneMedia/next-level-visual-fix-issues
b7g Jun 28, 2022
07b944b
fixed crash when sorting by last played
b7g Jun 28, 2022
c8aa52a
reversed _games to dictionary
b7g Jun 28, 2022
f6dce23
fixed api typo + capitalized button text + handled tween warnings
b7g Jun 28, 2022
9db82fb
don’t forget to format/lint b7g
b7g Jun 28, 2022
d1f999d
tweens simplified
Numenter Jun 28, 2022
58f6059
Merge pull request #4 from Numenter/logo-splash-simplified
b7g Jun 28, 2022
4ebc1a9
Added themes to counteract to many theme overrides
RedstoneMedia Jun 29, 2022
8def3fc
fixed some problems with the themes
b7g Jun 30, 2022
555e856
Merge pull request #3 from b7g/theme-fixes
RedstoneMedia Jun 30, 2022
f7190bb
Merge pull request #5 from RedstoneMedia/next-level-visual-fix-issues
b7g Jun 30, 2022
7a47dbd
made time formatting more precise
b7g Jun 30, 2022
96415f6
why does b7g always forget to lint
b7g Jun 30, 2022
dcd84ac
fixed sort by last_played crash
b7g Jun 30, 2022
331cc7d
thinking about it … actually no … more like this
b7g Jun 30, 2022
8e271ad
mainly scene restructurdicting Next level visual fix (#6)
ASecondGuy Jul 2, 2022
ad5e6f3
lint
b7g Jul 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added game/app/images/alpha_pixel_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions game/app/images/alpha_pixel_1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/alpha_pixel_1.png-22cac7682bfdb021c302c5a6fb592fe1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://app/images/alpha_pixel_1.png"
dest_files=[ "res://.import/alpha_pixel_1.png-22cac7682bfdb021c302c5a6fb592fe1.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added game/app/images/cogwheel_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions game/app/images/cogwheel_16.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/cogwheel_16.png-1a53f86a71bc0c4d5cc0e0fac3594f02.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://app/images/cogwheel_16.png"
dest_files=[ "res://.import/cogwheel_16.png-1a53f86a71bc0c4d5cc0e0fac3594f02.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added game/app/images/cross_40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions game/app/images/cross_40.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/cross_40.png-5d266cee772eaa15ad3622643b58093f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://app/images/cross_40.png"
dest_files=[ "res://.import/cross_40.png-5d266cee772eaa15ad3622643b58093f.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added game/app/images/plus_40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions game/app/images/plus_40.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/plus_40.png-063b268a2450fac1945025127ed10902.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://app/images/plus_40.png"
dest_files=[ "res://.import/plus_40.png-063b268a2450fac1945025127ed10902.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added game/app/images/suffragium_badge_36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions game/app/images/suffragium_badge_36.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/suffragium_badge_36.png-08c5e1b714d735780b3fec7c879efe03.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://app/images/suffragium_badge_36.png"
dest_files=[ "res://.import/suffragium_badge_36.png-08c5e1b714d735780b3fec7c879efe03.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
59 changes: 59 additions & 0 deletions game/app/pause_menu/pause_menu.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
extends CanvasLayer

signal pause_menu_opened
signal pause_menu_closed

onready var _main := $Control


func _ready():
_main.hide()


func _input(event: InputEvent):
if !event is InputEventKey:
return
if !event.is_action_pressed("ui_cancel"):
return
if event.is_echo():
return

if _is_open():
_unpause()
else:
_pause()
get_tree().set_input_as_handled()


func _pause():
_main.show()
GameManager.pause_game()
emit_signal("pause_menu_opened")
get_tree().paused = true


func _unpause():
_main.hide()
emit_signal("pause_menu_closed")
get_tree().paused = false
GameManager.unpause_game()


func _is_open() -> bool:
return _main.visible


func _on_ButtonResume_pressed():
_unpause()


func _on_ButtonRestart_pressed():
_unpause()
GameManager.restart_game()
queue_free()


func _on_ButtonMenu_pressed():
_unpause()
GameManager.end_game()
queue_free()
71 changes: 71 additions & 0 deletions game/app/pause_menu/pause_menu.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
[gd_scene load_steps=5 format=2]

[ext_resource path="res://app/style/theme_game_card.tres" type="Theme" id=1]
[ext_resource path="res://app/shader/blur.shader" type="Shader" id=2]
[ext_resource path="res://app/pause_menu/pause_menu.gd" type="Script" id=4]

[sub_resource type="ShaderMaterial" id=3]
shader = ExtResource( 2 )
shader_param/amount = 2.0

[node name="PauseMenu" type="CanvasLayer"]
pause_mode = 2
layer = 128
script = ExtResource( 4 )

[node name="Control" type="Control" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 1 )

[node name="BlurShader" type="ColorRect" parent="Control"]
material = SubResource( 3 )
anchor_right = 1.0
anchor_bottom = 1.0

[node name="ColorRect" type="ColorRect" parent="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
color = Color( 0, 0, 0, 0.501961 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="CC" type="CenterContainer" parent="Control"]
anchor_right = 1.0
anchor_bottom = 1.0

[node name="VC" type="VBoxContainer" parent="Control/CC"]
margin_left = 432.0
margin_top = 226.0
margin_right = 592.0
margin_bottom = 374.0
custom_constants/separation = 8

[node name="Label" type="Label" parent="Control/CC/VC"]
margin_right = 160.0
margin_bottom = 19.0
text = "T_PAUSED"
align = 1

[node name="ButtonResume" type="Button" parent="Control/CC/VC"]
margin_top = 27.0
margin_right = 160.0
margin_bottom = 62.0
text = "T_RESUME"

[node name="ButtonRestart" type="Button" parent="Control/CC/VC"]
margin_top = 70.0
margin_right = 160.0
margin_bottom = 105.0
text = "T_RESTART"

[node name="ButtonMenu" type="Button" parent="Control/CC/VC"]
margin_top = 113.0
margin_right = 160.0
margin_bottom = 148.0
text = "T_BACK_TO_MENU"

[connection signal="pressed" from="Control/CC/VC/ButtonResume" to="." method="_on_ButtonResume_pressed"]
[connection signal="pressed" from="Control/CC/VC/ButtonRestart" to="." method="_on_ButtonRestart_pressed"]
[connection signal="pressed" from="Control/CC/VC/ButtonMenu" to="." method="_on_ButtonMenu_pressed"]
Loading