diff --git a/exe/win32/gl05_r.dll b/exe/win32/gl05_r.dll
index 9b786d76..3d2b0f09 100644
Binary files a/exe/win32/gl05_r.dll and b/exe/win32/gl05_r.dll differ
diff --git a/exe/win32/gl06_r.dll b/exe/win32/gl06_r.dll
index 25419b34..8a329d44 100644
Binary files a/exe/win32/gl06_r.dll and b/exe/win32/gl06_r.dll differ
diff --git a/exe/win32/gl07_r.dll b/exe/win32/gl07_r.dll
index 3f2af543..6728bde1 100644
Binary files a/exe/win32/gl07_r.dll and b/exe/win32/gl07_r.dll differ
diff --git a/src/build/win32/_all_client.vcxproj b/src/build/win32/_all_client.vcxproj
index b3427658..18e4f67d 100644
--- a/src/build/win32/_all_client.vcxproj
+++ b/src/build/win32/_all_client.vcxproj
@@ -138,6 +138,9 @@
./_all_client.tlb
+
+ false
+
diff --git a/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp b/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp
index f2793cff..461c8cf2 100644
--- a/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp
+++ b/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp
@@ -2452,7 +2452,7 @@ void CommandCppFuncsNamespace::commandFuncVoiceKick(Command const &, NetworkId c
void CommandCppFuncsNamespace::commandFuncTcg(Command const & , NetworkId const & , NetworkId const & , Unicode::String const & params)
{
- CuiActionManager::performAction(CuiActions::tcg, params);
+ CuiSystemMessageManager::sendFakeSystemMessage(Unicode::narrowToWide("This feature is not available."));
}
//----------------------------------------------------------------------
diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h
index 0fc447f7..abb9be9c 100644
--- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h
+++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h
@@ -200,7 +200,7 @@ namespace CuiActions
MAKE_ACTION(questHelper);
MAKE_ACTION(roadmap);
MAKE_ACTION(expertise);
- MAKE_ACTION(ticketSubmission);
+ //MAKE_ACTION(ticketSubmission);
MAKE_ACTION(harassmentMessage); // displayed right before the normal harassment form
MAKE_ACTION(harassmentMessageFromKBSearch); // displayed before a ticket submittal from a 'Community Standards' category search
MAKE_ACTION(droidCommand);
@@ -257,7 +257,7 @@ namespace CuiActions
MAKE_ACTION(collections);
MAKE_ACTION(myCollections);
MAKE_ACTION(sendSavedPlayerInterestsToServer);
- MAKE_ACTION(tcg);
+ //MAKE_ACTION(tcg);
MAKE_ACTION(appearanceTab);
MAKE_ACTION(questBuilder);
MAKE_ACTION(rating);
diff --git a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj
index b8022e16..ffca7581 100644
--- a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj
+++ b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj
@@ -309,6 +309,7 @@
true
$(OutDir)$(ProjectName)_r.pdb
Windows
+ false
NDEBUG;%(PreprocessorDefinitions)
diff --git a/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib b/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib
index 1e2c661e..69ddd11f 100644
Binary files a/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib and b/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib differ
diff --git a/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib b/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib
index 5e021404..dfb019dd 100644
Binary files a/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib and b/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib differ
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp
index a0505b5c..ad5079e3 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp
@@ -68,7 +68,7 @@
#include "swgClientUserInterface/SwgCuiQuestHelper.h"
#include "swgClientUserInterface/SwgCuiServerData.h"
#include "swgClientUserInterface/SwgCuiStatusGround.h"
-#include "swgClientUserInterface/SwgCuiTcgManager.h"
+//#include "swgClientUserInterface/SwgCuiTcgManager.h"
#include "swgClientUserInterface/SwgCuiWebBrowserManager.h"
// ======================================================================
@@ -472,7 +472,7 @@ void SwgCuiManager::install ()
SwgCuiAvatarCreationHelper::install();
SwgCuiQuestHelper::install();
SwgCuiWebBrowserManager::install();
- SwgCuiTcgManager::install();
+ //SwgCuiTcgManager::install();
s_receiver = new Listener;
@@ -501,7 +501,7 @@ void SwgCuiManager::remove ()
s_receiver = 0;
SwgCuiWebBrowserManager::remove();
- SwgCuiTcgManager::remove ();
+ //SwgCuiTcgManager::remove ();
SwgCuiQuestHelper::remove ();
SwgCuiAvatarCreationHelper::remove ();
SwgCuiMediatorFactorySetup::remove ();
@@ -549,7 +549,7 @@ void SwgCuiManager::update (float deltaTimeSecs)
UNREF (deltaTimeSecs);
SwgCuiWebBrowserManager::update(deltaTimeSecs);
- SwgCuiTcgManager::update(deltaTimeSecs);
+ //SwgCuiTcgManager::update(deltaTimeSecs);
if (s_checkHud)
{
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp
index f291ee5d..2cc0fd40 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp
@@ -125,7 +125,7 @@
#include "swgClientUserInterface/SwgCuiSpaceZoneMap.h"
#include "swgClientUserInterface/SwgCuiSplash.h"
#include "swgClientUserInterface/SwgCuiStructurePlacement.h"
-#include "swgClientUserInterface/SwgCuiTcgWindow.h"
+//#include "swgClientUserInterface/SwgCuiTcgWindow.h"
#include "swgClientUserInterface/SwgCuiTicketPurchase.h"
#include "swgClientUserInterface/SwgCuiTrade.h"
#include "swgClientUserInterface/SwgCuiVendor.h"
@@ -259,7 +259,7 @@ void SwgCuiMediatorFactorySetup::install ()
MAKE_SWG_CTOR_WS (Collections, "/pda.Collections");
MAKE_SWG_CTOR_WS (VoiceFlyBar, "/Voice.VoiceFlyBar");
MAKE_SWG_CTOR_WS (VoiceActiveSpeakers, "/Voice.VoiceActiveSpeakers");
- MAKE_SWG_CTOR_WS (TcgWindow, "/pda.Tcg");
+ //MAKE_SWG_CTOR_WS (TcgWindow, "/pda.Tcg");
MAKE_SWG_CTOR_WS (Mahjong, "/pda.Mahjong");
MAKE_SWG_CTOR_WS (AppearanceTab, "/pda.AppearanceTab");
MAKE_SWG_CTOR_WS (QuestBuilder, "/pda.QuestBuilder");
@@ -290,7 +290,7 @@ void SwgCuiMediatorFactorySetup::install ()
CuiMediatorFactory::addConstructor (CuiMediatorTypes::WS_TicketListAddComment, new CuiMediatorFactory::Constructor ("/PDA.Service.edit", true));
MAKE_SWG_CTOR (ResourceSplitter, "/pda.SplitResource.main");
- MAKE_SWG_CTOR_WS (HarassmentReport, "/pda.Service.harassment");
+ //MAKE_SWG_CTOR_WS (HarassmentReport, "/pda.Service.harassment");
MAKE_SWG_CTOR_WS (IMEIndicator, "/pda.ime");
MAKE_SWG_CTOR_WS (IMEIndicatorSpace, "/pda.imeSpace");
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h
index 4a3b1648..b313b461 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h
+++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h
@@ -103,7 +103,7 @@ namespace CuiMediatorTypes
MAKE_MEDIATOR_TYPE (WS_Collections);
MAKE_MEDIATOR_TYPE (WS_VoiceFlyBar);
MAKE_MEDIATOR_TYPE (WS_VoiceActiveSpeakers);
- MAKE_MEDIATOR_TYPE (WS_TcgWindow);
+ //MAKE_MEDIATOR_TYPE (WS_TcgWindow);
MAKE_MEDIATOR_TYPE (WS_Mahjong);
MAKE_MEDIATOR_TYPE (WS_AppearanceTab);
MAKE_MEDIATOR_TYPE (WS_QuestBuilder);
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp
index 2379391d..abc0735e 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp
@@ -117,12 +117,12 @@ m_characterButton(0),
m_expertiseButton(0),
m_optionsButton(0),
m_commandsButton(0),
-m_serviceButton(0),
+//m_serviceButton(0),
m_submenuButton(0),
m_shipDetailsButton(0),
m_homePortButton(0),
m_myCollectionsButton(0),
-m_tcgButton(0),
+//m_tcgButton(0),
m_appearanceButton(0),
m_questBuilderButton(0),
m_gcwInfoButton(0),
@@ -152,12 +152,12 @@ m_opacityCallback (0)
getCodeDataObject (TUIButton, m_expertiseButton, "buttonExpertise");
getCodeDataObject (TUIButton, m_optionsButton, "buttonOptions");
getCodeDataObject (TUIButton, m_commandsButton, "buttonCommands");
- getCodeDataObject (TUIButton, m_serviceButton, "buttonService");
+ //getCodeDataObject (TUIButton, m_serviceButton, "buttonService");
getCodeDataObject (TUIButton, m_submenuButton, "buttonMenu");
getCodeDataObject (TUIButton, m_shipDetailsButton, "buttonShipDetails", true);
getCodeDataObject (TUIButton, m_homePortButton, "buttonHomePort", true);
getCodeDataObject (TUIButton, m_myCollectionsButton, "buttonMyCollections");
- getCodeDataObject (TUIButton, m_tcgButton, "buttonTcg");
+ //getCodeDataObject (TUIButton, m_tcgButton, "buttonTcg");
getCodeDataObject (TUIButton, m_appearanceButton, "buttonAppearance");
getCodeDataObject (TUIButton, m_questBuilderButton, "buttonQuestBuilder");
getCodeDataObject (TUIButton, m_gcwInfoButton, "buttonGCW");
@@ -185,10 +185,10 @@ m_opacityCallback (0)
registerMediatorObject (*m_expertiseButton, true);
registerMediatorObject (*m_optionsButton, true);
registerMediatorObject (*m_commandsButton, true);
- registerMediatorObject (*m_serviceButton, true);
+ //registerMediatorObject (*m_serviceButton, true);
registerMediatorObject (*m_submenuButton, true);
registerMediatorObject (*m_myCollectionsButton, true);
- registerMediatorObject (*m_tcgButton, true);
+ //registerMediatorObject (*m_tcgButton, true);
registerMediatorObject (*m_appearanceButton, true);
registerMediatorObject (*m_questBuilderButton, true);
registerMediatorObject (*m_gcwInfoButton, true);
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h
index 003b8c2c..38488f61 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h
@@ -83,12 +83,12 @@ private:
UIButton * m_expertiseButton;
UIButton * m_optionsButton;
UIButton * m_commandsButton;
- UIButton * m_serviceButton;
+ //UIButton * m_serviceButton;
UIButton * m_submenuButton;
UIButton * m_shipDetailsButton;
UIButton * m_homePortButton;
UIButton * m_myCollectionsButton;
- UIButton * m_tcgButton;
+ //UIButton * m_tcgButton;
UIButton * m_appearanceButton;
UIButton * m_questBuilderButton;
UIButton * m_gcwInfoButton;
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp
index 17be039f..0481167f 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp
@@ -74,8 +74,8 @@ void SwgCuiHarassmentMessage::OnButtonPressed(UIWidget *context)
{
if(m_fromKBSearch)
{
- SwgCuiTicketSubmission::NewTicket::setTicketSubmissionEnabled(true);
- IGNORE_RETURN(CuiActionManager::performAction (CuiActions::ticketSubmission, Unicode::emptyString));
+ //SwgCuiTicketSubmission::NewTicket::setTicketSubmissionEnabled(true);
+ //IGNORE_RETURN(CuiActionManager::performAction (CuiActions::ticketSubmission, Unicode::emptyString));
}
else
{
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp
index 1cd79035..24517c6c 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp
@@ -104,8 +104,8 @@
#include "swgClientUserInterface/SwgCuiQuestHelper.h"
#include "swgClientUserInterface/SwgCuiResourceExtraction.h"
#include "swgClientUserInterface/SwgCuiSpaceConversation.h"
-#include "swgClientUserInterface/SwgCuiTcgManager.h"
-#include "swgClientUserInterface/SwgCuiTcgWindow.h"
+//#include "swgClientUserInterface/SwgCuiTcgManager.h"
+//#include "swgClientUserInterface/SwgCuiTcgWindow.h"
#include "swgClientUserInterface/SwgCuiToolbar.h"
#include "swgClientUserInterface/SwgCuiWebBrowserManager.h"
#include "swgClientUserInterface/SwgCuiVoiceFlyBar.h"
@@ -253,7 +253,7 @@ m_toggleDownTimeNames (0.0f)
CuiActionManager::addAction (CuiActions::notepad, this, false);
CuiActionManager::addAction (CuiActions::setName, this, false);
- CuiActionManager::addAction (CuiActions::ticketSubmission, this, false);
+ //CuiActionManager::addAction (CuiActions::ticketSubmission, this, false);
CuiActionManager::addAction (CuiActions::harassmentMessage, this, false);
CuiActionManager::addAction (CuiActions::harassmentMessageFromKBSearch,this, false);
CuiActionManager::addAction (CuiActions::manageShipComponents, this, false);
@@ -285,7 +285,7 @@ m_toggleDownTimeNames (0.0f)
CuiActionManager::addAction(CuiActions::sendSavedPlayerInterestsToServer, this, false);
CuiActionManager::addAction (SwgCuiActions::toggleVoiceFlyBar, this, false);
- CuiActionManager::addAction (CuiActions::tcg, this, false);
+ //CuiActionManager::addAction (CuiActions::tcg, this, false);
CuiActionManager::addAction (CuiActions::appearanceTab, this, false);
@@ -1186,10 +1186,10 @@ bool SwgCuiHudAction::performAction (const std::string & id, const Unicode::Str
SwgCuiWebBrowserManager::setURL(finalUrl.c_str(), true);
}
- else if (id == CuiActions::ticketSubmission) // Ticket Submission tabbed form
- {
- m_mediator.m_windowManager->spawnTicketSubmission();
- }
+// else if (id == CuiActions::ticketSubmission) // Ticket Submission tabbed form
+ //{
+ // m_mediator.m_windowManager->spawnTicketSubmission();
+ //}
else if (id == CuiActions::harassmentMessage) // Message displayed prior to a harrassment report
{
@@ -1593,22 +1593,22 @@ bool SwgCuiHudAction::performAction (const std::string & id, const Unicode::Str
{
CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceActiveSpeakers);
}
- else if (id == CuiActions::tcg)
- {
- SwgCuiTcgWindow * tcgWindow = safe_cast(CuiMediatorFactory::getInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false, false));
+// else if (id == CuiActions::tcg)
+ //{
+ // SwgCuiTcgWindow * tcgWindow = safe_cast(CuiMediatorFactory::getInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false, false));
- if (tcgWindow && tcgWindow->isActive())
- {
- CuiMediatorFactory::deactivateInWorkspace(CuiMediatorTypes::WS_TcgWindow);
- }
- else
- {
- SwgCuiTcgManager::setLoginInfo(GameNetwork::getUserName().c_str(), CuiLoginManager::getSessionIdKey(true));
- SwgCuiTcgManager::launch();
-
- tcgWindow = safe_cast(CuiMediatorFactory::activateInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false));
- }
- }
+ // if (tcgWindow && tcgWindow->isActive())
+ // {
+ // CuiMediatorFactory::deactivateInWorkspace(CuiMediatorTypes::WS_TcgWindow);
+ // }
+ // else
+ // {
+ // SwgCuiTcgManager::setLoginInfo(GameNetwork::getUserName().c_str(), CuiLoginManager::getSessionIdKey(true));
+ // SwgCuiTcgManager::launch();
+ //
+ // tcgWindow = safe_cast(CuiMediatorFactory::activateInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false));
+ // }
+ //}
else if (id == CuiActions::appearanceTab)
{
CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_AppearanceTab);
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp
index fbb003ef..cff03649 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp
@@ -207,7 +207,7 @@ void SwgCuiService::KnowledgeBase::OnButtonPressed(UIWidget *context)
}
else if (context == m_didNotHelpButton)
{
- IGNORE_RETURN(CuiActionManager::performAction(CuiActions::ticketSubmission, Unicode::emptyString));
+// IGNORE_RETURN(CuiActionManager::performAction(CuiActions::ticketSubmission, Unicode::emptyString));
}
}