Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into recoilanims

Conflicts:
	Source/gg2/Sprites/Weapons/RevolverS.images/image 2.png
	Source/gg2/Sprites/Weapons/RevolverS.images/image 3.png
	Source/gg2/Sprites/Weapons/_resources.list.xml
  • Loading branch information...
commit a4ace162fe6737facb86ac08714fb08c02971936 2 parents b2e7836 + 667e03f
@Medo42 authored
Showing with 66 additions and 366 deletions.
  1. +1 −1  Readme.txt
  2. +12 −0 Source/gg2/Objects/InGameElements/Spectator.events/Create.xml
  3. +51 −0 Source/gg2/Objects/InGameElements/Spectator.events/Key any key pressed.xml
  4. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 0 pressed.xml
  5. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 1 pressed.xml
  6. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 2 pressed.xml
  7. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 3 pressed.xml
  8. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 4 pressed.xml
  9. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 5 pressed.xml
  10. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 6 pressed.xml
  11. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 7 pressed.xml
  12. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 8 pressed.xml
  13. +0 −35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 9 pressed.xml
  14. +1 −1  Source/gg2/Objects/Weapons/Revolver.xml
  15. BIN  Source/gg2/Sprites/GameElements/MenuBackgroundVersionS.images/image 0.png
  16. BIN  Source/gg2/Sprites/Weapons/Revolver2S.images/image 0.png
  17. BIN  Source/gg2/Sprites/Weapons/Revolver2S.images/image 1.png
  18. +0 −12 Source/gg2/Sprites/Weapons/Revolver2S.xml
  19. BIN  Source/gg2/Sprites/Weapons/RevolverS.images/image 0.png
  20. BIN  Source/gg2/Sprites/Weapons/RevolverS.images/image 1.png
  21. +1 −1  Source/gg2/Sprites/Weapons/RevolverS.xml
  22. +0 −1  Source/gg2/Sprites/Weapons/_resources.list.xml
View
2  Readme.txt
@@ -277,7 +277,7 @@ demise. Climb the tower to drop down on unsuspecting opponents!
7. cp_dirtbowl
by Vaati
-Somewhere in the middle of nowhere, BLU is ready to launch it's secret wewapon at
+Somewhere in the middle of nowhere, BLU is ready to launch it's secret weapon at
RED's base within Mt. Dirtbowl. RED must push forward while BLU must hold them off
on three map fronts in this control point attack style map.
View
12 Source/gg2/Objects/InGameElements/Spectator.events/Create.xml
@@ -25,6 +25,18 @@ for (i=0; i<=9; i+=1;) {
tracking=false
track_id=0;
player = 0;
+
+numpadKeys[0] = vk_numpad0;
+numpadKeys[1] = vk_numpad1;
+numpadKeys[2] = vk_numpad2;
+numpadKeys[3] = vk_numpad3;
+numpadKeys[4] = vk_numpad4;
+numpadKeys[5] = vk_numpad5;
+numpadKeys[6] = vk_numpad6;
+numpadKeys[7] = vk_numpad7;
+numpadKeys[8] = vk_numpad8;
+numpadKeys[9] = vk_numpad9;
+
</argument>
</arguments>
</action>
View
51 Source/gg2/Objects/InGameElements/Spectator.events/Key any key pressed.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="KEYPRESS" id="1">
+ <actions>
+ <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">var i;
+for(i=0; i&lt;=9; i+=1)
+{
+ if(keyboard_check_pressed(numpadKeys[i]))
+ {
+ if(savex_view[i] == -1)
+ {
+ savex_view[i] = x;
+ savey_view[i] = y;
+ if(!instance_exists(NoticeO))
+ instance_create(0,0,NoticeO);
+ with(NoticeO)
+ notice = NOTICE_SETCHECKPOINT;
+ }
+ else if(x != savex_view[i] || y != savey_view[i])
+ {
+ x = savex_view[i];
+ y = savey_view[i];
+ }
+ else
+ {
+ savex_view[i] = -1;
+ savey_view[i] = -1;
+ if(!instance_exists(NoticeO))
+ instance_create(0,0,NoticeO);
+ with(NoticeO)
+ notice = NOTICE_DESTROYCHECKPOINT;
+ }
+ tracking=false;
+ }
+}
+</argument>
+ </arguments>
+ </action>
+ </actions>
+</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 0 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="96">
- <actions>
- <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 savex_view[0] == -1 {
- savex_view[0] = x
- savey_view[0] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[0] || y != savey_view[0] {
- x = savex_view[0]
- y = savey_view[0]
-} else if x == savex_view[0] &amp;&amp; y == savey_view[0] {
- savex_view[0] = -1
- savey_view[0] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 1 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="97">
- <actions>
- <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 savex_view[1] == -1 {
- savex_view[1] = x
- savey_view[1] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[1] || y != savey_view[1] {
- x = savex_view[1]
- y = savey_view[1]
-} else if x == savex_view[1] &amp;&amp; y == savey_view[1] {
- savex_view[1] = -1
- savey_view[1] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 2 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="98">
- <actions>
- <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 savex_view[2] == -1 {
- savex_view[2] = x
- savey_view[2] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[2] || y != savey_view[2] {
- x = savex_view[2]
- y = savey_view[2]
-} else if x == savex_view[2] &amp;&amp; y == savey_view[2] {
- savex_view[2] = -1
- savey_view[2] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 3 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="99">
- <actions>
- <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 savex_view[3] == -1 {
- savex_view[3] = x
- savey_view[3] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[3] || y != savey_view[3] {
- x = savex_view[3]
- y = savey_view[3]
-} else if x == savex_view[3] &amp;&amp; y == savey_view[3] {
- savex_view[3] = -1
- savey_view[3] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 4 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="100">
- <actions>
- <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 savex_view[4] == -1 {
- savex_view[4] = x
- savey_view[4] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[4] || y != savey_view[4] {
- x = savex_view[4]
- y = savey_view[4]
-} else if x == savex_view[4] &amp;&amp; y == savey_view[4] {
- savex_view[4] = -1
- savey_view[4] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 5 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="101">
- <actions>
- <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 savex_view[5] == -1 {
- savex_view[5] = x
- savey_view[5] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[5] || y != savey_view[5] {
- x = savex_view[5]
- y = savey_view[5]
-} else if x == savex_view[5] &amp;&amp; y == savey_view[5] {
- savex_view[5] = -1
- savey_view[5] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 6 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="102">
- <actions>
- <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 savex_view[6] == -1 {
- savex_view[6] = x
- savey_view[6] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[6] || y != savey_view[6] {
- x = savex_view[6]
- y = savey_view[6]
-} else if x == savex_view[6] &amp;&amp; y == savey_view[6] {
- savex_view[6] = -1
- savey_view[6] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 7 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="103">
- <actions>
- <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 savex_view[7] == -1 {
- savex_view[7] = x
- savey_view[7] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[7] || y != savey_view[7] {
- x = savex_view[7]
- y = savey_view[7]
-} else if x == savex_view[7] &amp;&amp; y == savey_view[7] {
- savex_view[7] = -1
- savey_view[7] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 8 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="104">
- <actions>
- <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 savex_view[8] == -1 {
- savex_view[8] = x
- savey_view[8] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[8] || y != savey_view[8] {
- x = savex_view[8]
- y = savey_view[8]
-} else if x == savex_view[8] &amp;&amp; y == savey_view[8] {
- savex_view[8] = -1
- savey_view[8] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
35 Source/gg2/Objects/InGameElements/Spectator.events/Key numpad 9 pressed.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="KEYPRESS" id="105">
- <actions>
- <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 savex_view[9] == -1 {
- savex_view[9] = x
- savey_view[9] = y
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_SETCHECKPOINT;
-} else if x != savex_view[9] || y != savey_view[9] {
- x = savex_view[9]
- y = savey_view[9]
-} else if x == savex_view[1] &amp;&amp; y == savey_view[9] {
- savex_view[9] = -1
- savey_view[9] = -1
- if !instance_exists(NoticeO) instance_create(0,0,NoticeO);
- with NoticeO notice = NOTICE_DESTROYCHECKPOINT;
-}
-
-tracking=false</argument>
- </arguments>
- </action>
- </actions>
-</event>
View
2  Source/gg2/Objects/Weapons/Revolver.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<object id="119">
- <sprite>Revolver2S</sprite>
+ <sprite>RevolverS</sprite>
<solid>false</solid>
<visible>true</visible>
<depth>-1</depth>
View
BIN  Source/gg2/Sprites/GameElements/MenuBackgroundVersionS.images/image 0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Source/gg2/Sprites/Weapons/Revolver2S.images/image 0.png
Deleted file not rendered
View
BIN  Source/gg2/Sprites/Weapons/Revolver2S.images/image 1.png
Deleted file not rendered
View
12 Source/gg2/Sprites/Weapons/Revolver2S.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<sprite>
- <origin x="-1" y="6"/>
- <mask>
- <separate>false</separate>
- <shape>RECTANGLE</shape>
- <bounds alphaTolerance="0" mode="AUTO"/>
- </mask>
- <preload>true</preload>
- <smoothEdges>false</smoothEdges>
- <transparent>false</transparent>
-</sprite>
View
BIN  Source/gg2/Sprites/Weapons/RevolverS.images/image 0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Source/gg2/Sprites/Weapons/RevolverS.images/image 1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  Source/gg2/Sprites/Weapons/RevolverS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sprite>
- <origin x="8" y="-1"/>
+ <origin x="-1" y="6"/>
<mask>
<separate>false</separate>
<shape>RECTANGLE</shape>
View
1  Source/gg2/Sprites/Weapons/_resources.list.xml
@@ -12,7 +12,6 @@
<resource name="RocketlauncherS" type="RESOURCE"/>
<resource name="RifleS" type="RESOURCE"/>
<resource name="RevolverS" type="RESOURCE"/>
- <resource name="Revolver2S" type="RESOURCE"/>
<resource name="BladeS" type="RESOURCE"/>
<resource name="BackstabTorsoRedS" type="RESOURCE"/>
<resource name="BackstabTorsoBlueS" type="RESOURCE"/>
Please sign in to comment.
Something went wrong with that request. Please try again.