From 4a289894ef5cf2c6c8330b11754922465bfd314a Mon Sep 17 00:00:00 2001
From: Human Gamer <39096122+HumanGamer@users.noreply.github.com>
Date: Sat, 30 Mar 2024 16:49:58 -0500
Subject: [PATCH] Fixed missing help text on Frictional Concerns and -editor
 mode not working

---
 engine/source/console/consoleFunctions.cpp    |  25 ++
 engine/source/gui/controls/guiBitmapCtrl.cpp  |   6 +-
 engine/source/gui/controls/guiBitmapCtrl.h    |   1 +
 game/MBU.torsion                              |   4 +-
 game/MBU.torsion.exports                      | 266 +++++++++++++++---
 game/marble/client/defaults.cs                |   6 +-
 game/marble/client/init.cs                    |  13 +-
 game/marble/client/ui/esrbGui.gui             |   6 +
 game/marble/client/ui/mainMenuGui.gui         |  55 +++-
 .../data/missions/beginner/friction.zip       | Bin 32582 -> 32602 bytes
 10 files changed, 333 insertions(+), 49 deletions(-)

diff --git a/engine/source/console/consoleFunctions.cpp b/engine/source/console/consoleFunctions.cpp
index a8c9f077..3813b1cc 100644
--- a/engine/source/console/consoleFunctions.cpp
+++ b/engine/source/console/consoleFunctions.cpp
@@ -16,6 +16,7 @@
 #include "core/units.h"
 #include "console/arrayObject.h"
 #include <regex>
+#include <ctime>
 
 // This is a temporary hack to get tools using the library to
 // link in this module which contains no other references.
@@ -1641,3 +1642,27 @@ ConsoleFunction(regexReplace, const char*, 4, 4, "regexMatch(testString, pattern
         return argv[1];
     }
 }
+
+ConsoleFunction(getDayNum, const char*, 1, 1, "getDayNum();") {
+    time_t now = time(0);
+    struct tm* timeinfo = localtime(&now);
+    char* ret = Con::getReturnBuffer(20);
+    dSprintf(ret, 20, "%d", timeinfo->tm_mday);
+    return ret;
+}
+
+ConsoleFunction(getMonthNum, const char*, 1, 1, "getMonthNum();") {
+    time_t now = time(0);
+    struct tm* timeinfo = localtime(&now);
+    char* ret = Con::getReturnBuffer(20);
+    dSprintf(ret, 20, "%d", (timeinfo->tm_mon) + 1);
+    return ret;
+}
+
+ConsoleFunction(getYearNum, const char*, 1, 1, "getYearNum();") {
+    time_t now = time(0);
+    struct tm* timeinfo = localtime(&now);
+    char* ret = Con::getReturnBuffer(20);
+    dSprintf(ret, 20, "%d", (timeinfo->tm_year) + 1900);
+    return ret;
+}
diff --git a/engine/source/gui/controls/guiBitmapCtrl.cpp b/engine/source/gui/controls/guiBitmapCtrl.cpp
index 4c34a119..61addeb9 100644
--- a/engine/source/gui/controls/guiBitmapCtrl.cpp
+++ b/engine/source/gui/controls/guiBitmapCtrl.cpp
@@ -16,6 +16,7 @@ GuiBitmapCtrl::GuiBitmapCtrl(void)
     mBitmapName = StringTable->insert("");
     startPoint.set(0, 0);
     mWrap = false;
+    flipY = false;
     mTextureObject = NULL;
     mOnMouseUpCommand = StringTable->insert("");
 }
@@ -28,6 +29,7 @@ void GuiBitmapCtrl::initPersistFields()
     addField("bitmap", TypeFilename, Offset(mBitmapName, GuiBitmapCtrl));
     addField("wrap", TypeBool, Offset(mWrap, GuiBitmapCtrl));
     addField("onMouseUp", TypeString, Offset(mOnMouseUpCommand, GuiBitmapCtrl));
+    addField("flipY", TypeBool, Offset(flipY, GuiBitmapCtrl));
     endGroup("Misc");
 }
 
@@ -143,14 +145,14 @@ void GuiBitmapCtrl::onRender(Point2I offset, const RectI& updateRect)
                         ((texture->mBitmapSize.y * y) + offset.y) - yshift,
                         texture->mBitmapSize.x,
                         texture->mBitmapSize.y);
-                    GFX->drawBitmapStretchSR(texture, dstRegion, srcRegion);
+                    GFX->drawBitmapStretchSR(texture, dstRegion, srcRegion, flipY ? GFXBitmapFlip_Y : GFXBitmapFlip_None);
                 }
 
         }
         else
         {
             RectI rect(offset, mBounds.extent);
-            GFX->drawBitmapStretch(mTextureObject, rect);
+            GFX->drawBitmapStretch(mTextureObject, rect, flipY ? GFXBitmapFlip_Y : GFXBitmapFlip_None);
         }
     }
 
diff --git a/engine/source/gui/controls/guiBitmapCtrl.h b/engine/source/gui/controls/guiBitmapCtrl.h
index f371a37f..b7f170e7 100644
--- a/engine/source/gui/controls/guiBitmapCtrl.h
+++ b/engine/source/gui/controls/guiBitmapCtrl.h
@@ -22,6 +22,7 @@ class GuiBitmapCtrl : public GuiControl
     GFXTexHandle mTextureObject;
     Point2I startPoint;
     bool mWrap;
+    bool flipY;
 
 public:
     //creation methods
diff --git a/game/MBU.torsion b/game/MBU.torsion
index d299954b..78f5f88d 100644
--- a/game/MBU.torsion
+++ b/game/MBU.torsion
@@ -11,7 +11,7 @@
     <Configs>        <Config>            <Name>Debug x86</Name>
             <Executable>MBUltra_DEBUG.exe</Executable>
             <Arguments></Arguments>
-            <HasExports>true</HasExports>
+            <HasExports>false</HasExports>
             <Precompile>true</Precompile>
             <InjectDebugger>true</InjectDebugger>
             <UseSetModPaths>false</UseSetModPaths>
@@ -19,7 +19,7 @@
         <Config>            <Name>Release x86</Name>
             <Executable>MBUltra.exe</Executable>
             <Arguments></Arguments>
-            <HasExports>true</HasExports>
+            <HasExports>false</HasExports>
             <Precompile>true</Precompile>
             <InjectDebugger>true</InjectDebugger>
             <UseSetModPaths>false</UseSetModPaths>
diff --git a/game/MBU.torsion.exports b/game/MBU.torsion.exports
index 9d2aaabb..e5315bc3 100644
--- a/game/MBU.torsion.exports
+++ b/game/MBU.torsion.exports
@@ -132,6 +132,54 @@
             <desc>Stop moving.</desc>
         </method>
     </class>
+    <class>        <name>ArrayObject</name>
+        <base>SimObject</base>
+        <method>            <name>addEntry</name>
+            <args>%entry</args>
+        </method>
+        <method>            <name>clear</name>
+        </method>
+        <method>            <name>contains</name>
+            <args>%entry</args>
+        </method>
+        <method>            <name>containsEntry</name>
+            <args>%entry</args>
+        </method>
+        <method>            <name>dumpEntries</name>
+        </method>
+        <method>            <name>getEntry</name>
+            <args>%index</args>
+        </method>
+        <method>            <name>getEntryByIndex</name>
+            <args>%index</args>
+        </method>
+        <method>            <name>getSize</name>
+        </method>
+        <method>            <name>insertEntryBefore</name>
+            <args>%index, %entry</args>
+        </method>
+        <method>            <name>removeEntriesByContents</name>
+            <args>%match</args>
+        </method>
+        <method>            <name>removeEntry</name>
+            <args>%index</args>
+        </method>
+        <method>            <name>removeEntryByIndex</name>
+            <args>%index</args>
+        </method>
+        <method>            <name>removeMatching</name>
+            <args>%match</args>
+        </method>
+        <method>            <name>replaceEntryByIndex</name>
+            <args>%index, %entry</args>
+        </method>
+        <method>            <name>sort</name>
+            <args>%compareFn</args>
+        </method>
+        <method>            <name>swap</name>
+            <args>%index1, %index2</args>
+        </method>
+    </class>
     <class>        <name>BanList</name>
         <base>SimObject</base>
         <method>            <name>add</name>
@@ -241,7 +289,7 @@
     <class>        <name>CubemapData</name>
         <base>SimObject</base>
         <field>            <name>cubeFace</name>
-            <desc>filename cubeFace</desc>
+            <desc>string cubeFace</desc>
         </field>
         <field>            <name>dynamic</name>
             <desc>bool dynamic</desc>
@@ -627,6 +675,10 @@
             <desc>float times</desc>
         </field>
     </class>
+    <class>        <name>FastFileAcknowledgeEvent</name>
+    </class>
+    <class>        <name>FastFileRequestEvent</name>
+    </class>
     <class>        <name>FileChunkEvent</name>
     </class>
     <class>        <name>FileDownloadRequestEvent</name>
@@ -1541,8 +1593,33 @@
     </class>
     <class>        <name>GuiAchievementPopupCtrl</name>
         <base>GuiControl</base>
-        <field>            <name>bitmap</name>
-            <desc>filename bitmap</desc>
+        <method>            <name>setBackground</name>
+            <args>string filename</args>
+            <desc>Set the background bitmap displayed in the control.</desc>
+        </method>
+        <method>            <name>setHeader</name>
+            <args>string title</args>
+            <desc>Set the title of the achievement.</desc>
+        </method>
+        <method>            <name>setIcon</name>
+            <args>string filename</args>
+            <desc>Set the icon bitmap displayed in the control. Note that it is limited in size, to 256x256.</desc>
+        </method>
+        <method>            <name>setTitle</name>
+            <args>string title</args>
+            <desc>Set the title of the achievement.</desc>
+        </method>
+        <field>            <name>background</name>
+            <desc>filename background</desc>
+        </field>
+        <field>            <name>header</name>
+            <desc>string header</desc>
+        </field>
+        <field>            <name>icon</name>
+            <desc>filename icon</desc>
+        </field>
+        <field>            <name>title</name>
+            <desc>string title</desc>
         </field>
     </class>
     <class>        <name>GuiArrayCtrl</name>
@@ -1956,6 +2033,9 @@
         <field>            <name>fontCharset</name>
             <desc>enumval fontCharset</desc>
         </field>
+        <field>            <name>fontCharset2</name>
+            <desc>enumval fontCharset2</desc>
+        </field>
         <field>            <name>fontColor</name>
             <desc>ColorI fontColor</desc>
         </field>
@@ -1980,9 +2060,15 @@
         <field>            <name>fontSize</name>
             <desc>int fontSize</desc>
         </field>
+        <field>            <name>fontSize2</name>
+            <desc>int fontSize2</desc>
+        </field>
         <field>            <name>fontType</name>
             <desc>string fontType</desc>
         </field>
+        <field>            <name>fontType2</name>
+            <desc>string fontType2</desc>
+        </field>
         <field>            <name>hitArea</name>
             <desc>intList hitArea</desc>
         </field>
@@ -3329,12 +3415,63 @@ More of a helper function than anything.   If console access to the field list i
         </field>
     </class>
     <class>        <name>HTTPObject</name>
-        <base>TCPObject</base>
+        <base>SimObject</base>
+        <method>            <name>addHeader</name>
+            <args>name, value</args>
+        </method>
         <method>            <name>get</name>
-            <args>TransportAddress addr, string requirstURI, string query=NULL</args>
+            <args>IE: "www.garagegames.com:80"</args>
+            <desc>.
+@param requirstURI Specific location on the server to access (IE: "index.php".)
+@param query Optional. Actual data to transmit to the server. Can be anything required providing it sticks with limitations of the HTTP protocol. If you were building the URL manually, this is the text that follows the question mark.  For example: http://www.google.com/ig/api?&lt;b&gt;weather=Las-Vegas,US&lt;/b&gt;
+@tsexample
+// Create an HTTP object for communications
+%httpObj = new HTTPObject();
+
+// Specify a URL to transmit to
+%url = "www.garagegames.com:80";
+
+// Specify a URI to communicate with
+%URI = "/index.php";
+
+// Specify a query to send.
+%query = "";
+
+// Send the GET command to the server
+%httpObj.get(%url,%URI,%query);
+@endtsexample</desc>
         </method>
         <method>            <name>post</name>
-            <args>TransportAddress addr, string requestURI, string query, string post</args>
+            <args>IE: "www.garagegames.com:80"</args>
+            <desc>.
+@param requirstURI Specific location on the server to access (IE: "index.php".)
+@param query Actual data to transmit to the server. Can be anything required providing it sticks with limitations of the HTTP protocol.
+@param post Submission data to be processed.
+@tsexample
+// Create an HTTP object for communications
+%httpObj = new HTTPObject();
+
+// Specify a URL to transmit to
+%url = "www.garagegames.com:80";
+
+// Specify a URI to communicate with
+%URI = "/index.php";
+
+// Specify a query to send.
+%query = "";
+
+// Specify the submission data.
+%post = "";
+
+// Send the POST command to the server
+%httpObj.POST(%url,%URI,%query,%post);
+@endtsexample</desc>
+        </method>
+        <method>            <name>setDownloadPath</name>
+            <args>path</args>
+        </method>
+        <method>            <name>setOption</name>
+            <args>option, value</args>
         </method>
     </class>
     <class>        <name>InteriorInstance</name>
@@ -3466,6 +3603,9 @@ More of a helper function than anything.   If console access to the field list i
             <desc>bool sticky</desc>
         </field>
     </class>
+    <class>        <name>JSONObject</name>
+        <base>SimObject</base>
+    </class>
     <class>        <name>LangTable</name>
         <base>SimObject</base>
         <method>            <name>addLanguage</name>
@@ -3539,6 +3679,9 @@ More of a helper function than anything.   If console access to the field list i
         <method>            <name>setPad</name>
             <args>pad</args>
         </method>
+        <method>            <name>setPhysics</name>
+            <args>physics</args>
+        </method>
         <method>            <name>setPosition</name>
             <args>transform, mouseY</args>
         </method>
@@ -3556,6 +3699,9 @@ More of a helper function than anything.   If console access to the field list i
         <field>            <name>Controllable</name>
             <desc>bool Controllable</desc>
         </field>
+        <field>            <name>size</name>
+            <desc>float size</desc>
+        </field>
     </class>
     <class>        <name>MarbleData</name>
         <base>ShapeBaseData</base>
@@ -3664,9 +3810,6 @@ More of a helper function than anything.   If console access to the field list i
         <field>            <name>RollMegaSound</name>
             <desc>SFXProfile RollMegaSound</desc>
         </field>
-        <field>            <name>size</name>
-            <desc>float size</desc>
-        </field>
         <field>            <name>SlipSound</name>
             <desc>SFXProfile SlipSound</desc>
         </field>
@@ -3707,13 +3850,13 @@ More of a helper function than anything.   If console access to the field list i
             <desc>bool attenuateBackFace</desc>
         </field>
         <field>            <name>baseTex</name>
-            <desc>filename baseTex</desc>
+            <desc>string baseTex</desc>
         </field>
         <field>            <name>breakable</name>
             <desc>bool breakable</desc>
         </field>
         <field>            <name>bumpTex</name>
-            <desc>filename bumpTex</desc>
+            <desc>string bumpTex</desc>
         </field>
         <field>            <name>castsShadow</name>
             <desc>bool castsShadow</desc>
@@ -3725,7 +3868,7 @@ More of a helper function than anything.   If console access to the field list i
             <desc>string cubemap</desc>
         </field>
         <field>            <name>detailTex</name>
-            <desc>filename detailTex</desc>
+            <desc>string detailTex</desc>
         </field>
         <field>            <name>diffuse</name>
             <desc>ColorF diffuse</desc>
@@ -3740,7 +3883,7 @@ More of a helper function than anything.   If console access to the field list i
             <desc>bool emissive</desc>
         </field>
         <field>            <name>envTex</name>
-            <desc>filename envTex</desc>
+            <desc>string envTex</desc>
         </field>
         <field>            <name>exposure</name>
             <desc>int exposure</desc>
@@ -3758,7 +3901,7 @@ More of a helper function than anything.   If console access to the field list i
             <desc>string mapTo</desc>
         </field>
         <field>            <name>noiseTexFileName</name>
-            <desc>filename noiseTexFileName</desc>
+            <desc>string noiseTexFileName</desc>
         </field>
         <field>            <name>pixelSpecular</name>
             <desc>bool pixelSpecular</desc>
@@ -3943,6 +4086,9 @@ More of a helper function than anything.   If console access to the field list i
         <method>            <name>relayConnection</name>
             <args>ip</args>
         </method>
+        <method>            <name>requestFileDownload</name>
+            <args>path</args>
+        </method>
         <method>            <name>resolveGhostID</name>
             <args> S32 ghostID </args>
             <desc>Convert a ghost id from this connection to a real id.</desc>
@@ -4974,13 +5120,13 @@ More of a helper function than anything.   If console access to the field list i
             <desc>Rebuilds both the vertex and pixel shaders.</desc>
         </method>
         <field>            <name>DXPixelShaderFile</name>
-            <desc>filename DXPixelShaderFile</desc>
+            <desc>string DXPixelShaderFile</desc>
         </field>
         <field>            <name>DXVertexShaderFile</name>
             <desc>string DXVertexShaderFile</desc>
         </field>
         <field>            <name>OGLPixelShaderFile</name>
-            <desc>filename OGLPixelShaderFile</desc>
+            <desc>string OGLPixelShaderFile</desc>
         </field>
         <field>            <name>OGLVertexShaderFile</name>
             <desc>string OGLVertexShaderFile</desc>
@@ -6285,6 +6431,9 @@ More of a helper function than anything.   If console access to the field list i
     </class>
     <class>        <name>TSStatic</name>
         <base>SceneObject</base>
+        <field>            <name>collisionType</name>
+            <desc>enumval collisionType</desc>
+        </field>
         <field>            <name>customAmbientLighting</name>
             <desc>ColorF customAmbientLighting</desc>
         </field>
@@ -6813,6 +6962,9 @@ More of a helper function than anything.   If console access to the field list i
     <function>        <name>allowConnections</name>
         <args>bool</args>
     </function>
+    <function>        <name>Array</name>
+        <args>[name, obj1, ...]</args>
+    </function>
     <function>        <name>backtrace</name>
         <desc>Print the call stack.</desc>
     </function>
@@ -6836,7 +6988,7 @@ More of a helper function than anything.   If console access to the field list i
     <function>        <name>checkForPDLC</name>
     </function>
     <function>        <name>cleanDetailManager</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>clearClientPaths</name>
     </function>
@@ -6905,6 +7057,12 @@ If exempt is specified, then it is temporarily excluded from collision checks (F
     <function>        <name>ContentQuery</name>
         <args>[contentCategory]</args>
     </function>
+    <function>        <name>convertAssimp</name>
+        <args>path</args>
+    </function>
+    <function>        <name>convertCollada</name>
+        <args>path</args>
+    </function>
     <function>        <name>countBits</name>
         <desc>count the number of bits in the specified 32 bit integer</desc>
     </function>
@@ -6925,7 +7083,7 @@ If exempt is specified, then it is temporarily excluded from collision checks (F
         <args>packageName</args>
     </function>
     <function>        <name>debug</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>deleteDataBlocks</name>
         <desc>Delete all the datablocks we've downloaded. This is usually done in preparation of downloading a new set of datablocks,  such as occurs on a mission change, but it's also good post-mission cleanup.</desc>
@@ -6970,26 +7128,26 @@ If filePath is , this function writes the resource descriptions to the console</
     <function>        <name>dumpMemSnapshot</name>
         <args>string fileName</args>
         <desc>Dump a snapshot of current memory to a file.
-(only exists in Debug x86, Debug x64)</desc>
+(only exists in Debug x64)</desc>
     </function>
     <function>        <name>dumpNetStats</name>
     </function>
     <function>        <name>dumpNetStringTable</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>dumpProcessList</name>
     </function>
     <function>        <name>dumpResourceStats</name>
         <desc>Dump information about resources. Debug only!
-(only exists in Debug x86, Debug x64)</desc>
+(only exists in Debug x64)</desc>
     </function>
     <function>        <name>dumpTextureStats</name>
         <desc>Dump texture manager statistics. Debug only!
-(only exists in Debug x86, Debug x64)</desc>
+(only exists in Debug x64)</desc>
     </function>
     <function>        <name>DumpUnflaggedAllocs</name>
         <args>filename [optional, if not specified dumps to console]</args>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>duplicateCachedFont</name>
         <args>oldFontName, oldFontSize, newFontName</args>
@@ -7015,6 +7173,9 @@ If filePath is , this function writes the resource descriptions to the console</
         <args>src string, target string</args>
         <desc>case insensitive</desc>
     </function>
+    <function>        <name>enumColladaForImport</name>
+        <args>string shapePath, GuiTreeViewCtrl ctrl</args>
+    </function>
     <function>        <name>error</name>
         <args>text [, ... ]</args>
     </function>
@@ -7073,7 +7234,7 @@ If filePath is , this function writes the resource descriptions to the console</
         <args>text</args>
     </function>
     <function>        <name>FlagCurrentAllocs</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>flagCurrentGFXResources</name>
     </function>
@@ -7110,6 +7271,8 @@ If filePath is , this function writes the resource descriptions to the console</
     </function>
     <function>        <name>getCurrentActionMap</name>
     </function>
+    <function>        <name>getDayNum</name>
+    </function>
     <function>        <name>getDesktopResolution</name>
         <desc>Get the width, height, and bitdepth of the screen.</desc>
     </function>
@@ -7158,11 +7321,13 @@ If filePath is , this function writes the resource descriptions to the console</
     <function>        <name>getLanguage</name>
     </function>
     <function>        <name>getMaxFrameAllocation</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>getModPaths</name>
         <desc>Return the mod paths the resource manager is using.</desc>
     </function>
+    <function>        <name>getMonthNum</name>
+    </function>
     <function>        <name>getPixelShaderVersion</name>
         <desc>Get pixel shader version.</desc>
     </function>
@@ -7330,6 +7495,12 @@ Sim time is time since the game started.</desc>
         <args>inviteCode, acceptCb(%ip</args>
         <desc>, rejectCb)</desc>
     </function>
+    <function>        <name>jsonParse</name>
+        <args>string json</args>
+    </function>
+    <function>        <name>jsonPrint</name>
+        <args>value</args>
+    </function>
     <function>        <name>lightScene</name>
         <args>script_function completeCallback=NULL, string mode=""</args>
         <desc>Relight the scene.
@@ -7343,8 +7514,14 @@ If mode is "forceAlways", the lightmaps will be regenerated regardless of whethe
         <args>Filename file</args>
         <desc>Read a chunk hierarchy from a file.</desc>
     </function>
+    <function>        <name>loadColladaLights</name>
+        <args>string filename, [parentGroup], [baseObject]</args>
+    </function>
+    <function>        <name>loadMaterialJson</name>
+        <args>jsonFile</args>
+    </function>
     <function>        <name>loadObjectsFromMission</name>
-        <args>mission, className, dataBlock</args>
+        <args>mission, className, dataBlock, missionGroup</args>
         <desc>- Loads Objects from a Mission</desc>
     </function>
     <function>        <name>loadZip</name>
@@ -7593,6 +7770,12 @@ Possible parameters are:
     <function>        <name>redbookStop</name>
         <desc>Stop playing.</desc>
     </function>
+    <function>        <name>regexMatch</name>
+        <args>testString, pattern [, matches]</args>
+    </function>
+    <function>        <name>regexReplace</name>
+        <desc>regexMatch(testString, pattern, replacement);</desc>
+    </function>
     <function>        <name>registerLights</name>
     </function>
     <function>        <name>reInitMaterials</name>
@@ -7672,13 +7855,16 @@ Valid inputs for xRumble/yRumble are [0 - 1].</desc>
         <args>fov</args>
         <desc>- Set the FOV of the camera.</desc>
     </function>
+    <function>        <name>setImportSettings</name>
+        <args>...</args>
+    </function>
     <function>        <name>setInteriorFocusedDebug</name>
         <args>bool enable</args>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>setInteriorRenderMode</name>
         <args>int modeNum</args>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>setLogMode</name>
         <args>mode</args>
@@ -7716,7 +7902,7 @@ Valid inputs for xRumble/yRumble are [0 - 1].</desc>
         <args> bool f </args>
     </function>
     <function>        <name>setVideoMode</name>
-        <args>width, height, bit depth, fullscreen</args>
+        <args>width, height, bit depth, fullscreen, [antialiasLevel]</args>
     </function>
     <function>        <name>setWord</name>
         <args>text, index, replace</args>
@@ -7951,7 +8137,7 @@ Creates a new sound source using a profile or a description and filename and pla
     <function>        <name>updateVideoMode</name>
     </function>
     <function>        <name>ValidateMemory</name>
-        <desc>(only exists in Debug x86, Debug x64)</desc>
+        <desc>(only exists in Debug x64)</desc>
     </function>
     <function>        <name>variablesExist</name>
         <args>wildCard</args>
@@ -8020,7 +8206,7 @@ Creates a new sound source using a profile or a description and filename and pla
         <args>index, invited, callback</args>
     </function>
     <function>        <name>XBLiveCreateHostedMatch</name>
-        <args>name, gamemode, mission, maxplayers, privateslots, callback</args>
+        <args>name, gamemode, mission, maxplayers, privateslots, joinSecret, callback</args>
     </function>
     <function>        <name>XBLiveEndStatsSession</name>
     </function>
@@ -8036,6 +8222,8 @@ Creates a new sound source using a profile or a description and filename and pla
     <function>        <name>XBLiveGetMatchResultsEntry</name>
         <args>index</args>
     </function>
+    <function>        <name>XBLiveGetPartyId</name>
+    </function>
     <function>        <name>XBLiveGetSignInPort</name>
     </function>
     <function>        <name>XBLiveGetStatValue</name>
@@ -8074,6 +8262,11 @@ Creates a new sound source using a profile or a description and filename and pla
     </function>
     <function>        <name>XBLiveLoadLeaderboard</name>
     </function>
+    <function>        <name>XBLivePresenceStartTimer</name>
+        <args>[stopTime]</args>
+    </function>
+    <function>        <name>XBLivePresenceStopTimer</name>
+    </function>
     <function>        <name>XBLiveProbeLocalQoS</name>
         <args>callback</args>
     </function>
@@ -8088,14 +8281,20 @@ Creates a new sound source using a profile or a description and filename and pla
     <function>        <name>XBLiveRegisterRemoteTalker</name>
         <args>xbLiveId, address</args>
     </function>
+    <function>        <name>XBLiveRespondJoinRequest</name>
+        <args>userId, reply</args>
+    </function>
     <function>        <name>XBLiveSearchForMatches</name>
         <args>gamemode, mission, maxplayers, unknown, callback</args>
     </function>
     <function>        <name>XBLiveSetEnabled</name>
         <args>enabled</args>
     </function>
+    <function>        <name>XBLiveSetPartyId</name>
+        <args>partyId</args>
+    </function>
     <function>        <name>XBLiveSetRichPresence</name>
-        <args>port, presence</args>
+        <args>port, presence, levelname, levelguid</args>
     </function>
     <function>        <name>XBLiveSetSignInPort</name>
         <args>port</args>
@@ -8126,6 +8325,9 @@ Creates a new sound source using a profile or a description and filename and pla
     <function>        <name>XBLiveUnregisterRemoteTalker</name>
         <args>xbLiveId</args>
     </function>
+    <function>        <name>XBLiveUpdateHostedMatch</name>
+        <args>publicused, publicfree, privateused, privatefree, status, gamemode, mission, disablejip</args>
+    </function>
     <function>        <name>XBLiveUpdateRemoteVoiceStatus</name>
         <args>xbLiveId, xbLiveVoice</args>
     </function>
diff --git a/game/marble/client/defaults.cs b/game/marble/client/defaults.cs
index df26b1c3..8bc8c7cd 100644
--- a/game/marble/client/defaults.cs
+++ b/game/marble/client/defaults.cs
@@ -17,6 +17,8 @@
 $pref::ChatHudLength = 1;
 $pref::useStencilShadows = true;
 $pref::forceDirectConnect = false;
+$pref::ForceSecretMode = false;
+$Pref::DisableSecretMode = false;
 $pref::Input::LinkMouseSensitivity = 1;
 // DInput keyboard, mouse, and joystick prefs
 $pref::displayMPHelpText = false;
@@ -116,8 +118,8 @@
 $pref::SFX::channelVolume8 = 0.8;
 
 $pref::Client::AutoStart = true;
-$pref::Client::AutoStartMission = "marble/data/missions/intermediate/Urban Jungle/urban.mis";
-$pref::Client::AutoStartMissionIndex = 21;
+$Client::AutoStartMission = "marble/data/missions/intermediate/urban/urban.mis";
+$Client::AutoStartMissionIndex = 21;
 
 $Client::MatchMode = 0; // standard, 1 = ranked
 $Client::UseXBLiveMatchMaking = !isPCBuild();
diff --git a/game/marble/client/init.cs b/game/marble/client/init.cs
index 1ffd0c00..cc9c52fa 100644
--- a/game/marble/client/init.cs
+++ b/game/marble/client/init.cs
@@ -69,6 +69,13 @@ function initClient()
       Canvas.setCursor("DefaultCursor");
    else
       Canvas.hideCursor();
+      
+   $secretMode = false;
+   if(getDayNum() == 1 && getMonthNum() == 4 || $pref::ForceSecretMode)
+      $secretMode = true;
+      
+   if ($Pref::DisableSecretMode && !$pref::ForceSecretMode)
+      $secretMode = false;
      
    // Loadup Misc client functions
    exec("./scripts/client.cs");
@@ -1127,7 +1134,7 @@ function createPreviewServer(%mission)
 {
    %serverType = "SinglePlayer";
    if (%mission $= "")
-      %mission = $pref::Client::AutoStartMission;
+      %mission = $Client::AutoStartMission;
 
    if ($EnableFMS)
    {
@@ -1177,13 +1184,13 @@ function createPreviewServer(%mission)
       if (%missionIndex == -1)
       {
          if (%mission $= "")
-            %mission = $pref::Client::AutoStartMission;
+            %mission = $Client::AutoStartMission;
          
          %missionIndex = GameMissionInfo.findIndexByPath(%mission);
       }
    
       // Teh hak
-      GameMissionInfo.selectMission($pref::Client::AutoStartMissionIndex);
+      GameMissionInfo.selectMission($Client::AutoStartMissionIndex);
       //GameMissionInfo.selectMission(%missionIndex);
    }
    else
diff --git a/game/marble/client/ui/esrbGui.gui b/game/marble/client/ui/esrbGui.gui
index 15daf813..60730ba3 100644
--- a/game/marble/client/ui/esrbGui.gui
+++ b/game/marble/client/ui/esrbGui.gui
@@ -57,6 +57,12 @@ function ESRBGui::show(%this)
       ESRBText.visible = true;
    else
       ESRBText.visible = false;
+      
+   if($secretMode)
+      ESRBlogo.flipY = true;
+      
+   if ($secretMode)
+      RootGui.setTitle("Clown Blast Ultra");
    
 //    if (isPCBuild() & isEnglish()) ESRBText.visible = true;
       
diff --git a/game/marble/client/ui/mainMenuGui.gui b/game/marble/client/ui/mainMenuGui.gui
index f7c6d1df..f5a3552d 100644
--- a/game/marble/client/ui/mainMenuGui.gui
+++ b/game/marble/client/ui/mainMenuGui.gui
@@ -87,7 +87,13 @@ function mainMenuGui::onA(%this)
       case 4:
          RootGui.setContent(HelpAndOptionsGui, MainMenuGui);
       case 5: // upsell
-         clientShowMarketplaceUI();
+         if ($secretMode)
+         {
+            XMessagePopupDlg.show(0, "Sorry, the clowns are sleeping, please try again later...", "lulz", "clientShowMarketplaceUI();", ":(", "clientShowMarketplaceUI();");
+         } else
+         {
+            clientShowMarketplaceUI();
+         }
       case 6: // exit game in demo
          %this.exitGame();
    }
@@ -130,11 +136,31 @@ function MainMenuGui::show(%this)
    
    // add rows
    MainMenu.clear();
-   MainMenu.addRow($Text::SinglePlayer, "", 0, 2);
-   MainMenu.addRow($Text::MultiPlayer, "", 20, 2);
-   MainMenu.addRow($Text::LeaderBoards, "", 0, 6);
-   MainMenu.addRow($Text::Achievements, "", 0, 6);
-   MainMenu.addRow($Text::HelpAndOptions, "", 0, 8);
+   
+   if ($secretMode)
+      MainMenu.addRow("Single Clowns", "", 0, 2);
+   else
+      MainMenu.addRow($Text::SinglePlayer, "", 0, 2);
+   
+   if ($secretMode)
+      MainMenu.addRow("Multiple Clowns", "", 20, 2);
+   else
+      MainMenu.addRow($Text::MultiPlayer, "", 20, 2);
+      
+   if ($secretMode)
+      MainMenu.addRow("Laundry Boards", "", 0, 6);
+   else
+      MainMenu.addRow($Text::LeaderBoards, "", 0, 6);
+      
+   if ($secretMode)
+      MainMenu.addRow("Sports Highlights", "", 0, 6);
+   else
+      MainMenu.addRow($Text::Achievements, "", 0, 6);
+      
+   if ($secretMode)
+      MainMenu.addRow("Help & Op- HELP CLOWNS", "", 0, 8);
+   else
+      MainMenu.addRow($Text::HelpAndOptions, "", 0, 8);
 
    // MarketPlace button always visible:
    if (isDemoLaunch())
@@ -150,9 +176,16 @@ function MainMenuGui::show(%this)
    }
    else
    {
-      MainMenu.addRow($Text::DownloadContent, "", 0, 2);
+      if ($secretMode)
+         MainMenu.addRow("dOwNlOaD MoAr cLoWnS?!", "", 0, 2);
+      else
+         MainMenu.addRow($Text::DownloadContent, "", 0, 2);
    }
-   MainMenu.addRow($Text::RTArcadeMenu, "", 0, 10);
+   
+   if ($secretMode)
+      MainMenu.addRow("Abandon Clowns", "", 0, 10);
+   else
+      MainMenu.addRow($Text::RTArcadeMenu, "", 0, 10);
    
    // disable some stuff
    //MainMenu.setRowEnabled(4,false);
@@ -163,8 +196,14 @@ function MainMenuGui::show(%this)
    //RootGui.setTitle($Text::MainMenu @ $Test::CheatsEnabled);
    RootGui.setTitle("" @ $Test::CheatsEnabled);
    
+   if ($secretMode)
+      RootGui.setTitle("Clown Blast Ultra");
+   
    glogo.visible = 1;
    
+   if($secretMode)
+      logo.flipY = true;
+   
    // Stat up the title music
    //if( xbHasPlaybackControl() && !xbIsPlayingMusic() )
    //   playMusic();  
diff --git a/game/marble/data/missions/beginner/friction.zip b/game/marble/data/missions/beginner/friction.zip
index a68a5e29315e140179808731ef35f4caf7f5be27..0e7f848fbe8b0a9e84b7511aa7355d4bb376c9fc 100644
GIT binary patch
delta 1488
zcmV;>1uy!>{sG$l0Sr(}0|XQR000O8P_MBJFnJCbg??B)c7exq1pojj9+OIWD1Yk2
zZL{bjsDt*fSOkhiJKV^kLCMV;MfbPwkn%%PEVnVz#;pw}G-o*CH}i33Bp)Apo`>G`
z{_LMzppWm*F8Zj~e|h#6!SvxlE^pC5O<o#3n;yMUMWJ-=zWk0pA08YYAcUOC(5Pwo
z?&=>oESG9$`A9o0w0x<2n9Wj&{(nGE$dhM>2Su5f@|Db{7xLc{!8H2Kj-Eb!EkDU@
zu$1y=H5;iKjnr_KmGhOEm8?_~XPgU+aZ@s%I?0tBt2~#cA<XR6+`7heo;YjuExm=Q
z#%{(iaj~#nsC=Bs^DLRS?5DCAT7~DRltqaqm3z=g8<gbWlu{a{n@h$sm6LFK1b_1$
z?}^jU3wxY;JUAs@OhxE1)(@hX(-*jZ@@28~%d>SnZsteuskwiu3su_7f>p)>MBr2N
zk<n$c6cdE)do3)6NmfM-!FxS_t<qGwC3Q<O$x~?t*GZ~xTQQm>7Hg8dR^SH^{db%u
zWpZ5HC|SVY`Q<V`emcq4%Z8brrGKxa8ef;^()@-0Ze6k^Cts1%jq<@%%9J>X5A-3M
z#B?R5o5XA-W^3^$Rj8{>o&w|~A69M@b$X8UxGrQZ*@@18D9&(z?F-!<5a0c8E*zBF
zOh^mra-Md~v%B*jbT*qvXUGF;_&B11kpOwv=a|PN-k?oa+A$$94(+lah<|7hZct`x
zWw2~@X%O*1tW|GSo_>&-9;(H$Z}QWM`=b%$o^vCIYO2;;u4%z}80bu;yE$}LNHAb?
z!OX~_#cLxi<$Jm;^<<&a(#ZAuN+-!X7AN_;(WsDR#Z#*z>PPTq{xYl1)7{w>A_xhi
zA&#jHPRt|DT$nHxB#P_^;(r#?Wen>1!g_27XLc%&PAs1<-MAxvw9><m$sIOR^ne04
zc0MUeqqF2ny3H27McQzi-hghFAJw3w3Rtqj;tLVt2$G@CLc(HV-4t>fM)eG^6J?Ug
zm6CZ`t>b*5-X7dtS2*}Jn&Rc9Rs)+s+<=MN+Kzy3iJ}+aJqct-=zq=@)$uH^GUPTe
zKOD)jbiYuQJ^y%Qlw+0;ZAv|$`u0K^lPGA43RQJLn}W7%v<B1UHb2*3zgYKK=x$_P
zi{$j0jaJ<=9D-a&kDA_bEFdUuYIL~>b$AJFcNA(xz1nw@t~I`FWpF=F+bHW0Z83U;
zZl(drZgB;u4#S3WFn_(4rjxrQuvuFmkA{AT2}MNsf(fx1k4y0(Wi|`&h>+0bdd4uM
zE<yYtioQ406KHx(QUmrTF*o&|*CeT$Rb{S`*PQalRefs+p@eH~I)r*wc1iD-^E?jj
zV$fiSN2bd-ON!!>6&(fZ>qzzrN4z@@k8_KHF*w2<ga;hW1e0!k34hOnL_9`0eOL^H
z`2y|D2?=%w;z5dsqOcDry25c`)Oak-mNSkh^dZr`AwVre5XXl?;hr^BdtGZxbvD12
zsacj++-kS$BeGSx9(muYxYD!xDO-=h7F)Gn_$9u#*D2g{N5b6!ijc<4-2q}6u$XnE
z+O1?FKHMF}HXMwR2Y(~h&m0o6%W)>ZN|As&WkP?2{3={T*nR|rM7txQE*##zAQ8JG
zsSe4$An794G6DDWEKiG0dPUHPa6l8+3)#1wl!yaJ#PP$Gz_YyC?H=b`bYHf39J++S
zF=m&-_Rw@8ba&!=ocRF(JS6h5fO6{v;F^Ha&A6~n;($~S<9}HcGEqGZz&N5YA{ZD)
z`1c0=+!%d3Q0b0<S?F_ug{43cFgPiG9E9Q4dqK)#pWtB6fl-Jc$M&&K<cAarehkP+
zSL;<FBVp___9)2g=lJe#!Tq<V)i1&S15ir=0u%rg0000808p<nRtrv9dkA>|06TpF
q01N;C000000F&T;A`TdZepo$rfyZ<O001Z+lMsI}2GD*00001?@ySR4

delta 1446
zcmV;X1zGyq{sG4R0Sr(}0|XQR000O8P^YmBFnJDzgpyZ+Gc`b91polD9Ft0UD1YL_
zZBz6S)Iob#ECR)%9d2aNpyXzaqWjx-NckZtmb>+)jkh+O(466j-^|CEk$imYc^-P#
zd(}U^L?7RuU-nV2|Kj{Dg6YG9T;8F9n!GT2Ha&WyibCn!efbrAK0G))KnOXNp;6QF
z-SwYxST5Dh^O1I1X!%n4Fq@?k{eOm@kSEU$4~jA|<x81OFXdk)f@$=N9X);eT7Ht*
zU@7I#YBo|e8mZwdE9WaSD_N-~&Nvqs<ECUjb&_j2R(UQ>LzvmCxpj@{JaN|QTY3vq
zjopl4;&NfTQ298M7g;iI*-vFLv<fGvltqaqm3z=g8<gbWlu{a{n@h$sm6LFK1b<17
z_rzJ~g*{F^9-I*`rXuth>jzQH>2usa{jym4<=HwOxAP<T)Z9PSg(~f3!75_`BJipC
z$mlXziV4E@y%rY3B&(u^;Ju!|QE4jOlDZ|C<f$}+n<UkDtr$%bi#5q!EARt|{yt8V
zGC3}8l`P=z{Aw8=Kb>UjWy4I*(tnpyjc>{eX@19lv@Y3_lds6>M)_bWWlEgH2l|jr
zV!9I3O=7kZv$gn>D%5o*&j50g4=Xo{Iz2~vTo<yI>{Mq!6lXZV_J!^bi0}S47Y<5o
zCZq**IZr$0+5PzsI-5<TGvom^d>m21NPs--bIfBBZ_uVI?U;}lhjv*IM1M30Hz>2U
zGFY~{G>CX0)~a_ZPd~^^57pw>H~DGB{m}?=&xMggHC1aa*R<d~40NW_-5feABp9%{
zU}j{|;<b^M@;zOada_VyY2^BSrIX|xi<A7_XjI6u;;GdU^&@yYf00$^>Hh2r5rl-%
z5XaO8C*~1nE=(8;5=C|daes^HG6wa0VLdj4Gdq<>r<TuGZrqVSTIu1(<PMuDdO(3&
zJD(J#(OGgW-DZp4B5k-$Z$LN8k7`g-1uR)%@r4L+1j*26Az?AGZVEXKqk0C|i89IL
zTFJbu)^Wa2Zx8OTD;)e9P4V(ltAWiRZoousZAU=2M9~ZIo&>TZbbsfI>Uf@48FCw#
zAC6>Mx}U4co_{<t$}!7_Hl-d=eRnC1Nfb0ig{nHBO+i~WT7zkFmtSbGU#$BqbU(7L
zMRI!0Myu`_4neM?M@{cI77!FSHM(4cI=qCoI|{X;UhO+c*BW28GPs|oZIpG0wirD^
zH`9P*x3~gShhalGn19|#)5%>D*sLv(M?*ivgd!q*!Gze1$EEm?GMfc>L`djzJ!2SB
zmmq!+Mc*6hDKxz%sR4VFnA>{KYm!vWsxsHeYfky&s=hUZP{Oq~9YQ@TyQJTi^E?jj
zV$fiSN2bd-ON!!(6&(fZ>qzzrN4z@@k8_KHF*w2<ga;hW1e0!k34i|wiFk~1`mh)X
z^99<Q6B6tW#Df$MMPVOMbcN&6sPR~u?t=k$f01zaA|j+QbN3>c1}tVBhkh$8;zOSv
zBM2~K<iQ}i2T>J}wZ>Fu^Bb9(W$neSUc5dcTczuf_iq(fdUii$>lxW%tM&`OBD)Za
z{4D7T?%4?a8BV%z5r1L(5fBpXj)b~!c>97x?2e>5B>RG-i(JbD+|#o>EjsBHK}qC*
zCiXjSF1k-j!~rDYxW4kgAv({i-R^PDMc>L6j}ycK$CzCT+e6cZ(A|meapngE@Q}#I
z0?MryfNKIuH{*i4(KsO0V__DBOjP%!7)LZl1Owv;|K6Zaj8)Nh1C{Own1wzkSXc@K
z0fUp`$3Ylwy(^(C_6ZL592kWNa%>+kM1Dx2;KzWBbhTa;G7`o<V~>K&eva?|D%pQ~
zR{bXV4^T@10u%rg0000808pos-hMa^g@lq<f-^NhU<CjGvK*5ne=r8TegFUf07por
A%m4rY