Skip to content

Commit

Permalink
Ok this is probably the last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
CrusherNotDrip committed Jul 28, 2024
1 parent a137fb4 commit b20531c
Show file tree
Hide file tree
Showing 19 changed files with 194 additions and 225 deletions.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

<haxelib name="hxcpp-debug-server" if="debug"/>
<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />

<!-- ______________________________ Haxedefines _____________________________ -->

<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
Expand Down
2 changes: 1 addition & 1 deletion assets/shared/characters/bf-dead-funny.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
-27
],
"camera_position": [
0,
-350,
0
],

Expand Down
110 changes: 58 additions & 52 deletions assets/shared/characters/gb-angrier.json
Original file line number Diff line number Diff line change
@@ -1,85 +1,91 @@
{
"animations": [
{
"anim": "idle",
"name": "Idle",
"fps": 24,
"loop": false,
"indices": [],
"offsets": [
0,
0
]
},
{
"anim": "singLEFT",
"name": "left",
"fps": 24,
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"offsets": [
29,
-1
]
"name": "Idle"
},
{
"anim": "singDOWN",
"name": "down",
"fps": 24,
"offsets": [
29,
-2
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"indices": [],
"offsets": [
-21,
-22
]
"name": "left"
},
{
"anim": "singUP",
"name": "up",
"fps": 24,
"offsets": [
-22,
-22
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"indices": [],
"name": "down"
},
{
"offsets": [
15,
14,
23
]
],
"loop": false,
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "up"
},
{
"anim": "singRIGHT",
"name": "right",
"fps": 24,
"offsets": [
-27,
-1
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "right"
},
{
"offsets": [
-26,
-1
]
0,
0
],
"indices": [
10,
11,
12,
13
],
"fps": 24,
"anim": "idle-loop",
"loop": true,
"name": "Idle"
}
],
"image": "characters/ANGRYgb",
"scale": 1,
"sing_duration": 6.1,
"healthicon": "gb-angry",

"vocals_file": "gb",
"no_antialiasing": false,
"image": "characters/gameboy_really_angry",
"position": [
16,
21,
170
],
"healthicon": "gb-angry",
"flip_x": false,
"camera_position": [
-34,
-40,
-3
],

"flip_x": false,
"no_antialiasing": false,
"vocals_file": "gb",

"note_colors": [
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"],
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"]
],

"sing_duration": 6.1,
"scale": 1,
"_editor_isPlayer": false
}
114 changes: 54 additions & 60 deletions assets/shared/characters/gb-angry.json
Original file line number Diff line number Diff line change
@@ -1,91 +1,85 @@
{
"animations": [
{
"anim": "idle",
"name": "Idle",
"fps": 24,
"loop": false,
"indices": [],
"offsets": [
0,
0
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"name": "Idle"
]
},
{
"offsets": [
29,
-2
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"name": "left",
"fps": 24,
"loop": false,
"indices": [],
"name": "left"
"offsets": [
18,
-3
]
},
{
"offsets": [
-22,
-22
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"name": "down",
"fps": 24,
"loop": false,
"indices": [],
"name": "down"
"offsets": [
-3,
-20
]
},
{
"offsets": [
14,
23
],
"loop": false,
"fps": 24,
"anim": "singUP",
"name": "up",
"fps": 24,
"loop": false,
"indices": [],
"name": "up"
"offsets": [
-15,
14
]
},
{
"offsets": [
-27,
-1
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"name": "right",
"fps": 24,
"loop": false,
"indices": [],
"name": "right"
},
{
"offsets": [
0,
0
],
"indices": [
10,
11,
12,
13
],
"fps": 24,
"anim": "idle-loop",
"loop": true,
"name": "Idle"
-39,
-3
]
}
],
"vocals_file": "gb",
"no_antialiasing": false,
"image": "characters/gameboy_really_angry",
"image": "characters/ANGRYgb",
"scale": 1,
"sing_duration": 6.1,
"healthicon": "gb-angry",

"position": [
21,
170
14,
173
],
"healthicon": "gb-angry",
"flip_x": false,
"camera_position": [
-40,
-3
-32,
-6
],
"sing_duration": 6.1,
"scale": 1,

"flip_x": false,
"no_antialiasing": false,
"vocals_file": "gb",

"note_colors": [
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"],
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"]
],

"_editor_isPlayer": false
}
40 changes: 0 additions & 40 deletions assets/shared/data/chillin/events.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,6 @@
"0.54"
]
]
],
[
86181.8181818182,
[
[
"Countdown",
"0",
""
]
]
],
[
86454.5454545455,
[
[
"Countdown",
"1",
""
]
]
],
[
86727.2727272727,
[
[
"Countdown",
"2",
""
]
]
],
[
87000,
[
[
"Countdown",
"3",
""
]
]
]
]
}
Expand Down
Binary file modified assets/shared/images/characters/ANGRYgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b20531c

Please sign in to comment.