Skip to content

Commit 8bad22f

Browse files
authored
Merge pull request #130 from open531/dev
1.0
2 parents cbf5510 + 4e88d72 commit 8bad22f

File tree

405 files changed

+18333
-844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

405 files changed

+18333
-844
lines changed

.editorconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
6+
[*.cs]
7+
indent_style = space
8+
indent_size = 4
9+
tab_width = 4
10+
max_line_length = 120
11+
12+
end_of_line = lf
13+
14+
trim_trailing_whitespace = true
15+
16+
insert_final_newline = true

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Godot 4+ specific ignores
22
.godot/
3+
.vs/
4+
.vscode/
5+
.idea/
36

47
# User-specific files
58
*.rsuser
@@ -393,4 +396,7 @@ FodyWeavers.xsd
393396
*.msp
394397

395398
# JetBrains Rider
396-
*.sln.iml
399+
*.sln.iml
400+
401+
# Godot translations
402+
*.translation

Assets/Fonts/misaki.ttf

2.63 MB
Binary file not shown.

assets/font/unifont-15.1.04.otf.import renamed to Assets/Fonts/misaki.ttf.import

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
importer="font_data_dynamic"
44
type="FontFile"
5-
uid="uid://c0a5kxaol5r04"
6-
path="res://.godot/imported/unifont-15.1.04.otf-a5988475523633e8abb003ea548dba29.fontdata"
5+
uid="uid://nce21325vqkq"
6+
path="res://.godot/imported/misaki.ttf-e92e86412c189e3f9a7c2b56eb6beb74.fontdata"
77

88
[deps]
99

10-
source_file="res://assets/font/unifont-15.1.04.otf"
11-
dest_files=["res://.godot/imported/unifont-15.1.04.otf-a5988475523633e8abb003ea548dba29.fontdata"]
10+
source_file="res://Assets/Fonts/misaki.ttf"
11+
dest_files=["res://.godot/imported/misaki.ttf-e92e86412c189e3f9a7c2b56eb6beb74.fontdata"]
1212

1313
[params]
1414

File renamed without changes.

assets/font/unifont_jp-15.1.04.otf.import renamed to Assets/Fonts/unifont.otf.import

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
importer="font_data_dynamic"
44
type="FontFile"
5-
uid="uid://svnkdy31m7r4"
6-
path="res://.godot/imported/unifont_jp-15.1.04.otf-62a21d44154a0b7f7c8731bf6cb340a5.fontdata"
5+
uid="uid://qqmej6jrh1to"
6+
path="res://.godot/imported/unifont.otf-20b67674c13f6078a5f97102e8318d85.fontdata"
77

88
[deps]
99

10-
source_file="res://assets/font/unifont_jp-15.1.04.otf"
11-
dest_files=["res://.godot/imported/unifont_jp-15.1.04.otf-62a21d44154a0b7f7c8731bf6cb340a5.fontdata"]
10+
source_file="res://Assets/Fonts/unifont.otf"
11+
dest_files=["res://.godot/imported/unifont.otf-20b67674c13f6078a5f97102e8318d85.fontdata"]
1212

1313
[params]
1414

File renamed without changes.

Assets/Fonts/unifont_jp.otf.import

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[remap]
2+
3+
importer="font_data_dynamic"
4+
type="FontFile"
5+
uid="uid://b0vwe2pdwku64"
6+
path="res://.godot/imported/unifont_jp.otf-ebf58bdc035386b8a5c96d6686740d3d.fontdata"
7+
8+
[deps]
9+
10+
source_file="res://Assets/Fonts/unifont_jp.otf"
11+
dest_files=["res://.godot/imported/unifont_jp.otf-ebf58bdc035386b8a5c96d6686740d3d.fontdata"]
12+
13+
[params]
14+
15+
Rendering=null
16+
antialiasing=1
17+
generate_mipmaps=false
18+
multichannel_signed_distance_field=false
19+
msdf_pixel_range=8
20+
msdf_size=48
21+
allow_system_fallback=true
22+
force_autohinter=false
23+
hinting=1
24+
subpixel_positioning=1
25+
oversampling=0.0
26+
Fallbacks=null
27+
fallbacks=[]
28+
Compress=null
29+
compress=true
30+
preload=[]
31+
language_support={}
32+
script_support={}
33+
opentype_features={}

Assets/Images/apartment.png

139 KB
Loading

assets/texture/tiny_town.png.import renamed to Assets/Images/apartment.png.import

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
importer="texture"
44
type="CompressedTexture2D"
5-
uid="uid://d4nypx6v78oc3"
6-
path="res://.godot/imported/tiny_town.png-21323645b94c52615834b70843f93bd5.ctex"
5+
uid="uid://jicluqahkywb"
6+
path="res://.godot/imported/apartment.png-14974b2a9e08173c5418b04ab0071dcd.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://assets/texture/tiny_town.png"
14-
dest_files=["res://.godot/imported/tiny_town.png-21323645b94c52615834b70843f93bd5.ctex"]
13+
source_file="res://Assets/Images/apartment.png"
14+
dest_files=["res://.godot/imported/apartment.png-14974b2a9e08173c5418b04ab0071dcd.ctex"]
1515

1616
[params]
1717

0 commit comments

Comments
 (0)