Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MSX] Some weapons and other things #2130

Merged
merged 45 commits into from
Sep 13, 2023
+0 −5
Merged

[MSX] Some weapons and other things #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
fc3725e
Create .gitkeep
gettingusedto Sep 12, 2023
9bdbd95
Add files via upload
gettingusedto Sep 12, 2023
7525d24
Delete gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/.gitkeep
gettingusedto Sep 12, 2023
766875c
Create .gitkeep
gettingusedto Sep 12, 2023
6426ea6
Add files via upload
gettingusedto Sep 12, 2023
b611cf0
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/tr…
gettingusedto Sep 12, 2023
5230f11
Create .gitkeep
gettingusedto Sep 12, 2023
a05ce6a
Add files via upload
gettingusedto Sep 12, 2023
f3fbf3e
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 12, 2023
d890121
Create .gitkeep
gettingusedto Sep 12, 2023
743ff1f
Add files via upload
gettingusedto Sep 12, 2023
2234c72
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/.gitkeep
gettingusedto Sep 12, 2023
fcbcfe0
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/shillelag…
gettingusedto Sep 12, 2023
b6aa0de
Create .gitkeep
gettingusedto Sep 12, 2023
e40053c
Add files via upload
gettingusedto Sep 12, 2023
96a7572
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/shillelagh/.gitkeep
gettingusedto Sep 12, 2023
68d7c5b
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge.png
gettingusedto Sep 12, 2023
fabf43c
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge_heavy.png
gettingusedto Sep 12, 2023
e05ec02
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge_short.png
gettingusedto Sep 12, 2023
d14156c
Add files via upload
gettingusedto Sep 12, 2023
bedafdc
Add files via upload
gettingusedto Sep 12, 2023
4b108aa
Add files via upload
gettingusedto Sep 12, 2023
a2b571a
Create .gitkeep
gettingusedto Sep 12, 2023
89eca74
Add files via upload
gettingusedto Sep 12, 2023
cd45b82
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/worn/bando…
gettingusedto Sep 12, 2023
589bb21
Add files via upload
gettingusedto Sep 12, 2023
24b6474
Add files via upload
gettingusedto Sep 12, 2023
19d000b
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/18…
gettingusedto Sep 12, 2023
1656636
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 13, 2023
df75b9b
Update overlay_wielded_hexenhammer_0.json
gettingusedto Sep 13, 2023
94e2bd5
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/18…
gettingusedto Sep 13, 2023
ea3739a
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 13, 2023
b84697a
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/21…
gettingusedto Sep 13, 2023
acde7d6
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 13, 2023
b34899a
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 13, 2023
1eafbe9
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/ov…
gettingusedto Sep 13, 2023
a74c923
Create .gitkeep
gettingusedto Sep 13, 2023
aa90bd5
Add files via upload
gettingusedto Sep 13, 2023
330cd40
Merge branch 'I-am-Erk:master' into some-weapons-and-other-things
gettingusedto Sep 13, 2023
4038c06
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/aunt_su_guns/G.U.T_guns…
gettingusedto Sep 13, 2023
b8fc78d
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/aunt_su_guns/G.U.T_guns…
gettingusedto Sep 13, 2023
bd23c94
Create .gitkeep
gettingusedto Sep 13, 2023
f1c4830
Add files via upload
gettingusedto Sep 13, 2023
73ab0bf
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/s&w/.gitkeep
gettingusedto Sep 13, 2023
a39191f
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/fn_p90/.gitkeep
gettingusedto Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added gfx/MShockXotto+/pngs_small_20x20/items/gasfilter_med.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/smart_watch.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/ch_knife_trench.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/hc_knife_trench.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/lc_knife_trench.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/mc_knife_trench.png
View file
Open in desktop
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 gfx/MShockXotto+/pngs_small_20x20/items/trench_knife/qt_knife_trench.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...o+/pngs_tiles_32x32/character/overlay/wielded/1832_overlay_wielded_bokken_0.png
View file
Open in desktop
Binary file not shown.
Binary file removed ..._tiles_32x32/character/overlay/wielded/1849_overlay_wielded_hammer_sledge_0.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...o+/pngs_tiles_32x32/character/overlay/wielded/2101_overlay_wielded_fn_p90_0.png
View file
Open in desktop
Binary file not shown.
Binary file added ...ockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_bokken.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_bokken_0.json
View file
Open in desktop

This file was deleted.

Binary file added ...ockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_fn_p90.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_fn_p90_0.json
View file
Open in desktop

This file was deleted.

Binary file added ...overlay/wielded/overlay_wielded_hammer_sledge/overlay_wielded_hammer_sledge.png
View file
Open in desktop
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 ...ielded/overlay_wielded_hammer_sledge/overlay_wielded_hammer_sledge_engineer.png
View file
Open in desktop
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 ...y/wielded/overlay_wielded_hammer_sledge/overlay_wielded_hammer_sledge_heavy.png
View file
Open in desktop
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 ...y/wielded/overlay_wielded_hammer_sledge/overlay_wielded_hammer_sledge_short.png
View file
Open in desktop
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 ...er/overlay/wielded/overlay_wielded_hammer_sledge/overlay_wielded_pulverizer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion ...ockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hammer_sledge_0.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hexenhammer_0.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...tto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hexenhammer_active_0.json
View file
Open in desktop

This file was deleted.

Binary file added ...Xotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_mace_pipe.png
View file
Open in desktop
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 .../pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_mace_pipe_large.png
View file
Open in desktop
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 ...otto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_shillelagh.png
View file
Open in desktop
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 ...s_tiles_32x32/character/overlay/wielded/overlay_wielded_shillelagh_weighted.png
View file
Open in desktop
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 ...2x32/character/overlay/wielded/trench_knife/overlay_wielded_ch_knife_trench.png
View file
Open in desktop
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 ...2x32/character/overlay/wielded/trench_knife/overlay_wielded_hc_knife_trench.png
View file
Open in desktop
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 ...2x32/character/overlay/wielded/trench_knife/overlay_wielded_lc_knife_trench.png
View file
Open in desktop
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 ...2x32/character/overlay/wielded/trench_knife/overlay_wielded_mc_knife_trench.png
View file
Open in desktop
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 ...2x32/character/overlay/wielded/trench_knife/overlay_wielded_qt_knife_trench.png
View file
Open in desktop
Binary file added ...s_tiles_32x32/character/overlay/worn/bandolier/overlay_worn_bandolier_rifle.png
View file
Open in desktop
Binary file added ...32x32/character/overlay/worn/bandolier/overlay_worn_torso_bandolier_shotgun.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/bokken.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/fn_p90/fn_p90.png
View file
Open in desktop
Binary file removed gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge.png
View file
Open in desktop
Diff not rendered.
Binary file removed gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge_heavy.png
View file
Open in desktop
Diff not rendered.
Binary file removed gfx/MShockXotto+/pngs_tiles_32x32/item/hammer_sledge_short.png
View file
Open in desktop
Diff not rendered.
Binary file removed gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/shillelagh.png
View file
Open in desktop
Diff not rendered.
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/mace_pipe.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/mace_pipe_large.png
View file
Open in desktop
0 ...2/item/aunt_su_guns/G.U.T_guns/sw_500.png → ...tto+/pngs_tiles_32x32/item/s&w/sw_500.png
View file
Open in desktop
File renamed without changes
0 ...2/item/aunt_su_guns/G.U.T_guns/sw_610.png → ...tto+/pngs_tiles_32x32/item/s&w/sw_610.png
View file
Open in desktop
File renamed without changes
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/shillelagh/shillelagh.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/shillelagh/shillelagh_weighted.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/hammer_sledge.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/hammer_sledge_engineer.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/hammer_sledge_heavy.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/hammer_sledge_short.png
View file
Open in desktop
Binary file added gfx/MShockXotto+/pngs_tiles_32x32/item/sledgehammer/pulverizer.png
View file
Open in desktop