Merge remote-tracking branch 'origin/master'

engine/source/discord/DiscordGame.cpp

@@ -83,6 +83,7 @@ void onReady(const DiscordUser* request)
     DiscordGame::get()->setActive(true);
     Con::printf("Starting RPC for user %s", request->username);
     DiscordGame::get()->setUsername(request->username);
+    DiscordGame::get()->setUserId(request->userId);
 }
 
 void onError(int errorCode, const char* message)

engine/source/discord/DiscordGame.h

@@ -87,6 +87,14 @@ class DiscordGame
         delete[] buf;
         return ste;
     }
+    StringTableEntry getUserId()
+    {
+        return StringTable->insert(mUserId.c_str());
+    }
+    void setUserId(const char* uid)
+    {
+        mUserId = uid;
+    }
     void setActive(bool a)
     {
         mActive = a;
@@ -121,6 +129,7 @@ class DiscordGame
     StringTableEntry mJoinSecret;
     StringTableEntry mPartyId;
     std::string mUsername;
+    std::string mUserId;
     //const char* mIcon;
     //const char* mIconText;
 };

engine/source/xblive/xbliveFunctions.cpp

@@ -155,8 +155,17 @@ ConsoleFunction(XBLiveGetUserName, const char*, 1, 1, "()")
     //char* ret = Con::getReturnBuffer(1024);
     //dSprintf(ret, 1024, "%s", "Alex");
     //return ret;
+    if (Con::getBoolVariable("pref::Player::UsingCustomName"))
+    {
+        return Con::getVariable("pref::Player::Name");
+    }
     if (DiscordGame::get()->isActive())
-        return DiscordGame::get()->getUsername(15);
+    {
+        const char* res = DiscordGame::get()->getUsername(15);
+        Con::setVariable("Player::DiscordUsername", res);
+        Con::executef(2, "getDiscordUsername", DiscordGame::get()->getUserId());
+        return res;
+    }
 
     // Use platform username until we set up a login system.
     return Platform::getUserName(15); // X360 only supported at max 15 characters.

game/common/local/englishStrings.inf

@@ -277,6 +277,7 @@ $Text::LobbyHostPrivateSlots = "Private Slots";
 $Text::LobbyHostPublicSlots = "Public Slots"; 
 $Text::LobbyHostInviteCode = "Invite Code";
 $Text::LobbyHostInviteVisibility = "Invite Visibility";
+$Text::LobbyHostStreamerMode = "Streamer";
 
 ; separators
 $Text::Colon  = ":";
@@ -344,6 +345,7 @@ $Text::MarbleSkin = "Marble Type";
 $Text::UIStyle = "UI Style";
 $Text::UIStyleOptions = "Mouse/Keyboard\tXbox 360";
 $Text::InviteVisibilityOptions = "Hidden\tVisible";
+$Text::StreamerModeOptions = "No\tYes";
 
 ;This string is no longer used $Text::MarbleOptions = "one\ttwo\tthree\tfour\tfive\tsix\tseven\teight\tnine\tten\televen\ttwelve\tthirteen\tfourteen\tfifteen\tsixteen\tseventeen\teighteen\tnineteen\ttwenty";
 ;$Text::MarbleColor = "Marble Color";

game/marble/client/defaults.cs

@@ -61,6 +61,8 @@
 $pref::OpenGL::maxHardwareLights = 3;
 $pref::VisibleDistanceMod = 1.0;
 $pref::Lobby::InviteVisibility = true;
+$pref::Lobby::StreamerMode = false;
+$pref::Player::UsingCustomName = false;
 
 /// The sound provider to select at startup.  Typically
 /// this is DirectSound, OpenAL, or XACT.  There is also 

game/marble/client/init.cs

@@ -135,6 +135,7 @@ function initClient()
    exec("./ui/StartupErrorGui.gui");
    exec("./ui/controlerDisplayGui.gui");
    exec("./ui/joinGameGui.gui");
+   exec("./ui/enterNameGui.gui");
 
    //exec("./ui/AboutGui.gui");   
    //exec("./ui/LevelScoresGui.gui");
@@ -178,6 +179,14 @@ function initClient()
    exec("./scripts/xbControler.cs");
 
    exec("./scripts/interiorTest.cs");
+
+   if (isPCBuild())
+   {
+      // one time setup for these vars
+      echo("Using custom name " @ $pref::Player::UsingCustomName);
+      $Player::Name = XBLiveGetUserName();
+      $Player::XBLiveId = XBLiveGetUserId();
+   }
 
    if (isObject(MusicPlayer))
       MusicPlayer.activate();

game/marble/client/scripts/playerList.cs

@@ -132,7 +132,12 @@ function handleClientJoin(%msgType, %msgString, %clientName, %joinData, %isMe)
       // spew about new player
       echo(detag(%clientName) SPC "joined the game");
       sfxPlay(PlayerJoinSfx);
-      %msg = avar($Text::Msg::PlayerJoin, detag(%clientName));
+      %displayName = detag(%clientName);
+      if ($pref::Lobby::StreamerMode)
+      {
+          %displayName = getSubStr(%displayName, 0, 1) @ "...";
+      }
+      %msg = avar($Text::Msg::PlayerJoin, %displayName);
       addChatLine(%msg);
    }
 
@@ -170,7 +175,12 @@ function handleClientDrop(%msgType, %msgString, %clientName, %clientId, %xbLiveI
       // spew about dropping player
       echo(detag(%clientName) SPC "left the game");
       sfxPlay(PlayerDropSfx);
-      %msg = avar($Text::Msg::PlayerDrop, detag(%clientName));
+      %displayName = detag(%clientName);
+      if ($pref::Lobby::StreamerMode)
+      {
+          %displayName = getSubStr(%displayName, 0, 1) @ "...";
+      }
+      %msg = avar($Text::Msg::PlayerDrop, %displayName);
       addChatLine(%msg);
    }
 
@@ -179,6 +189,10 @@ function handleClientDrop(%msgType, %msgString, %clientName, %clientId, %xbLiveI
 function handleMPGameOver(%msgType, %msgString, %tied, %leaderName, %leaderPoints)
 {
    %name = detag(%leaderName);
+   if ($pref::Lobby::StreamerMode)
+   {
+       %name = getSubStr(%name, 0, 1) @ "...";
+   }
 
    %msg = "";
    if (%tied)

game/marble/client/scripts/xbLive.cs

@@ -1,8 +1,36 @@
-if (isPCBuild())
+function getDiscordUsername(%userId)
 {
-   // one time setup for these vars
-   $Player::Name = XBLiveGetUserName();
-   $Player::XBLiveId = XBLiveGetUserId();
+    echo("USER ID: " @ %userId);
+    if (isObject(DiscordUsernameRequest))
+        DiscordUsernameRequest.delete();
+    new HTTPObject(DiscordUsernameRequest);
+    DiscordUsernameRequest.get("https://openmbu.com", "/api/v1/discord/user/" @ %userId, "");
+}
+
+function DiscordUsernameRequest::onLine(%this, %line)
+{
+    %resp = jsonParse(%line);
+    if (%resp.code == 200)
+    { 
+        %this.success = true;
+        if ($Player::Name $= $Player::DiscordUsername && %resp.realname !$= "") // Change only if we haven't changed during the time the HTTP request was occuring
+        {
+            $Player::Name = %resp.realname;
+        }
+    } 
+    else
+    {
+        %this.success = false;
+    }
+    %resp.delete();
+}
+
+function DiscordUsernameRequest::onDisconnect(%this)
+{
+    if (!%this.success) {
+        echo("Failed to fetch discord display name!");
+    }
+    %this.delete();
 }
 
 function refreshPDLC()

game/marble/client/ui/HelpAndOptionsGui.gui

@@ -54,6 +54,8 @@ function HelpAndOptionsGui::onA(%this)
          RootGui.setContent(aboutMenuOptionsGui, %this.backGui);
       case 5:
          RootGui.setContent(helpGui, %this.backGui, 5);
+      case 6:
+         Canvas.pushDialog(enterNameGui);
    }
 
    return true;
@@ -75,6 +77,7 @@ function HelpAndOptionsGui::show(%this, %backGui)
    HelpAndOptionsList.addRow($Text::HOMiscOptions, "", 0, 8);
    HelpAndOptionsList.addRow($Text::HOInstructions, "", 0, 12);
    HelpAndOptionsList.addRow($Text::HOCredits, "", 0, 12);
+   HelpAndOptionsList.addRow("Set Gamertag", "", 0, 12);
 
    if ($pref::UI::LegacyUI)
       RootGui.setA($Text::Go);

game/marble/client/ui/JoinGameInviteDlg.gui

@@ -72,6 +72,10 @@ function JoinGameInviteDlg::show(%userId, %username, %avatar)
         Canvas.pushDialog(JoinGameInviteDlg);
         JoinGameInviteDlg.isShowing = true;
     }
+    if ($pref::Lobby::StreamerMode)
+    {
+        %username = getSubStr(%username, 0, 1) @ "...";
+    }
     serverplay2d(HelpDingSfx);
     JoinGameInviteDlg.responded = false;
     JoinGameInviteDlg.userId = %userId;
@@ -143,4 +147,46 @@ function DiscordAvatarDownload::downloadFailed(%this, %path)
 function DiscordAvatarDownload::onDisconnect(%this)
 {
     %this.delete();
+}
+
+function getInviteDiscordUsername(%userId)
+{
+    echo("USER ID: " @ %userId);
+    if (isObject(DiscordIUsernameRequest))
+        DiscordIUsernameRequest.delete();
+    new HTTPObject(DiscordIUsernameRequest);
+    DiscordIUsernameRequest.get("https://openmbu.com", "/api/v1/discord/user/" @ %userId, "");
+}
+
+function DiscordIUsernameRequest::onLine(%this, %line)
+{
+    %resp = jsonParse(%line);
+    if (%resp.code == 200)
+    { 
+        %this.success = true;
+
+        %username = %resp.realname;
+        if (%username !$= "")
+        {
+            if ($pref::Lobby::StreamerMode)
+            {
+                %username = getSubStr(%username, 0, 1) @ "...";
+            }
+
+            JoinGameInviteDlg.username = %username;
+        }
+    } 
+    else
+    {
+        %this.success = false;
+    }
+    %resp.delete();
+}
+
+function DiscordIUsernameRequest::onDisconnect(%this)
+{
+    if (!%this.success) {
+        echo("Failed to fetch discord display name!");
+    }
+    %this.delete();
 }