Permalink
Browse files

Merge branch 'master' into chat2

Conflicts:
	Source/gg2/Objects/Menus/HaxxyController.xml
	Source/gg2/Objects/Networking/GameServer.events/Destroy.xml
	Source/gg2/Scripts/game_init.gml
  • Loading branch information...
2 parents 646de74 + a346fb2 commit 9c2625d585fb35e8971253b251bed5d3c8df84a6 @Medo42 committed Jan 13, 2013
Showing 1,224 changed files with 440 additions and 441 deletions.
Binary file not shown.
View
@@ -489,6 +489,10 @@ You can find more information on Faucet Networking at http://gmc.yoyogames.com/i
This game uses the Download Manager DLL, created by Hobbel. It was wrapped into an extension by cspotcode.
You can find more information on the Download Manager DLL at http://www.hobbl.com/gmdlls/downloadmanager
+This game uses the Faucet Forwarding Extension, created by NAGN, which wraps libminiupnp.
+miniupnp is availible under the BSD license: see miniupnp.license for full license.
+You can find more about Faucet Forwarding at its GitHub Page:
+https://github.com/nagn/Faucet-Forwarding
Readme Changelog
2/7/09 - fishmatt - cleaned everything up for 2.0
5/3/09 - mrfredman - updated things for 2.1
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;"/>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<extensionPackages>
+ <package>Faucet Forwarding</package>
<package>Faucet Networking</package>
<package>GG2DLL</package>
<package>Hobbl Download Manager Ext Wrapper</package>
@@ -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>
@@ -13,19 +13,19 @@
<not>false</not>
<appliesTo>.self</appliesTo>
<arguments>
- <argument kind="STRING">{
- hspeed/=1.1;
- if(abs(hspeed)&lt;0.2) {
- hspeed=0;
- }
-
- if(place_free(x,y+1)) {
- vspeed += 0.6;
- if(vspeed&gt;10) {
- vspeed=10;
- }
+ <argument kind="STRING">if(abs(hspeed)&lt;0.2) {
+ hspeed=0;
+}
+if(place_free(x,y+1)) {
+ vspeed += 0.6;
+ if(vspeed&gt;10) {
+ vspeed=10;
}
-}</argument>
+} else {
+ hspeed/=1.1;
+}
+
+</argument>
</arguments>
</action>
</actions>
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<event category="COLLISION" with="Obstacle">
+ <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">{
+ hspeed*=hfric;
+ rotspeed*=rotfric;
+
+ if((speed&gt;4) and (vspeed&gt;2) and (snd)){
+ repeat(9)
+if(abs(speed/bloodchance)&gt;random(3)) {
+ var blood;
+ blood = instance_create(x,y-1,BloodDrop);
+ blood.ogib=self;
+ blood.odir=point_direction(x,y,x+hspeed,y+vspeed);
+ with(blood) {
+ motion_add(odir, ogib.speed*-0.8);
+ hspeed+=random(8)-3.5;
+ vspeed-=random(6)-2;
+ }
+ }
+
+ }
+
+ move_contact_solid(point_direction(x,y,x+hspeed,y+vspeed), speed);
+ if(not place_free(x,y+sign(vspeed))) {
+ vspeed*=-0.4;
+ if(not place_free(x+hspeed,y)){
+ move_contact_solid(point_direction(x,y,x+hspeed,y+vspeed), speed);
+ hspeed*=-0.4;
+ }
+ }
+ if(not place_free(x+sign(hspeed),y)){
+ hspeed*=-0.4;
+ if(not place_free(x,y+vspeed)) {
+ move_contact_solid(point_direction(x,y,x+hspeed,y+vspeed), speed);
+ vspeed*=-0.4;
+ }
+ }
+}
+</argument>
+ </arguments>
+ </action>
+ </actions>
+</event>
@@ -14,7 +14,18 @@
<appliesTo>.self</appliesTo>
<arguments>
<argument kind="STRING">image_speed = 0;
-image_index = 0;
+image_index = -1;
+image_xscale=2;
+image_yscale=2;
+bloodchance=2;
+hfric=0.4;
+snd=false;
+rotfric=0.2;
+direction = (random(100)-80);
+alarm[0]=250;
+rotspeed=1;
+fadeout = false;
+vspeed=-4
</argument>
</arguments>
</action>
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<object id="806">
- <sprite>HaxxyS</sprite>
+ <sprite>XmashatS</sprite>
<solid>false</solid>
<visible>true</visible>
- <depth>-1</depth>
+ <depth>0</depth>
<persistent>false</persistent>
- <parent/>
+ <parent>Gib</parent>
<mask/>
</object>
@@ -10,4 +10,5 @@
<resource name="BloodDrop" type="RESOURCE"/>
<resource name="Blood" type="RESOURCE"/>
<resource name="PartyHat" type="RESOURCE"/>
+ <resource name="XmasHat" type="RESOURCE"/>
</resources>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="MOUSE" id="10">
- <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">image_index = 1;
-</argument>
- </arguments>
- </action>
- </actions>
-</event>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="MOUSE" id="11">
- <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">image_index = 0;
-</argument>
- </arguments>
- </action>
- </actions>
-</event>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<event category="MOUSE" id="4">
- <actions>
- <action id="326" library="1">
- <kind>NORMAL</kind>
- <allowRelative>false</allowRelative>
- <question>false</question>
- <canApplyTo>false</canApplyTo>
- <actionType>FUNCTION</actionType>
- <functionName>action_splash_web</functionName>
- <relative>false</relative>
- <not>false</not>
- <appliesTo>.self</appliesTo>
- <arguments>
- <argument kind="BOTH">http://www.ganggarrison.com/haxxy2012</argument>
- <argument kind="MENU">1</argument>
- </arguments>
- </action>
- </actions>
-</event>
@@ -67,6 +67,11 @@ menu_addedit_boolean("Auto Balance:", "global.autobalance", '
menu_addedit_boolean("Announce to Lobby:", "global.useLobbyServer", '
gg2_write_ini("Settings", "UseLobby", argument0);
');
+menu_addedit_boolean("Attempt UPnP Forwarding:", "global.attemptPortForward", '
+ if (argument0 == 1)
+ show_message("Warning: UPNP support is currently experimental and enabling it may cause freezing while starting a server, but should cause no freezing ingame")
+ gg2_write_ini("Server", "Attempt UPnP Forwarding", argument0);
+ ');
menu_addlink("Start Game", '
//Server respawn time calculator. Converts each second to a frame. (read: multiply by 30 :hehe:)
if (global.Server_RespawntimeSec == 0)
@@ -12,5 +12,4 @@
<resource name="CreditsController" type="RESOURCE"/>
<resource name="DevMessageChecker" type="RESOURCE"/>
<resource name="MenuController" type="RESOURCE"/>
- <resource name="HaxxyController" type="RESOURCE"/>
</resources>
@@ -36,6 +36,9 @@ with(JoiningPlayer)
with(PlayerControl)
instance_destroy();
+if (global.attemptPortForward and portForwarded)
+ upnp_release_port(string(global.hostingPort), "TCP")
+
with(Chatbox)
instance_destroy();
@@ -17,6 +17,10 @@
sendLobbyUnreg();
sleep(10); // Wait a bit so the networking extension has time to send the packet...
}
+if(global.attemptPortForward and portForwarded) {
+ upnp_release_port(string(global.hostingPort), "TCP")
+ sleep(10); // Wait a bit so the forwarding extension has time to request a release
+}
</argument>
</arguments>
</action>
View
@@ -4,12 +4,12 @@
<size height="600" width="600"/>
<grid>
<isometric>false</isometric>
- <snap x="2" y="16"/>
+ <snap x="16" y="16"/>
</grid>
<speed>30</speed>
<persistent>false</persistent>
<creationCode/>
- <backgroundColor>2D2C24</backgroundColor>
+ <backgroundColor>C0C0C0</backgroundColor>
<drawBackgroundColor>true</drawBackgroundColor>
<backgrounds>
<backgroundDef>
@@ -107,12 +107,6 @@
<creationCode/>
<locked>false</locked>
</instance>
- <instance>
- <object>HaxxyController</object>
- <position x="38" y="48"/>
- <creationCode/>
- <locked>false</locked>
- </instance>
</instances>
<tiles/>
<editorSettings remember="false"/>
Oops, something went wrong.

0 comments on commit 9c2625d

Please sign in to comment.