Permalink
Browse files

Merge branch 'master' into 2012-haxxyrewards

Conflicts:
	Source/gg2/Objects/InGameElements/Weapon.events/Draw.xml
	Source/gg2/Objects/Weapons/Flamethrower.events/Create.xml
	Source/gg2/Objects/Weapons/Flamethrower.events/User Event 2.xml
	Source/gg2/Objects/Weapons/Minigun.events/User Event 1.xml
	Source/gg2/Scripts/Events/doEventPlayerDeath.gml
	Source/gg2/Scripts/_resources.list.xml
	Source/gg2/Sprites/Alternative Sprites/Party/Characters/_resources.list.xml
	Source/gg2/Sprites/Alternative Sprites/Party/_resources.list.xml
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/CurlyBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/DemomanBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/DemomanRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/EngineerBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/EngineerRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/HeavyBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/HeavyRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/MedicBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/MedicRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/PyroBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/PyroRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/QuoteRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/ScoutBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/ScoutRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SoldierBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SoldierRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SpyBlueSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SpyRedSX.images/image 5.png
	Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/_resources.list.xml
	Source/gg2/Sprites/Alternative Sprites/Xmas/_resources.list.xml
	Source/gg2/Sprites/Alternative Sprites/_resources.list.xml
	Source/gg2/Sprites/_resources.list.xml
  • Loading branch information...
2 parents 2a2777c + e72f4ab commit 5fdf64fe8abc9aa90555e35e7ccebfdab9996926 @Medo42 committed Dec 28, 2012
Showing with 1,325 additions and 791 deletions.
  1. +5 −1 Source/.gitignore
  2. BIN Source/gg2/Backgrounds/popupBackgroundB.png
  3. +3 −2 Source/gg2/Constants.xml
  4. +2 −2 Source/gg2/Global Game Settings.xml
  5. +3 −2 Source/gg2/Objects/InGameElements/Balancer.events/Draw.xml
  6. +1 −1 Source/gg2/Objects/InGameElements/Balancer.xml
  7. +15 −0 Source/gg2/Objects/InGameElements/Character.events/Alarm 1.xml
  8. +36 −0 Source/gg2/Objects/InGameElements/Character.events/Alarm 6.xml
  9. +41 −0 Source/gg2/Objects/InGameElements/Character.events/Alarm 7.xml
  10. +17 −12 Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml
  11. +5 −2 Source/gg2/Objects/InGameElements/Character.events/Collision with HealingCabinet.xml
  12. +6 −3 Source/gg2/Objects/InGameElements/Character.events/Create.xml
  13. +2 −2 Source/gg2/Objects/InGameElements/Character.events/Destroy.xml
  14. +32 −35 Source/gg2/Objects/InGameElements/Character.events/Draw.xml
  15. +7 −6 Source/gg2/Objects/InGameElements/Character.events/End Step.xml
  16. +3 −2 Source/gg2/Objects/InGameElements/Character.events/User Event 5.xml
  17. +12 −12 Source/gg2/Objects/InGameElements/DeadGuy.events/Step.xml
  18. +56 −0 Source/gg2/Objects/InGameElements/Gibbage/XmasHat.events/Collision with Obstacle.xml
  19. +33 −0 Source/gg2/Objects/InGameElements/Gibbage/XmasHat.events/Create.xml
  20. +10 −0 Source/gg2/Objects/InGameElements/Gibbage/XmasHat.xml
  21. +1 −0 Source/gg2/Objects/InGameElements/Gibbage/_resources.list.xml
  22. +1 −1 Source/gg2/Objects/InGameElements/Player.events/Create.xml
  23. +14 −1 Source/gg2/Objects/InGameElements/PlayerControl.events/Begin Step.xml
  24. +1 −1 Source/gg2/Objects/InGameElements/PlayerControl.events/Create.xml
  25. +5 −0 Source/gg2/Objects/InGameElements/PlayerControl.events/End Step.xml
  26. +6 −0 Source/gg2/Objects/InGameElements/SentryTurret.events/End Step.xml
  27. +2 −1 Source/gg2/Objects/InGameElements/Spectator.events/Create.xml
  28. +52 −0 Source/gg2/Objects/InGameElements/Spectator.events/Draw.xml
  29. +5 −6 Source/gg2/Objects/InGameElements/Spectator.events/End Step.xml
  30. +1 −25 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad add pressed.xml
  31. +1 −25 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad subtract pressed.xml
  32. +40 −0 Source/gg2/Objects/InGameElements/Spectator.events/User Event 7.xml
  33. +40 −0 Source/gg2/Objects/InGameElements/Spectator.events/User Event 8.xml
  34. +1 −1 Source/gg2/Objects/InGameElements/Spectator.xml
  35. +3 −1 Source/gg2/Objects/InGameElements/SpeechBubbleO.events/End Step.xml
  36. +14 −6 Source/gg2/Objects/InGameElements/Weapon.events/Draw.xml
  37. +0 −20 Source/gg2/Objects/Menus/HaxxyController.events/Mouse left button pressed.xml
  38. +7 −0 Source/gg2/Objects/Menus/InGameMenuController.events/Create.xml
  39. +0 −1 Source/gg2/Objects/Menus/_resources.list.xml
  40. +7 −12 Source/gg2/Objects/Overlays/KillLog.events/Draw.xml
  41. +2 −3 ...jects/{Menus/HaxxyController.events/Mouse leave.xml → Overlays/SandwichHud.events/Begin Step.xml}
  42. +1 −3 Source/gg2/Objects/{Menus/HaxxyController.events → Overlays/SandwichHud.events}/Create.xml
  43. +40 −0 Source/gg2/Objects/Overlays/SandwichHud.events/Draw.xml
  44. +3 −3 Source/gg2/Objects/{Menus/HaxxyController.xml → Overlays/SandwichHud.xml}
  45. +3 −1 Source/gg2/Objects/Overlays/ScoreTableController.events/Create.xml
  46. +48 −21 Source/gg2/Objects/Overlays/ScoreTableController.events/Draw.xml
  47. +1 −0 Source/gg2/Objects/Overlays/_resources.list.xml
  48. +11 −6 Source/gg2/Objects/Projectiles/BladeB.events/Collision with Character.xml
  49. +2 −1 Source/gg2/Objects/Projectiles/BladeB.events/Collision with TeamGate.xml
  50. +4 −1 Source/gg2/Objects/Projectiles/Bubble.events/Collision with Character.xml
  51. +12 −6 Source/gg2/Objects/Projectiles/Bubble.events/Collision with TeamGate.xml
  52. +1 −1 Source/gg2/Objects/Projectiles/Bubble.events/Create.xml
  53. +14 −14 Source/gg2/Objects/Projectiles/BurningProjectile.events/Collision with Character.xml
  54. +4 −1 Source/gg2/Objects/Projectiles/BurningProjectile.events/Collision with TeamGate.xml
  55. +1 −1 Source/gg2/Objects/Projectiles/Flame.events/Create.xml
  56. +2 −2 Source/gg2/Objects/Projectiles/Flare.events/Create.xml
  57. +4 −2 Source/gg2/Objects/Projectiles/Mine.events/Collision with TeamGate.xml
  58. +3 −2 Source/gg2/Objects/Projectiles/Mine.events/Create.xml
  59. +11 −7 Source/gg2/Objects/Projectiles/Mine.events/Step.xml
  60. +13 −7 Source/gg2/Objects/Projectiles/Mine.events/User Event 2.xml
  61. +5 −2 Source/gg2/Objects/Projectiles/Needle.events/Collision with Character.xml
  62. +4 −2 Source/gg2/Objects/Projectiles/Needle.events/Collision with TeamGate.xml
  63. +11 −5 Source/gg2/Objects/Projectiles/Rocket.events/Collision with Character.xml
  64. +2 −1 Source/gg2/Objects/Projectiles/Rocket.events/Collision with TeamGate.xml
  65. +6 −2 Source/gg2/Objects/Projectiles/Rocket.events/User Event 5.xml
  66. +6 −3 Source/gg2/Objects/Projectiles/Shot.events/Collision with Character.xml
  67. +4 −2 Source/gg2/Objects/Projectiles/Shot.events/Collision with TeamGate.xml
  68. +1 −1 Source/gg2/Objects/Projectiles/StabAnim.events/Alarm 0.xml
  69. +14 −6 Source/gg2/Objects/Projectiles/StabAnim.events/Draw.xml
  70. +6 −1 Source/gg2/Objects/Projectiles/StabAnim.events/End Step.xml
  71. +21 −23 Source/gg2/Objects/Projectiles/StabAnim.events/Step.xml
  72. +2 −7 Source/gg2/Objects/Projectiles/StabMask.events/Collision with Character.xml
  73. +10 −8 Source/gg2/Objects/Projectiles/StabMask.events/Collision with Generator.xml
  74. +3 −7 Source/gg2/Objects/Projectiles/StabMask.events/Collision with Sentry.xml
  75. +2 −2 .../Objects/{Menus/HaxxyController.events/Mouse enter.xml → Weapons/Flamethrower.events/Alarm 2.xml}
  76. +4 −2 Source/gg2/Objects/Weapons/Flamethrower.events/Begin Step.xml
  77. +6 −3 Source/gg2/Objects/Weapons/Flamethrower.events/Create.xml
  78. +27 −24 Source/gg2/Objects/Weapons/Flamethrower.events/User Event 1.xml
  79. +60 −30 Source/gg2/Objects/Weapons/Flamethrower.events/User Event 2.xml
  80. +1 −1 Source/gg2/Objects/Weapons/Medigun.events/Begin Step.xml
  81. +1 −1 Source/gg2/Objects/Weapons/Medigun.events/Create.xml
  82. +1 −1 Source/gg2/Objects/Weapons/Minegun.events/Create.xml
  83. +4 −2 Source/gg2/Objects/Weapons/Minigun.events/Begin Step.xml
  84. +1 −1 Source/gg2/Objects/Weapons/Minigun.events/Create.xml
  85. +19 −20 Source/gg2/Objects/Weapons/Minigun.events/User Event 1.xml
  86. +3 −5 Source/gg2/Objects/Weapons/Revolver.events/Alarm 5.xml
  87. +1 −1 Source/gg2/Objects/Weapons/Revolver.events/Create.xml
  88. +3 −2 Source/gg2/Objects/Weapons/Revolver.events/User Event 3.xml
  89. +3 −1 Source/gg2/Objects/Weapons/Rifle.events/User Event 3.xml
  90. +1 −1 Source/gg2/Objects/Weapons/Shotgun.events/User Event 3.xml
  91. +72 −0 Source/gg2/Rooms/Maps/Atalia.xml
  92. +2 −8 Source/gg2/Rooms/Menu.xml
  93. +5 −0 Source/gg2/Scripts/Client/ClientBeginStep.gml
  94. +1 −1 Source/gg2/Scripts/Events/_resources.list.xml
  95. +24 −12 Source/gg2/Scripts/Events/doEventGrabIntel.gml
  96. +45 −300 Source/gg2/Scripts/Events/doEventPlayerDeath.gml
  97. +1 −1 Source/gg2/Scripts/Events/doEventScoreIntel.gml
  98. +14 −6 Source/gg2/Scripts/GameServer/processClientCommands.gml
  99. +14 −8 Source/gg2/Scripts/GameServer/sendLobbyUnreg.gml
  100. +3 −4 Source/gg2/Scripts/Graphics/drawHealth.gml
  101. +6 −0 Source/gg2/Scripts/Holidays/_resources.list.xml
  102. +8 −2 Source/gg2/Scripts/{ → Holidays}/calculateMonthAndDay.gml
  103. +2 −0 Source/gg2/Scripts/{ → Holidays}/partyTime.gml
  104. +38 −0 Source/gg2/Scripts/Holidays/xmasTime.gml
  105. +4 −0 Source/gg2/Scripts/Macro/_resources.list.xml
  106. +19 −0 Source/gg2/Scripts/Macro/createGib.gml
  107. +23 −6 Source/gg2/Scripts/ServerBalanceTeams.gml
  108. +2 −2 Source/gg2/Scripts/_resources.list.xml
  109. +2 −2 Source/gg2/Scripts/deserializeState.gml
  110. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 0.png
  111. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 1.png
  112. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 2.png
  113. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 3.png
  114. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 4.png
  115. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchBlueSP.images/image 5.png
  116. +5 −5 Source/gg2/Sprites/{HaxxyS.xml → Alternative Sprites/Party/Characters/SniperCrouchBlueSP.xml}
  117. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 0.png
  118. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 1.png
  119. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 2.png
  120. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 3.png
  121. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 4.png
  122. BIN Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.images/image 5.png
  123. +17 −0 Source/gg2/Sprites/Alternative Sprites/Party/Characters/SniperCrouchRedSP.xml
  124. +2 −0 Source/gg2/Sprites/Alternative Sprites/Party/Characters/_resources.list.xml
  125. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/CurlyBlueSX.images/image 5.png
  126. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/DemomanBlueSX.images/image 5.png
  127. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/DemomanRedSX.images/image 5.png
  128. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/EngineerBlueSX.images/image 5.png
  129. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/EngineerRedSX.images/image 5.png
  130. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/HeavyBlueSX.images/image 5.png
  131. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/HeavyRedSX.images/image 5.png
  132. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/MedicBlueSX.images/image 5.png
  133. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/MedicRedSX.images/image 5.png
  134. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/PyroBlueSX.images/image 5.png
  135. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/PyroRedSX.images/image 5.png
  136. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/QuoteRedSX.images/image 5.png
  137. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/ScoutBlueSX.images/image 5.png
  138. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/ScoutRedSX.images/image 5.png
  139. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperBlueSX.images/image 5.png
  140. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 0.png
  141. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 1.png
  142. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 2.png
  143. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 3.png
  144. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 4.png
  145. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.images/image 5.png
  146. +17 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchBlueSX.xml
  147. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 0.png
  148. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 1.png
  149. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 2.png
  150. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 3.png
  151. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 4.png
  152. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.images/image 5.png
  153. +17 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperCrouchRedSX.xml
  154. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SniperRedSX.images/image 5.png
  155. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SoldierBlueSX.images/image 5.png
  156. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SoldierRedSX.images/image 5.png
  157. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SpyBlueSX.images/image 5.png
  158. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/SpyRedSX.images/image 5.png
  159. +2 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/Characters/_resources.list.xml
  160. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/BloodDropSX.images/image 0.png
  161. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/BloodDropSX.images/image 1.png
  162. +12 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/BloodDropSX.xml
  163. BIN Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/XmashatS.images/image 0.png
  164. +12 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/XmashatS.xml
  165. +5 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/Gibs/_resources.list.xml
  166. +4 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/InGameElements/_resources.list.xml
  167. +1 −0 Source/gg2/Sprites/Alternative Sprites/Xmas/_resources.list.xml
  168. BIN Source/gg2/Sprites/Characters/SniperCrouchRedS.images/image 3.png
  169. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 0.png
  170. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 1.png
  171. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 2.png
  172. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 3.png
  173. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 4.png
  174. BIN Source/gg2/Sprites/Characters/SpyBlueS.images/image 5.png
  175. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 0.png
  176. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 1.png
  177. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 2.png
  178. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 3.png
  179. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 4.png
  180. BIN Source/gg2/Sprites/Characters/SpyRedS.images/image 5.png
  181. BIN Source/gg2/Sprites/GameElements/MenuBackgroundVersionS.images/image 0.png
  182. BIN Source/gg2/Sprites/GameElements/popupButtonS.images/image 0.png
  183. BIN Source/gg2/Sprites/GameElements/popupButtonS.images/image 1.png
  184. BIN Source/gg2/Sprites/GameElements/popupButtonS.images/image 2.png
  185. BIN Source/gg2/Sprites/HUDs/WeaponHUDS/Heavy/SandwichHudS.images/image 0.png
  186. BIN Source/gg2/Sprites/HUDs/WeaponHUDS/Heavy/SandwichHudS.images/image 1.png
  187. +12 −0 Source/gg2/Sprites/HUDs/WeaponHUDS/Heavy/SandwichHudS.xml
  188. +4 −0 Source/gg2/Sprites/HUDs/WeaponHUDS/Heavy/_resources.list.xml
  189. +1 −0 Source/gg2/Sprites/HUDs/WeaponHUDS/_resources.list.xml
  190. BIN Source/gg2/Sprites/HaxxyS.images/image 0.png
  191. BIN Source/gg2/Sprites/HaxxyS.images/image 1.png
  192. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 1.png
  193. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 2.png
  194. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 3.png
  195. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 6.png
  196. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 7.png
  197. BIN Source/gg2/Sprites/InGameElements/Gibs/FeetS.images/image 8.png
  198. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 0.png
  199. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 10.png
  200. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 2.png
  201. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 3.png
  202. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 4.png
  203. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 5.png
  204. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 6.png
  205. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 7.png
  206. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 8.png
  207. BIN Source/gg2/Sprites/InGameElements/Gibs/HandS.images/image 9.png
  208. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 0.png
  209. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 2.png
  210. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 3.png
  211. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 4.png
  212. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 5.png
  213. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 6.png
  214. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 7.png
  215. BIN Source/gg2/Sprites/InGameElements/Gibs/HeadS.images/image 8.png
  216. BIN Source/gg2/Sprites/InGameElements/SpectatorHealthCross.images/image 0.png
  217. +12 −0 Source/gg2/Sprites/InGameElements/SpectatorHealthCross.xml
  218. BIN Source/gg2/Sprites/InGameElements/SpectatorHealthFill.images/image 0.png
  219. +12 −0 Source/gg2/Sprites/InGameElements/SpectatorHealthFill.xml
  220. +2 −0 Source/gg2/Sprites/InGameElements/_resources.list.xml
  221. +1 −2 Source/gg2/Sprites/_resources.list.xml
View
@@ -5,4 +5,8 @@ gg2.ini
gg2updater.gmk
gg2updater.gb1
gg2b
-*.orig
+gmksplit.exe
+*.orig
+Maps
+Plugins
+Screenshots
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<constants>
- <constant name="VERSION" value="24400"/>
- <constant name="GAME_VERSION_STRING" value="&quot;v2.4.4&quot;"/>
+ <constant name="VERSION" value="24500"/>
+ <constant name="GAME_VERSION_STRING" value="&quot;v2.4.5&quot;"/>
<constant name="GAME_NAME_STRING" value="&quot;Gang Garrison 2&quot;"/>
<constant name="GAME_URL_STRING" value="&quot;http://www.ganggarrison.com/&quot;"/>
<constant name="PROTOCOL_UUID" value="&quot;31ce5361-4852-9d95-3ac2-2b3a07219a40&quot;"/>
@@ -143,4 +143,5 @@
<constant name="MOUSE_LEFT" value="9001"/>
<constant name="MOUSE_RIGHT" value="9002"/>
<constant name="HP_PER_POINT" value="400"/>
+ <constant name="INTEL_MAX_TIMER" value="900"/>
</constants>
@@ -41,11 +41,11 @@
<gameInfo>
<gameId>907152</gameId>
<author>Faucet Software</author>
- <version>2.4.4</version>
+ <version>2.4.5</version>
<information/>
<versionMajor>2</versionMajor>
<versionMinor>4</versionMinor>
- <versionRelease>4</versionRelease>
+ <versionRelease>5</versionRelease>
<versionBuild>0</versionBuild>
<company>Faucet Software</company>
<product>Gang Garrison 2</product>
@@ -31,10 +31,11 @@
draw_set_valign(fa_center);
draw_set_halign(fa_left);
- if notice == 0 draw_text_ext_color(xoffset+50, (yoffset+ysize)-100,"Teams will be auto balanced in 10 seconds",-1,-1,c_white,c_white,c_white,c_white,alpha);
+ if notice == 0 draw_text_ext_color(xoffset+50, (yoffset+ysize)-100,"Teams are imbalanced and will be auto-balanced shortly.",-1,-1,c_white,c_white,c_white,c_white,alpha);
if notice == 1 draw_text_ext_color(xoffset+50, (yoffset+ysize)-100,name+" has been team switched for balance",-1,-1,c_white,c_white,c_white,c_white,alpha);
-}</argument>
+}
+</argument>
</arguments>
</action>
</actions>
@@ -3,7 +3,7 @@
<sprite/>
<solid>false</solid>
<visible>true</visible>
- <depth>-6</depth>
+ <depth>-110001</depth>
<persistent>false</persistent>
<parent/>
<mask/>
@@ -1,6 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<event category="ALARM" id="1">
<actions>
+ <action id="605" library="1">
+ <!--action name: Comment-->
+ <kind>NORMAL</kind>
+ <allowRelative>false</allowRelative>
+ <question>false</question>
+ <canApplyTo>false</canApplyTo>
+ <actionType>NONE</actionType>
+ <functionName/>
+ <relative>false</relative>
+ <not>false</not>
+ <appliesTo>.self</appliesTo>
+ <arguments>
+ <argument kind="STRING">intel grabability</argument>
+ </arguments>
+ </action>
<action id="603" library="1">
<!--action name: Code-->
<kind>CODE</kind>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="ALARM" id="6">
+ <actions>
+ <action id="605" library="1">
+ <!--action name: Comment-->
+ <kind>NORMAL</kind>
+ <allowRelative>false</allowRelative>
+ <question>false</question>
+ <canApplyTo>false</canApplyTo>
+ <actionType>NONE</actionType>
+ <functionName/>
+ <relative>false</relative>
+ <not>false</not>
+ <appliesTo>.self</appliesTo>
+ <arguments>
+ <argument kind="STRING">sandvich cooldown</argument>
+ </arguments>
+ </action>
+ <action id="603" library="1">
+ <!--action name: Code-->
+ <kind>CODE</kind>
+ <allowRelative>false</allowRelative>
+ <question>false</question>
+ <canApplyTo>true</canApplyTo>
+ <actionType>CODE</actionType>
+ <functionName/>
+ <relative>false</relative>
+ <not>false</not>
+ <appliesTo>.self</appliesTo>
+ <arguments>
+ <argument kind="STRING">canEat = true;
+</argument>
+ </arguments>
+ </action>
+ </actions>
+</event>
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="ALARM" id="7">
+ <actions>
+ <action id="605" library="1">
+ <!--action name: Comment-->
+ <kind>NORMAL</kind>
+ <allowRelative>false</allowRelative>
+ <question>false</question>
+ <canApplyTo>false</canApplyTo>
+ <actionType>NONE</actionType>
+ <functionName/>
+ <relative>false</relative>
+ <not>false</not>
+ <appliesTo>.self</appliesTo>
+ <arguments>
+ <argument kind="STRING">Reset cloak flicker after hit</argument>
+ </arguments>
+ </action>
+ <action id="603" library="1">
+ <!--action name: Code-->
+ <kind>CODE</kind>
+ <allowRelative>false</allowRelative>
+ <question>false</question>
+ <canApplyTo>true</canApplyTo>
+ <actionType>CODE</actionType>
+ <functionName/>
+ <relative>false</relative>
+ <not>false</not>
+ <appliesTo>.self</appliesTo>
+ <arguments>
+ <argument kind="STRING">if(player.class == CLASS_SPY)
+{
+ cloakFlicker = false;
+ if(cloak)
+ cloakAlpha = 0;
+}
+</argument>
+ </arguments>
+ </action>
+ </actions>
+</event>
@@ -89,8 +89,8 @@ if (!player.humiliated and ((keyState | pressedKeys) &amp; $08)
// Cloak
if (!player.humiliated &amp;&amp; (pressedKeys &amp; $08)
- &amp;&amp; canCloak &amp;&amp; ((cloakAlpha &lt;= 0.5 and cloak) || (cloakAlpha == 1 and !cloak))
- &amp;&amp; !intel &amp;&amp; taunting==false &amp;&amp; !(keyState &amp; $10))
+ &amp;&amp; canCloak &amp;&amp; ((cloakAlpha == 1 and !cloak) or cloak)
+ &amp;&amp; !intel &amp;&amp; !taunting)
{
if(currentWeapon.readyToStab) {
if (cloak) { // stop spies immediately picking up intel after uncloaking
@@ -120,10 +120,12 @@ case 4: //If I am rocketing/mining a teamate
frictionFactor = 1;
break;
default:
- if(!intel)
+ if(!intel &amp;&amp; !player.humiliated)
controlFactor = baseControl;
- else
+ else if (!player.humiliated)
controlFactor = baseControl-0.1;
+ else
+ controlFactor = baseControl-0.2;
frictionFactor = baseFriction;
}
@@ -205,16 +207,20 @@ if(place_free(x,y+1)) {
}
}
-if intel {
- if random(1)&gt;0.90 &amp;&amp; speed&gt;2 {
+if (intel)
+{
+ if (random(1) &gt; 0.90 &amp;&amp; speed &gt; 0.195)
+ {
var sheet;
sheet = instance_create(x,y-11+random(9),LooseSheet);
sheet.hspeed = hspeed;
}
- if cloak==true {
+ if (cloak)
+ {
cloak=false;
cloakAplha=1;
}
+ intelRecharge = min(INTEL_MAX_TIMER, intelRecharge + INTEL_MAX_TIMER/(3*30));// 3*30 == it'll take 3 seconds for this to charge
}
if (player.humiliated)
@@ -236,8 +242,7 @@ if(intel) &amp;&amp; (ubered || global.mapchanging) {
}
//gotta regenerate some nuts
-if nutsNBolts &lt; 100 nutsNBolts += 0.1;
-else if nutsNBolts &gt; 100 nutsNBolts = 100;
+nutsNBolts = min(nutsNBolts+0.1, maxNutsNBolts);
//ubered max out ammo and extinguish flames
if ubered {
@@ -290,11 +295,11 @@ if (player.humiliated)
var zone;
zone = collision_point(x,y,CaptureZone,0,0);
-if(zone&gt;=0 &amp;&amp; !cloak) {
+if(zone &gt;= 0 and !cloak)
cappingPoint = zone.cp;
-} else {
+else
cappingPoint = noone;
-}
+
</argument>
</arguments>
</action>
@@ -14,12 +14,15 @@
<appliesTo>.self</appliesTo>
<arguments>
<argument kind="STRING">if (!global.mapchanging) {
- if hp &lt; maxHp || nutsNBolts &lt; 100 {
+ if (hp &lt; maxHp or nutsNBolts &lt; 100 or !canEat)
+ {
playsound(x,y,CbntHealSnd);
hp = maxHp;
nutsNBolts = maxNutsNBolts;
+ alarm[6] = 0
+ canEat = true;
}
- if (burnIntensity &gt; 0 || burnDuration &gt; 0)
+ if (burnIntensity &gt; 0 or burnDuration &gt; 0)
{
burnIntensity = 0;
burnDuration = 0;
@@ -23,6 +23,7 @@
canBuild = 0;
jumpStrength = 8;
capStrength = 1;
+ intelRecharge = 0;
//
hp = maxHp;
@@ -38,11 +39,11 @@
//afterburn stuff
burnIntensity = 0;
- maxIntensity = 10; //maximum afterburn intensity in DPS
+ maxIntensity = 9; //maximum afterburn intensity in DPS
burnDuration = 0;
- maxDuration = 300; //maximum afterburn length
+ maxDuration = 210; //maximum afterburn length in frames
decayDelay = 30; //time between burning and intensity lowering
- decayDuration = 225; //time between intensity lowering and zeroing out
+ decayDuration = 150; //time between intensity lowering and zeroing out
durationDecay = 1; //amount that duration lowers per step
intensityDecay = burnIntensity / decayDuration;
burnedBy = -1;
@@ -97,6 +98,8 @@
//sandvich
omnomnomnom = false;
+ canEat = true;
+ eatCooldown = 1200; //40 sec cooldown
//sniper zoom
zoomed = 0;
@@ -30,7 +30,7 @@
newIntel = instance_create(x,y,IntelligenceRed);
recordEventInLog(5, TEAM_BLUE, player.name, isMe);
}
- newIntel.alarm[0] = 900;
+ newIntel.alarm[0] = intelRecharge;
if (lastDamageSource == KILL_BOX || lastDamageSource == FRAG_BOX || lastDamageSource == PITFALL) {
if (global.isHost){
if(team==TEAM_RED) {
@@ -50,7 +50,7 @@
}
player.object=-1;
- if (collision_point(x,y,SpawnRoom,0,0))
+ if (collision_point(x,y,SpawnRoom,0,0) &amp;&amp; (lastDamageDealer == player || lastDamageDealer == -1))
player.alarm[5] = 1;
else
player.alarm[5] = global.Server_Respawntime;
Oops, something went wrong.

0 comments on commit 5fdf64f

Please sign in to comment.