mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-27 09:50:50 +00:00
Merge branch 'main' into custom-level-loading-rewrite
This commit is contained in:
@@ -14,4 +14,4 @@ dest_files=["res://.godot/imported/Font.fnt-6c6685c58d22178166a8720d2c719ea3.fon
|
||||
|
||||
fallbacks=[]
|
||||
compress=true
|
||||
scaling_mode=2
|
||||
scaling_mode=0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
info face="Font.png" size=16 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0
|
||||
info face="FontLL.png" size=16 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0
|
||||
common lineHeight=16 base=16 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
|
||||
page id=0 file="FontLL.png"
|
||||
page id=1 file="FontGA.png"
|
||||
@@ -370,4 +370,4 @@ char id=12407 x=48 y=192 width=16 height=16 xoffset=0 yoffset=0
|
||||
char id=12493 x=64 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
|
||||
char id=12505 x=80 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
|
||||
char id=12499 x=96 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
|
||||
char id=65374 x=112 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
|
||||
char id=65374 x=112 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
importer="font_data_bmfont"
|
||||
type="FontFile"
|
||||
uid="uid://b8pt2ab0kg0vw"
|
||||
uid="uid://x1bkppv4xsrv"
|
||||
path="res://.godot/imported/FontLL.fnt-b0a4b8976c6dfce9e7529f579de98f07.fontdata"
|
||||
|
||||
[deps]
|
||||
@@ -14,4 +14,4 @@ dest_files=["res://.godot/imported/FontLL.fnt-b0a4b8976c6dfce9e7529f579de98f07.f
|
||||
|
||||
fallbacks=[]
|
||||
compress=true
|
||||
scaling_mode=2
|
||||
scaling_mode=0
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
{
|
||||
"variations": {
|
||||
"SMB1": {"source": "Font.fnt"},
|
||||
"SMBLL": {"source": "FontLL.fnt"}
|
||||
"SMB1": {
|
||||
"source": "Font.fnt"
|
||||
},
|
||||
"SMBLL": {
|
||||
"source": "FontLL.fnt"
|
||||
},
|
||||
"SMBANN": {
|
||||
"link": "SMBLL"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 225 B |
@@ -1,3 +1,40 @@
|
||||
[remap]
|
||||
|
||||
importer="skip"
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c23dqtsno64vk"
|
||||
path="res://.godot/imported/ScoreFont.png-281fa6a3ecebf9e9d4520f2c046dfbdb.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Assets/Sprites/UI/ScoreFont.png"
|
||||
dest_files=["res://.godot/imported/ScoreFont.png-281fa6a3ecebf9e9d4520f2c046dfbdb.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 9.7 KiB |
@@ -31,7 +31,7 @@
|
||||
"Autumn": {"source": "TitleSMBLL.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||
"Beach": {"source": "TitleSMBLL.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||
"Mountain": {"source": "TitleSMBLL.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||
"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
|
||||
"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}}
|
||||
},
|
||||
"SMBANN": {
|
||||
"default": {"source": "TitleSMBANN.png", "rect": [0, 0, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||
@@ -42,7 +42,7 @@
|
||||
"Autumn": {"source": "TitleSMBANN.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||
"Beach": {"source": "TitleSMBANN.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||
"Mountain": {"source": "TitleSMBANN.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||
"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
|
||||
"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c0umucm61jjqs"
|
||||
path="res://.godot/imported/TransitionTemplate.png-5f5be056a088d0b541306876784af78e.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Assets/Sprites/UI/TransitionTemplate.png"
|
||||
dest_files=["res://.godot/imported/TransitionTemplate.png-5f5be056a088d0b541306876784af78e.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Reference in New Issue
Block a user