Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- David@DESKTOP-H8VERIL MINGW64 ~/Documents/fmg (master)
- $ git status
- On branch master
- Your branch is ahead of 'origin/master' by 1 commit.
- (use "git push" to publish your local commits)
- nothing to commit, working tree clean
- David@DESKTOP-H8VERIL MINGW64 ~/Documents/fmg (master)
- $ git diff origin/master..HEAD
- diff --git a/fmgnew.gmx/background/background122.background.gmx b/fmgnew.gmx/background/background122.background.gmx
- new file mode 100644
- index 0000000..b9503c0
- --- /dev/null
- +++ b/fmgnew.gmx/background/background122.background.gmx
- @@ -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>
- :...skipping...
- diff --git a/fmgnew.gmx/background/background122.background.gmx b/fmgnew.gmx/background/background122.background.gmx
- new file mode 100644
- index 0000000..b9503c0
- --- /dev/null
- +++ b/fmgnew.gmx/background/background122.background.gmx
- @@ -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>0</width>
- + <height>0</height>
- + <data>images\background122.png</data>
- +</background>
- diff --git a/fmgnew.gmx/background/bg_fulvec.background.gmx b/fmgnew.gmx/background/bg_fulvec.background.gmx
- index 0f07cdc..b1df0a7 100644
- --- a/fmgnew.gmx/background/bg_fulvec.background.gmx
- +++ b/fmgnew.gmx/background/bg_fulvec.background.gmx
- @@ -13,7 +13,7 @@
- <TextureGroup0>0</TextureGroup0>
- </TextureGroups>
- <For3D>0</For3D>
- - <width>2755</width>
- - <height>2836</height>
- + <width>2976</width>
- + <height>5473</height>
- <data>images\bg_fulvec.png</data>
- </background>
- diff --git a/fmgnew.gmx/background/images/bg_fulvec.png b/fmgnew.gmx/background/images/bg_fulvec.png
- index d255ee6..4d1eda8 100644
- Binary files a/fmgnew.gmx/background/images/bg_fulvec.png and b/fmgnew.gmx/background/images/bg_fulvec.png differ
- diff --git a/fmgnew.gmx/fmgnew.project.gmx b/fmgnew.gmx/fmgnew.project.gmx
- index c671990..ffec535 100644
- --- a/fmgnew.gmx/fmgnew.project.gmx
- +++ b/fmgnew.gmx/fmgnew.project.gmx
- @@ -1034,6 +1034,7 @@
- <backgrounds name="background">
- <background>background\seaa</background>
- <backgrounds name="important bgs">
- + <background>background\background122</background>
- <background>background\bg_jm_tl_sb</background>
- <background>background\bg_jm_underground</background>
- <background>background\bg_jm_udnerground_faces</background>
- diff --git a/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx b/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
- index 9771fed..de51153 100644
- --- a/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
- +++ b/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
- @@ -32,8 +32,8 @@
- </makerSettings>
- <backgrounds>
- <background visible="-1" foreground="0" name="seaa" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
- - <background visible="-1" foreground="0" name="bg_fulvec" x="193" y="2604" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
- - <background visible="-1" foreground="0" name="bg_fullvec_2" x="683" y="70" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
- + <background visible="-1" foreground="-1" name="" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
- + <background visible="-1" foreground="0" name="bg_fulvec" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
- <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
- <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
- <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
- @@ -51,7 +51,6 @@
- <view visible="0" objName="<undefined>" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
- :
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement