Skip to content

Commit

Permalink
Merge pull request #587 from Wolfy76700:game/merfight
Browse files Browse the repository at this point in the history
MERFIGHT: Added assets for Jiro, Clamilton
  • Loading branch information
Wolfy76700 authored Nov 1, 2024
2 parents f9d0d13 + 03662d5 commit 087f76e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion games/merfight/base_files/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
"name": "MerFight: Curse of the Arctic Prince",
"smashgg_game_id": 44194,
"stage_to_codename": {},
"version": "1.02"
"version": "1.1"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion games/merfight/base_files/icon/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"type": [
"icon"
],
"version": "1.0"
"version": "1.1"
}
Binary file added games/merfight/full/Clamilton_Art_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added games/merfight/full/Jiro_Art_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion games/merfight/full/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"full"
],
"credits": "",
"version": "1.02",
"version": "1.1",
"eyesights": {
"Arctina": {
"0": {
Expand Down Expand Up @@ -80,6 +80,18 @@
"x": 223,
"y": 158
}
},
"Jiro": {
"0": {
"x": 379,
"y": 201
}
},
"Clamilton": {
"0": {
"x": 637,
"y": 176
}
}
},
"uncropped_edge": [
Expand Down

0 comments on commit 087f76e

Please sign in to comment.