Merge branch 'master' into very_good_yes

1.2b_todo.md

@@ -1,24 +0,0 @@
-# DONE
-
-# Todo for 1.2b release
-- [x] + create a github repo
-
-~ shavit-core:
-- [x] * make a better check of game engine instead of using a directory
-- [x] + sm_pause
-- [x] + sm_resume
-- [x] + add natives/forwards for sm_pause/resume and polish code
-
-~ shavit-misc:
-- [x] + cvar "shavit_misc_godmode"
-0 - nothing
-1 - only world damage
-2 - only player damage
-3 - full godmode
-- [x] + 250 maxspeed for every pistol
-
-~ shavit-zones:
-- [x] + player slaying zone
-- [x] + cvar "shavit_zones_style"
-0 - 3d (default)
-1 - 2d

1.3b_todo.md

@@ -1,11 +0,0 @@
-# DONE
-
-# Todo for 1.3b release
-~ shavit-core:
-- [x] + Handle freestyle zones
-
-~ shavit-zones:
-- [x] + Allow creation of freestyle zones
-- [x] + Make multiple freestyle zones possible (damn you Aoki and badges for making stuff difficult!)
-- [x] + Handle deletion of multiple freestyle zones
-- [x] + Handle drawing of end/freestyle zones properly

1.4b_todo.md

@@ -1,23 +0,0 @@
-# DONE
-
-# Todo for 1.4b release
-~ shavit-core:
-- [x] + Add a cvar for autobhop.
-- [x] + Add a cvar for +left/right blocks.
-- [x] + Add cvars that prevent pausing/restarting.
-
-~ shavit-zones:
-- [x] + Add a submenu that can adjust the zone's X/Y/Z axis before it's being confirmed.
-
-~ [NEW PLUGIN] shavit-stats:
-- [x] + Show maps done (/SW)
-- [x] + Show maps left (/SW)
-- [x] + Show SteamID3
-- [x] * Make it actually work
-
-~ [NEW PLUGIN] shavit-timelimit:
-- [x] + Take an average of X (default: 100) times on a map and use it to decide the timelimit/roundtime for the map.
-
-~ [NEW PLUGIN] shavit-replay:
-- [x] + Properly working replay bot for forwards
-- [x] + \^ same but also for sideways

addons/sourcemod/scripting/include/SteamWorks.inc

@@ -130,6 +130,7 @@ enum EHTTPMethod
 	k_EHTTPMethodPUT,
 	k_EHTTPMethodDELETE,
 	k_EHTTPMethodOPTIONS,
+	k_EHTTPMethodPATCH,
 
 	// The remaining HTTP methods are not yet supported, per rfc2616 section 5.1.1 only GET and HEAD are required for 
 	// a compliant general purpose server.  We'll likely add more as we find uses for them.
@@ -215,7 +216,9 @@ native bool:SteamWorks_IsVACEnabled();
 native bool:SteamWorks_GetPublicIP(ipaddr[4]);
 native SteamWorks_GetPublicIPCell();
 native bool:SteamWorks_IsLoaded();
-native bool:SteamWorks_SetGameDescription(String:sDesc[]);
+native bool:SteamWorks_SetGameData(const String:sData[]);
+native bool:SteamWorks_SetGameDescription(const String:sDesc[]);
+native bool:SteamWorks_SetMapName(const String:sMapName[]);
 native bool:SteamWorks_IsConnected();
 native bool:SteamWorks_SetRule(const String:sKey[], const String:sValue[]);
 native bool:SteamWorks_ClearRules();
@@ -239,6 +242,40 @@ native bool:SteamWorks_SetHTTPRequestContextValue(Handle:hHandle, any:data1, any
 native bool:SteamWorks_SetHTTPRequestNetworkActivityTimeout(Handle:hHandle, timeout);
 native bool:SteamWorks_SetHTTPRequestHeaderValue(Handle:hHandle, const String:sName[], const String:sValue[]);
 native bool:SteamWorks_SetHTTPRequestGetOrPostParameter(Handle:hHandle, const String:sName[], const String:sValue[]);
+native bool:SteamWorks_SetHTTPRequestUserAgentInfo(Handle:hHandle, const String:sUserAgentInfo[]);
+native bool:SteamWorks_SetHTTPRequestRequiresVerifiedCertificate(Handle:hHandle, bool:bRequireVerifiedCertificate);
+native bool:SteamWorks_SetHTTPRequestAbsoluteTimeoutMS(Handle:hHandle, unMilliseconds);
+
+#if SOURCEMOD_V_MAJOR >= 1 && SOURCEMOD_V_MINOR >= 9
+typeset SteamWorksHTTPRequestCompleted
+{
+	function void (Handle hRequest, bool bFailure, bool bRequestSuccessful, EHTTPStatusCode eStatusCode);
+	function void (Handle hRequest, bool bFailure, bool bRequestSuccessful, EHTTPStatusCode eStatusCode, any data1);
+	function void (Handle hRequest, bool bFailure, bool bRequestSuccessful, EHTTPStatusCode eStatusCode, any data1, any data2);
+};
+
+typeset SteamWorksHTTPHeadersReceived
+{
+	function void (Handle hRequest, bool bFailure);
+	function void (Handle hRequest, bool bFailure, any data1);
+	function void (Handle hRequest, bool bFailure, any data1, any data2);
+};
+
+typeset SteamWorksHTTPDataReceived
+{
+	function void (Handle hRequest, bool bFailure, int offset, int bytesreceived);
+	function void (Handle hRequest, bool bFailure, int offset, int bytesreceived, any data1);
+	function void (Handle hRequest, bool bFailure, int offset, int bytesreceived, any data1, any data2);
+};
+
+typeset SteamWorksHTTPBodyCallback
+{
+	function void (const char sData[]);
+	function void (const char sData[], any value);
+	function void (const int data[], any value, int datalen);
+};
+
+#else
 
 funcenum SteamWorksHTTPRequestCompleted
 {
@@ -261,6 +298,15 @@ funcenum SteamWorksHTTPDataReceived
 	public(Handle:hRequest, bool:bFailure, offset, bytesreceived, any:data1, any:data2)
 };
 
+funcenum SteamWorksHTTPBodyCallback
+{
+	public(const String:sData[]),
+	public(const String:sData[], any:value),
+	public(const data[], any:value, datalen)
+};
+
+#endif
+
 native bool:SteamWorks_SetHTTPCallbacks(Handle:hHandle, SteamWorksHTTPRequestCompleted:fCompleted = INVALID_FUNCTION, SteamWorksHTTPHeadersReceived:fHeaders = INVALID_FUNCTION, SteamWorksHTTPDataReceived:fData = INVALID_FUNCTION, Handle:hCalling = INVALID_HANDLE);
 native bool:SteamWorks_SendHTTPRequest(Handle:hRequest);
 native bool:SteamWorks_SendHTTPRequestAndStreamResponse(Handle:hRequest);
@@ -272,16 +318,11 @@ native bool:SteamWorks_GetHTTPResponseBodySize(Handle:hRequest, &size);
 native bool:SteamWorks_GetHTTPResponseBodyData(Handle:hRequest, String:sBody[], length);
 native bool:SteamWorks_GetHTTPStreamingResponseBodyData(Handle:hRequest, cOffset, String:sBody[], length);
 native bool:SteamWorks_GetHTTPDownloadProgressPct(Handle:hRequest, &Float:percent);
+native bool:SteamWorks_GetHTTPRequestWasTimedOut(Handle:hRequest, &bool:bWasTimedOut);
 native bool:SteamWorks_SetHTTPRequestRawPostBody(Handle:hRequest, const String:sContentType[], const String:sBody[], bodylen);
+native bool:SteamWorks_SetHTTPRequestRawPostBodyFromFile(Handle:hRequest, const String:sContentType[], const String:sFileName[]);
 
-funcenum SteamWorksHTTPBodyCallback
-{
-	public(const String:sData[]),
-	public(const String:sData[], any:value),
-	public(const data[], any:value, datalen)
-};
-
-native bool:SteamWorks_GetHTTPResponseBodyCallback(Handle:hRequest, SteamWorksHTTPBodyCallback:fCallback, any:data = 0, Handle:hPlugin = INVALID_HANDLE);
+native bool:SteamWorks_GetHTTPResponseBodyCallback(Handle:hRequest, SteamWorksHTTPBodyCallback:fCallback, any:data = 0, Handle:hPlugin = INVALID_HANDLE); /* Look up, moved definition for 1.7+ compat. */
 native bool:SteamWorks_WriteHTTPResponseBodyToFile(Handle:hRequest, const String:sFileName[]);
 
 forward SW_OnValidateClient(ownerauthid, authid);
@@ -324,6 +365,7 @@ public __ext_SteamWorks_SetNTVOptional()
 	MarkNativeAsOptional("SteamWorks_GetPublicIP");
 	MarkNativeAsOptional("SteamWorks_GetPublicIPCell");
 	MarkNativeAsOptional("SteamWorks_IsLoaded");
+	MarkNativeAsOptional("SteamWorks_SetGameData");
 	MarkNativeAsOptional("SteamWorks_SetGameDescription");
 	MarkNativeAsOptional("SteamWorks_IsConnected");
 	MarkNativeAsOptional("SteamWorks_SetRule");
@@ -363,6 +405,7 @@ public __ext_SteamWorks_SetNTVOptional()
 	MarkNativeAsOptional("SteamWorks_GetHTTPStreamingResponseBodyData");
 	MarkNativeAsOptional("SteamWorks_GetHTTPDownloadProgressPct");
 	MarkNativeAsOptional("SteamWorks_SetHTTPRequestRawPostBody");
+	MarkNativeAsOptional("SteamWorks_SetHTTPRequestRawPostBodyFromFile");
 
 	MarkNativeAsOptional("SteamWorks_GetHTTPResponseBodyCallback");
 	MarkNativeAsOptional("SteamWorks_WriteHTTPResponseBodyToFile");