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

Jump to bottom

[MSX] XE and random stuff again #2506

Merged
merged 30 commits into from
Aug 28, 2024
Merged

[MSX] XE and random stuff again #2506

merged 30 commits into from
Aug 28, 2024

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Aug 28, 2024 •
edited
Loading

Summary

Random stuff again

Content of the change

Xedra Evolved

  • mon_duplicator
  • mon_xe_mavka
  • mon_dream_shadow
  • mon_dream_shadowbeast
  • t_radio_equipment

Basegame

  • casting_mold (small, medium, large, and long)
  • badge_foodkid
  • f_server
  • throwing_axe

Testing

Screenshot_20240828_160708_1
Screenshot_20240828_155040_1
Screenshot_20240828_155229_1
Screenshot_20240828_155311_1
Screenshot_20240828_134212_1

Additional information

@gettingusedto
Create mon_xe_mavka.json
dde2f62
@gettingusedto
Add files via upload
5a9619c
@gettingusedto
Create .gitkeep
c2bbab9
@gettingusedto
Add files via upload
4239d83
@gettingusedto
Merge branch 'I-am-Erk:master' into XE-and-random-stuff-again
b4f5d2f
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/monsters/…
aa96d83 
…mon_duplicator/.gitkeep
@gettingusedto
Create mon_dream_shadow
bf0c6d8
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/monsters/…
49cffff 
…mon_dream_shadow
@gettingusedto
Create .gitkeep
c00958d
@gettingusedto
Add files via upload
ac95720
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/monsters/…
7ba2602 
…mon_dream_shadow/.gitkeep
@gettingusedto
Create .gitkeep
21a6997
@gettingusedto
Add files via upload
0529392
@gettingusedto
Delete gfx/MShockXotto+/pngs_small_20x20/items/sandcasting_mold/.gitkeep
c04aad6
@gettingusedto
Add files via upload
b744eba
@gettingusedto
Create .gitkeep
7948bd5
@gettingusedto
Add files via upload
9a6f1e3
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/terrain/t…
2262181 
…_radio_equipment/.gitkeep
@gettingusedto
Create .gitkeep
e64434e
@gettingusedto
Add files via upload
1cce6b8
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_server/.gitkeep
5c64662
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_server directory
5da683f
@gettingusedto
Create .gitkeep
74a58e4
@gettingusedto
Add files via upload
83e0871
@gettingusedto
Delete gfx/MShockXotto+/pngs_tall_32x48/furniture/f_server/.gitkeep
dff1b1a
@gettingusedto
Add files via upload
ed92d7a
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/monsters/…
5f33b70 
…mon_dream_shadow/mon_dream_shadow.png
@gettingusedto
Add files via upload
ae2689f
@gettingusedto
Add files via upload
c04ebc8
@gettingusedto
Add files via upload
3184406
@gettingusedto gettingusedto marked this pull request as ready for review August 28, 2024 09:49
@Fris0uman Fris0uman merged commit 12870c1 into I-am-Erk:master Aug 28, 2024
2 checks passed
@gettingusedto gettingusedto deleted the XE-and-random-stuff-again branch August 28, 2024 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gettingusedto @Fris0uman