Skip to content

Merge yong's update #6

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

Open
kirbio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge yong's update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
platformer.project.gmx
19 changes: 19 additions & 0 deletions background/Synthwave-Neon-80s-Background-Marmoset.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>5000</width>
<height>2813</height>
<data>images\Synthwave-Neon-80s-Background-Marmoset.png</data>
</background>
19 changes: 19 additions & 0 deletions background/Synthwave.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>5000</width>
<height>2813</height>
<data>images\Synthwave.png</data>
</background>
19 changes: 19 additions & 0 deletions background/Synthwave_Neon_80s_Background_Marmoset.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>3840</width>
<height>2160</height>
<data>images\Synthwave_Neon_80s_Background_Marmoset.png</data>
</background>
2 changes: 1 addition & 1 deletion background/background5.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
Expand Down
19 changes: 19 additions & 0 deletions background/background_dirt.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>16</width>
<height>16</height>
<data>images\background_dirt.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_factory.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>416</width>
<height>768</height>
<data>images\bg_factory.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_factoryruins.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>400</width>
<height>224</height>
<data>images\bg_factoryruins.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_forest.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>128</width>
<height>96</height>
<data>images\bg_forest.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_forest2.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>384</width>
<height>240</height>
<data>images\bg_forest2.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_hintmarking.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>80</width>
<height>32</height>
<data>images\bg_hintmarking.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_moon.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>122</width>
<height>95</height>
<data>images\bg_moon.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_musical.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>144</width>
<height>64</height>
<data>images\bg_musical.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_musical2.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>32</tilewidth>
<tileheight>32</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>448</width>
<height>64</height>
<data>images\bg_musical2.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_vegetation.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>689</width>
<height>352</height>
<data>images\bg_vegetation.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bg_village.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>2048</width>
<height>370</height>
<data>images\bg_village.png</data>
</background>
19 changes: 19 additions & 0 deletions background/bgr_beat_align.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>0</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>512</width>
<height>16</height>
<data>images\bgr_beat_align.png</data>
</background>
Binary file added background/images/Synthwave-Neon-80s-Background-Marmoset.jpg
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 background/images/Synthwave-Neon-80s-Background-Marmoset.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 background/images/Synthwave.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 background/images/Synthwave_Neon_80s_Background_Marmoset.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 background/images/background_dirt.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 background/images/bg_factory.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 background/images/bg_factoryruins.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 background/images/bg_forest.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 background/images/bg_forest2.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 background/images/bg_hintmarking.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 background/images/bg_moon.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 background/images/bg_musical.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 background/images/bg_musical2.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 background/images/bg_vegetation.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 background/images/bg_village.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 background/images/bgr_beat_align.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 background/images/tile might.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 background/images/tile night.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 background/images/tileNight.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 background/images/tile_might.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 background/images/tile_night.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.
19 changes: 19 additions & 0 deletions background/tile night.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>32</width>
<height>32</height>
<data>images\tile night.png</data>
</background>
19 changes: 19 additions & 0 deletions background/tileNight.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>32</width>
<height>32</height>
<data>images\tileNight.png</data>
</background>
19 changes: 19 additions & 0 deletions background/tile_might.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>32</width>
<height>32</height>
<data>images\tile_might.png</data>
</background>
19 changes: 19 additions & 0 deletions background/tile_night.background.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<background>
<istileset>-1</istileset>
<tilewidth>16</tilewidth>
<tileheight>16</tileheight>
<tilexoff>0</tilexoff>
<tileyoff>0</tileyoff>
<tilehsep>0</tilehsep>
<tilevsep>0</tilevsep>
<HTile>-1</HTile>
<VTile>-1</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>32</width>
<height>32</height>
<data>images\tile_night.png</data>
</background>
Loading