SHARE
TWEET

Untitled

a guest Oct 21st, 2019 85 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. David@DESKTOP-H8VERIL MINGW64 ~/Documents/fmg (master)
  2. $ git status
  3. On branch master
  4. Your branch is ahead of 'origin/master' by 1 commit.
  5.   (use "git push" to publish your local commits)
  6.  
  7. nothing to commit, working tree clean
  8.  
  9. David@DESKTOP-H8VERIL MINGW64 ~/Documents/fmg (master)
  10. $ git diff origin/master..HEAD
  11. diff --git a/fmgnew.gmx/background/background122.background.gmx b/fmgnew.gmx/background/background122.background.gmx
  12. new file mode 100644
  13. index 0000000..b9503c0
  14. --- /dev/null
  15. +++ b/fmgnew.gmx/background/background122.background.gmx
  16. @@ -0,0 +1,19 @@
  17. +<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
  18. +<background>
  19. +  <istileset>0</istileset>
  20. +  <tilewidth>16</tilewidth>
  21. +  <tileheight>16</tileheight>
  22. +  <tilexoff>0</tilexoff>
  23. +  <tileyoff>0</tileyoff>
  24. +  <tilehsep>0</tilehsep>
  25. +  <tilevsep>0</tilevsep>
  26. +  <HTile>-1</HTile>
  27. +  <VTile>-1</VTile>
  28. +  <TextureGroups>
  29. +    <TextureGroup0>0</TextureGroup0>
  30. +  </TextureGroups>
  31. +  <For3D>0</For3D>
  32. :...skipping...
  33. diff --git a/fmgnew.gmx/background/background122.background.gmx b/fmgnew.gmx/background/background122.background.gmx
  34. new file mode 100644
  35. index 0000000..b9503c0
  36. --- /dev/null
  37. +++ b/fmgnew.gmx/background/background122.background.gmx
  38. @@ -0,0 +1,19 @@
  39. +<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
  40. +<background>
  41. +  <istileset>0</istileset>
  42. +  <tilewidth>16</tilewidth>
  43. +  <tileheight>16</tileheight>
  44. +  <tilexoff>0</tilexoff>
  45. +  <tileyoff>0</tileyoff>
  46. +  <tilehsep>0</tilehsep>
  47. +  <tilevsep>0</tilevsep>
  48. +  <HTile>-1</HTile>
  49. +  <VTile>-1</VTile>
  50. +  <TextureGroups>
  51. +    <TextureGroup0>0</TextureGroup0>
  52. +  </TextureGroups>
  53. +  <For3D>0</For3D>
  54. +  <width>0</width>
  55. +  <height>0</height>
  56. +  <data>images\background122.png</data>
  57. +</background>
  58. diff --git a/fmgnew.gmx/background/bg_fulvec.background.gmx b/fmgnew.gmx/background/bg_fulvec.background.gmx
  59. index 0f07cdc..b1df0a7 100644
  60. --- a/fmgnew.gmx/background/bg_fulvec.background.gmx
  61. +++ b/fmgnew.gmx/background/bg_fulvec.background.gmx
  62. @@ -13,7 +13,7 @@
  63.      <TextureGroup0>0</TextureGroup0>
  64.    </TextureGroups>
  65.    <For3D>0</For3D>
  66. -  <width>2755</width>
  67. -  <height>2836</height>
  68. +  <width>2976</width>
  69. +  <height>5473</height>
  70.    <data>images\bg_fulvec.png</data>
  71.  </background>
  72. diff --git a/fmgnew.gmx/background/images/bg_fulvec.png b/fmgnew.gmx/background/images/bg_fulvec.png
  73. index d255ee6..4d1eda8 100644
  74. Binary files a/fmgnew.gmx/background/images/bg_fulvec.png and b/fmgnew.gmx/background/images/bg_fulvec.png differ
  75. diff --git a/fmgnew.gmx/fmgnew.project.gmx b/fmgnew.gmx/fmgnew.project.gmx
  76. index c671990..ffec535 100644
  77. --- a/fmgnew.gmx/fmgnew.project.gmx
  78. +++ b/fmgnew.gmx/fmgnew.project.gmx
  79. @@ -1034,6 +1034,7 @@
  80.    <backgrounds name="background">
  81.      <background>background\seaa</background>
  82.      <backgrounds name="important bgs">
  83. +      <background>background\background122</background>
  84.        <background>background\bg_jm_tl_sb</background>
  85.        <background>background\bg_jm_underground</background>
  86.        <background>background\bg_jm_udnerground_faces</background>
  87. diff --git a/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx b/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
  88. index 9771fed..de51153 100644
  89. --- a/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
  90. +++ b/fmgnew.gmx/rooms/Vectinazria_full_new.room.gmx
  91. @@ -32,8 +32,8 @@
  92.    </makerSettings>
  93.    <backgrounds>
  94.      <background visible="-1" foreground="0" name="seaa" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
  95. -    <background visible="-1" foreground="0" name="bg_fulvec" x="193" y="2604" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
  96. -    <background visible="-1" foreground="0" name="bg_fullvec_2" x="683" y="70" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
  97. +    <background visible="-1" foreground="-1" name="" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
  98. +    <background visible="-1" foreground="0" name="bg_fulvec" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="0"/>
  99.      <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
  100.      <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
  101.      <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
  102. @@ -51,7 +51,6 @@
  103.      <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
  104. :
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top