Merge branch 'master' into GM81

Conflicts: Source/gg2updaterGitToGmk.bat Source/gg2updaterGmkToGit.bat
Medo42 · Feb 24, 2012 · 9fe5e6b · 9fe5e6b
2 parents 61c2d20 + 3a3e853
commit 9fe5e6b
Show file tree

Hide file tree

Showing 2,199 changed files with 8,568 additions and 4,070 deletions.
diff --git a/Extensions/Faucet Networking V1.2.1-gg2-1.gex b/Extensions/Faucet Networking V1.2.1-gg2-1.gex
diff --git a/Extensions/Faucet Networking v1.0.gex b/Extensions/Faucet Networking v1.0.gex
diff --git a/Extensions/GG2DLLext.gex b/Extensions/GG2DLLext.gex
diff --git a/Music/menumusic4.wav b/Music/menumusic4.wav
diff --git a/Music/menumusic5.wav b/Music/menumusic5.wav
diff --git a/Music/menumusic6.wav b/Music/menumusic6.wav
diff --git a/Readme.txt b/Readme.txt
@@ -89,7 +89,7 @@ Meet The Rocketman:
 	Strong yet graceful, he can
 	launch himself skyward with his
 	rockets as well as do damage!
-   Hit Points: 175
+   Hit Points: 160
    Weapon: Rocket Launcher
    Special abilities: 
            Rocket-Jump - Fire at your feet when you jump to reach great heights!
@@ -176,12 +176,13 @@ lobby will show the current map, number of players, and IP of servers running.
 Alternatively, you can manually join a server if you know their IP and their
 forwarded port.
 
-There are five gameplay modes: 
+There are six gameplay modes: 
 - Capture the Flag
 - Control Point
 - Arena
 - Generator
 - King of the Hill
+- Dual King of the Hill
 
 Choose a team, RED or BLU, or select AutoSelect and let us choose your team for you. 
 Press N to change your team, or to Spectate and watch the action! Keep in mind you 
@@ -228,6 +229,11 @@ There exists a lone control point in the center of the map. Both teams compete t
 control to start their countdown. First team to hold onto the point for 3 full minutes
 is victorious.
 
+Dual King of the Hill:
+An original mode exclusive to Gang Garrison 2. Teams must hold control of both control
+points to run their timer down. Capturing the enemy control point will secure your own
+until the enemy can take it back. First team to hold complete control for 3 minutes wins.
+
 ----------------------------------------------------------
 
 IV. The Maps
@@ -311,6 +317,16 @@ A community-made arena map gone official! RED and BLU fight for control of an ab
 It is unknown what significance this location holds to both factions, but fear keeps invesigators 
 from delving any further.
 
+15. dkoth_atalia
+by Wareya
+A community-made Generator map that was converted for DKotH. It's advised to take over the central
+complex to gain the advantage for when making an assault on the enemy control point.
+
+16. dkoth_sixties
+by Ozoh
+A close quarters industrial map. Use the twists and turns to your advantage to eliminate the enemy
+team and seize their control point.
+
 B. Using Custom Maps:
 
 To run a server using custom maps, make a folder called "Maps" in the same 
@@ -328,17 +344,6 @@ ctf_orange
 would play ctf_2dfort, a custom map with the filename "ctf_mynewmap.png", and 
 then ctf_orange. Then it would play ctf_2dfort again. These names are case sensitive.
 
-Players on your server can download maps from the internet when they join if you 
-provide a locator file. First, upload your map to the internet, whether on your own 
-website or a filehost that allows direct linking. Do not worry if it changes the filename,
-as long as it keeps the extension .png it will be fine. Create a file in your Maps folder
-called "mapname.locator" where "mapname" is the same as in the file "mapname.png".
-
-Inside this file, simply paste the direct link to your file on the internet. Be careful that
-the link is direct and not a php redirect! Now when players join your server, they will
-download the map and your locator file so they may also host the map on their servers.
-
-
 ----------------------------------------------------------
 
 V. The Options Menu:
@@ -446,13 +451,13 @@ Leiche, Xeyk, pach, Austin "Psychopath" Benz, L, technoviking, AJF, Alexander "W
 NAGN and RebelINS
 
 Artists:
-mrfredman, Fishmatt, BassieEnAdriaan, Timohtep, Elkondo and Waterfall
+mrfredman, Fishmatt, BassieEnAdriaan, Timohtep, Elkondo, Waterfall and Skeledude
 
 Sound & Music:
 Synnah, Scoot, and Elkondo
 
 Map Creators: 
-fishmatt, vaati, king metroid, Taters, agh, Faust, Tarzan, BassieEnAdriaan, McGenio, Wherewolf and Shawnachu
+fishmatt, vaati, king metroid, Taters, agh, Faust, Tarzan, BassieEnAdriaan, McGenio, Wherewolf, Wareya, Ozoh and Shawnachu
 
 With additional art and inspiration provided by the incredible Gang Garrison community!
 
@@ -489,4 +494,5 @@ Readme Changelog
 5/3/09 - mrfredman - updated things for 2.1
 3/20/10 - technoviking - updated things for 2.2
 3/16/11 - Psychopath - updated things for 2.3
-3/31/11 - Medo - some more updating
+3/31/11 - Medo - some more updating
+10/13/11 - Psychopath - updated things for 2.4
diff --git a/Source/gg2/Backgrounds/AtaliaB.png b/Source/gg2/Backgrounds/AtaliaB.png
diff --git a/Source/gg2/Backgrounds/TwodFortTwoB.xml → Source/gg2/Backgrounds/AtaliaB.xml b/Source/gg2/Backgrounds/TwodFortTwoB.xml → Source/gg2/Backgrounds/AtaliaB.xml
diff --git a/Source/gg2/Backgrounds/ConflictB.png b/Source/gg2/Backgrounds/ConflictB.png
diff --git a/Source/gg2/Backgrounds/DestroyS.png b/Source/gg2/Backgrounds/DestroyS.png
diff --git a/Source/gg2/Backgrounds/SixtiesB.png b/Source/gg2/Backgrounds/SixtiesB.png
diff --git a/Source/gg2updater/Backgrounds/UpdateB.xml → Source/gg2/Backgrounds/SixtiesB.xml b/Source/gg2updater/Backgrounds/UpdateB.xml → Source/gg2/Backgrounds/SixtiesB.xml
diff --git a/Source/gg2/Backgrounds/TwodFortTwoB.png b/Source/gg2/Backgrounds/TwodFortTwoB.png
diff --git a/Source/gg2/Backgrounds/UpdaterB.png b/Source/gg2/Backgrounds/UpdaterB.png
diff --git a/Source/gg2/Backgrounds/UpdaterB.xml b/Source/gg2/Backgrounds/UpdaterB.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<background>
+  <useAsTileset>false</useAsTileset>
+  <preload>false</preload>
+  <smoothEdges>false</smoothEdges>
+  <transparent>false</transparent>
+</background>
diff --git a/Source/gg2/Backgrounds/_resources.list.xml b/Source/gg2/Backgrounds/_resources.list.xml
@@ -5,7 +5,6 @@
   <resource name="WaterwayB" type="RESOURCE"/>
   <resource name="MenuBackgroundB" type="RESOURCE"/>
   <resource name="SplashScreenB" type="RESOURCE"/>
-  <resource name="TwodFortTwoB" type="RESOURCE"/>
   <resource name="TwodFortTwoRemixB" type="RESOURCE"/>
   <resource name="zclassicwellB" type="RESOURCE"/>
   <resource name="OrangeB" type="RESOURCE"/>
@@ -17,7 +16,10 @@
   <resource name="ValleyB" type="RESOURCE"/>
   <resource name="CorinthB" type="RESOURCE"/>
   <resource name="HarvestB" type="RESOURCE"/>
+  <resource name="AtaliaB" type="RESOURCE"/>
+  <resource name="SixtiesB" type="RESOURCE"/>
   <resource name="CustomMapB" type="RESOURCE"/>
   <resource name="popupBackgroundB" type="RESOURCE"/>
   <resource name="OldfortB" type="RESOURCE"/>
+  <resource name="UpdaterB" type="RESOURCE"/>
 </resources>
diff --git a/Source/gg2/Constants.xml b/Source/gg2/Constants.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <constants>
-  <constant name="VERSION" value="23100"/>
+  <constant name="VERSION" value="24103"/>
-  <constant name="PROTOCOL_UUID" value="&quot;f005ada7-49a5-9ff9-855b-1c2ed542a7e3&quot;"/>
+  <constant name="GAME_VERSION_STRING" value="&quot;v2.4.2b3&quot;"/>
+  <constant name="PROTOCOL_UUID" value="&quot;32555fa7-4524-ab3b-f5f8-ce87a78db663&quot;"/>
+  <constant name="GG2_LOBBY_UUID" value="&quot;1ccf16b1-436d-856f-504d-cc1af306aaa7&quot;"/>
   <constant name="HELLO" value="0"/>
   <constant name="PLAYER_JOIN" value="1"/>
   <constant name="PLAYER_LEAVE" value="2"/>
@@ -28,22 +30,29 @@
   <constant name="UBER" value="23"/>
   <constant name="OMNOMNOMNOM" value="24"/>
   <constant name="PASSWORD_REQUEST" value="25"/>
-  <constant name="PASSWORD_SEND" value="26"/>
   <constant name="PASSWORD_WRONG" value="27"/>
   <constant name="CAPS_UPDATE" value="28"/>
   <constant name="CP_CAPTURED" value="30"/>
   <constant name="PLAYER_CHANGENAME" value="31"/>
   <constant name="GENERATOR_DESTROY" value="32"/>
   <constant name="ARENA_ENDROUND" value="33"/>
   <constant name="ARENA_RESTART" value="34"/>
-  <constant name="ARENA_UNLOCKCP" value="35"/>
+  <constant name="UNLOCKCP" value="35"/>
   <constant name="SERVER_KICK" value="36"/>
   <constant name="KICK" value="37"/>
   <constant name="KICK_NAME" value="38"/>
-  <constant name="KICK_PASSWORDCOUNT" value="39"/>
+  <constant name="TOGGLE_ZOOM" value="40"/>
-  <constant name="SCOPE_IN" value="40"/>
+  <constant name="RETURN_INTEL" value="41"/>
-  <constant name="SCOPE_OUT" value="41"/>
+  <constant name="INCOMPATIBLE_PROTOCOL" value="42"/>
-  <constant name="KOTH_UNLOCKCP" value="42"/>
+  <constant name="JOIN_UPDATE" value="43"/>
+  <constant name="DOWNLOAD_MAP" value="44"/>
+  <constant name="SENTRY_POSITION" value="45"/>
+  <constant name="I_AM_A_HAXXY_WINNER" value="50"/>
+  <constant name="HAXXY_CHALLENGE_CODE" value="51"/>
+  <constant name="HAXXY_CHALLENGE_RESPONSE" value="52"/>
+  <constant name="MESSAGE_STRING" value="53"/>
+  <constant name="WEAPON_FIRE" value="54"/>
+  <constant name="HAXXY_PUBLIC_KEY" value="&quot;70095e0fd9754e5a3ce2cb32f109148e&quot;"/>
   <constant name="TEAM_RED" value="0"/>
   <constant name="TEAM_BLUE" value="1"/>
   <constant name="TEAM_SPECTATOR" value="2"/>
@@ -62,7 +71,7 @@
   <constant name="CHARACTER_ANIMATION_LEN" value="2"/>
   <constant name="CHARACTER_ANIMATION_DEAD" value="5"/>
   <constant name="LOBBY_SERVER_HOST" value="&quot;ganggarrison.com&quot;"/>
-  <constant name="LOBBY_SERVER_PORT" value="29942"/>
+  <constant name="LOBBY_SERVER_PORT" value="29944"/>
   <constant name="WSAEWOULDBLOCK" value="-10035"/>
   <constant name="WSAENETDOWN" value="-10050"/>
   <constant name="WSAENETRESET" value="-10052"/>
@@ -125,6 +134,7 @@
   <constant name="NOTICE_DESTROYCHECKPOINT" value="6"/>
   <constant name="NOTICE_PLAYERTRACKENABLE" value="7"/>
   <constant name="NOTICE_PLAYERTRACKDISABLE" value="8"/>
+  <constant name="NOTICE_CUSTOM" value="9"/>
   <constant name="PARTICLES_NORMAL" value="0"/>
   <constant name="PARTICLES_OFF" value="1"/>
   <constant name="PARTICLES_ALTERNATIVE" value="2"/>

diff --git a/Source/gg2/Fonts/_resources.list.xml b/Source/gg2/Fonts/_resources.list.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
+<resources/>
-  <resource name="fnt_gg2" type="RESOURCE"/>
-</resources>
diff --git a/Source/gg2/Fonts/fnt_gg2.xml b/Source/gg2/Fonts/fnt_gg2.xml
diff --git a/Source/gg2/Global Game Settings.xml b/Source/gg2/Global Game Settings.xml
@@ -28,7 +28,7 @@
     <letF1ShowGameInfo>false</letF1ShowGameInfo>
     <letF4SwitchFullscreen>false</letF4SwitchFullscreen>
     <letF5SaveF6Load>false</letF5SaveF6Load>
-    <letF9Screenshot>true</letF9Screenshot>
+    <letF9Screenshot>false</letF9Screenshot>
     <letEscEndGame>false</letEscEndGame>
     <treatCloseAsEscape>false</treatCloseAsEscape>
   </keys>
@@ -41,10 +41,10 @@
   <gameInfo>
     <gameId>907152</gameId>
     <author>Faucet Software</author>
-    <version>2.3.1</version>
+    <version>2.4.1</version>
     <information/>
     <versionMajor>2</versionMajor>
-    <versionMinor>3</versionMinor>
+    <versionMinor>4</versionMinor>
     <versionRelease>1</versionRelease>
     <versionBuild>0</versionBuild>
     <company>Faucet Software</company>

diff --git a/Source/gg2/Objects/Characters/Blue Team/DemomanBlue.events/Create.xml b/Source/gg2/Objects/Characters/Blue Team/DemomanBlue.events/Create.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="CREATE" id="0">
+  <actions>
+    <action id="604" library="1">
+      <!--action name: Inherited-->
+      <kind>NORMAL</kind>
+      <allowRelative>false</allowRelative>
+      <question>false</question>
+      <canApplyTo>false</canApplyTo>
+      <actionType>FUNCTION</actionType>
+      <functionName>action_inherited</functionName>
+      <relative>false</relative>
+      <not>false</not>
+      <appliesTo>.self</appliesTo>
+      <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">humiliationPoses = DemomanBlueHS;
+</argument>
+      </arguments>
+    </action>
+  </actions>
+</event>
diff --git a/Source/gg2/Objects/Characters/Blue Team/EngineerBlue.events/Create.xml b/Source/gg2/Objects/Characters/Blue Team/EngineerBlue.events/Create.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="CREATE" id="0">
+  <actions>
+    <action id="604" library="1">
+      <!--action name: Inherited-->
+      <kind>NORMAL</kind>
+      <allowRelative>false</allowRelative>
+      <question>false</question>
+      <canApplyTo>false</canApplyTo>
+      <actionType>FUNCTION</actionType>
+      <functionName>action_inherited</functionName>
+      <relative>false</relative>
+      <not>false</not>
+      <appliesTo>.self</appliesTo>
+      <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">humiliationPoses = EngineerBlueHS;
+</argument>
+      </arguments>
+    </action>
+  </actions>
+</event>
diff --git a/Source/gg2/Objects/Characters/Blue Team/HeavyBlue.events/Create.xml b/Source/gg2/Objects/Characters/Blue Team/HeavyBlue.events/Create.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="CREATE" id="0">
+  <actions>
+    <action id="604" library="1">
+      <!--action name: Inherited-->
+      <kind>NORMAL</kind>
+      <allowRelative>false</allowRelative>
+      <question>false</question>
+      <canApplyTo>false</canApplyTo>
+      <actionType>FUNCTION</actionType>
+      <functionName>action_inherited</functionName>
+      <relative>false</relative>
+      <not>false</not>
+      <appliesTo>.self</appliesTo>
+      <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">humiliationPoses = HeavyBlueHS;
+</argument>
+      </arguments>
+    </action>
+  </actions>
+</event>
diff --git a/Source/gg2/Objects/Characters/Blue Team/MedicBlue.events/Create.xml b/Source/gg2/Objects/Characters/Blue Team/MedicBlue.events/Create.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="CREATE" id="0">
+  <actions>
+    <action id="604" library="1">
+      <!--action name: Inherited-->
+      <kind>NORMAL</kind>
+      <allowRelative>false</allowRelative>
+      <question>false</question>
+      <canApplyTo>false</canApplyTo>
+      <actionType>FUNCTION</actionType>
+      <functionName>action_inherited</functionName>
+      <relative>false</relative>
+      <not>false</not>
+      <appliesTo>.self</appliesTo>
+      <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">humiliationPoses = MedicBlueHS;
+</argument>
+      </arguments>
+    </action>
+  </actions>
+</event>
diff --git a/Source/gg2/Objects/Characters/Blue Team/PyroBlue.events/Create.xml b/Source/gg2/Objects/Characters/Blue Team/PyroBlue.events/Create.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="CREATE" id="0">
+  <actions>
+    <action id="604" library="1">
+      <!--action name: Inherited-->
+      <kind>NORMAL</kind>
+      <allowRelative>false</allowRelative>
+      <question>false</question>
+      <canApplyTo>false</canApplyTo>
+      <actionType>FUNCTION</actionType>
+      <functionName>action_inherited</functionName>
+      <relative>false</relative>
+      <not>false</not>
+      <appliesTo>.self</appliesTo>
+      <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">humiliationPoses = PyroBlueHS;
+</argument>
+      </arguments>
+    </action>
+  </actions>
+</event>