mirror of
https://github.com/copyrighttxt/watrbx-game-engine.git
synced 2026-09-04 20:57:49 +00:00
fahhh
This commit is contained in:
@@ -1074,16 +1074,6 @@ bool Application::ParseArguments(const char* argv)
|
||||
#endif
|
||||
}
|
||||
|
||||
if (vm.count("app")) {
|
||||
if (auto dm = currentDocument->getGame()->getDataModel()) {
|
||||
dm->submitTask(boost::bind(&Document::Start, currentDocument.get(), boost::make_shared_future(std::string()), SharedLauncher::Play, false, getVRDeviceName()), DataModelJob::Write);
|
||||
dm->setIsXboxApp(true);
|
||||
dm->startCoreScripts(true, "XStarterScript");
|
||||
dm->loadContent(ContentId("rbxasset://ScaledWorldv4.7.rbxl"));
|
||||
}
|
||||
launchMode = SharedLauncher::Play;
|
||||
}
|
||||
|
||||
// used to determine how we will initialize datamodel
|
||||
if (vm.count("play"))
|
||||
launchMode = SharedLauncher::Play;
|
||||
|
||||
@@ -345,7 +345,7 @@ void UserInput::acquireKeyboard()
|
||||
diKeyboardPtr->Unacquire(); // for good measure
|
||||
|
||||
HRESULT hr = diKeyboardPtr->SetCooperativeLevel(wnd,
|
||||
DISCL_FOREGROUND | DISCL_EXCLUSIVE);
|
||||
DISCL_FOREGROUND | DISCL_NONEXCLUSIVE);
|
||||
if (hr != DI_OK)
|
||||
{
|
||||
DXINPUT_TRACE("diKeyboardPtr->SetCooperativeLevel failed %d\n", hr);
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<PublishDLLDependencyBeforeTargets />
|
||||
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
|
||||
<LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir_71A)lib;$(CONTRIB_PATH)\boost_1_56_0\lib;</LibraryPath>
|
||||
<IncludePath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(CONTRIB_PATH)\boost_1_56_0\lib;</IncludePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoOpt|ARM'">
|
||||
<OutDir>$(Platform)\$(Configuration)\</OutDir>
|
||||
@@ -986,7 +987,6 @@ echo placeholder > ..\WindowsClient\$(Platform)\$(Configuration)\boost.pdb
|
||||
<ClInclude Include="..\Win\AuthenticationMarshallar.h" />
|
||||
<ClInclude Include="Crypt.h" />
|
||||
<ClInclude Include="..\Win\dinput.h" />
|
||||
<ClInclude Include="discord_rpc.h" />
|
||||
<ClInclude Include="Document.h" />
|
||||
<ClInclude Include="..\Win\DSVideoCaptureEngine.h" />
|
||||
<ClInclude Include="..\Win\DumpErrorUploader.h" />
|
||||
|
||||
@@ -214,9 +214,6 @@
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ReleasePatcher.h" />
|
||||
<ClInclude Include="discord_rpc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuild Include="AppSettings.xml">
|
||||
|
||||
Reference in New Issue
Block a user