Merge branch 'main' of https://git.squog.ru/TaggedEngine/TaggedEngine
8
.gitignore
vendored
@ -1,4 +1,10 @@
|
||||
.vscode
|
||||
|
||||
|
||||
settings.json
|
||||
<<<<<<< HEAD
|
||||
settings.json
|
||||
=======
|
||||
|
||||
settings.json
|
||||
settings.json
|
||||
>>>>>>> 77b988b12d6638bf3085a33f181f082b2b93ef1a
|
||||
|
@ -134,8 +134,8 @@
|
||||
"no_antialiasing": false,
|
||||
"image": "sprites/characters/Monster_Assets",
|
||||
"position": [
|
||||
0,
|
||||
100
|
||||
-200,
|
||||
200
|
||||
],
|
||||
"healthicon": "monster",
|
||||
"flip_x": false,
|
||||
@ -145,7 +145,7 @@
|
||||
110
|
||||
],
|
||||
"camera_position": [
|
||||
150,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"sing_duration": 4,
|
||||
|
BIN
images/ui/bad.png
Normal file
After Width: | Height: | Size: 5.9 KiB |
BIN
images/ui/combo.png
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
images/ui/good.png
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
images/ui/num0.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
images/ui/num1.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
images/ui/num2.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
images/ui/num3.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
images/ui/num4.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
images/ui/num5.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
images/ui/num6.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
images/ui/num7.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
images/ui/num8.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
images/ui/num9.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
images/ui/shit.png
Normal file
After Width: | Height: | Size: 8.2 KiB |
BIN
images/ui/sick.png
Normal file
After Width: | Height: | Size: 9.6 KiB |
6
log.log
@ -5,8 +5,14 @@ No chart file
|
||||
No chart file
|
||||
No chart file
|
||||
Is chart file
|
||||
<<<<<<< HEAD
|
||||
No chart file
|
||||
Is chart file
|
||||
No chart file
|
||||
No chart file
|
||||
=======
|
||||
Is chart file
|
||||
Is chart file
|
||||
Is chart file
|
||||
>>>>>>> 77b988b12d6638bf3085a33f181f082b2b93ef1a
|
||||
Is chart file
|