Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from LibreVR:master #84

Merged
merged 2 commits into from
Oct 14, 2019
Merged

[pull] master from LibreVR:master #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86f6e85
Hotfix: Fix the Inject tray icon option.
CrossVR Oct 14, 2019
a829499
Revert "Hotfix: Add a flush and restore the wait behaviour."
CrossVR Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert "Hotfix: Add a flush and restore the wait behaviour." 
This reverts commit 0d28692.
  • Loading branch information
@CrossVR
CrossVR committed Oct 14, 2019
commit a8294995fe8b09cebe715df31bfd52ea4f23180b
2 changes: 0 additions & 2 deletions Revive/CompositorBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,6 @@ ovrResult CompositorBase::EndFrame(ovrSession session, ovrLayerHeader const * co
}
m_ActiveOverlays = activeOverlays;

Flush();

vr::EVRCompositorError error = vr::VRCompositorError_None;
if (baseLayer)
error = SubmitLayer(session, baseLayer);
Expand Down
3 changes: 2 additions & 1 deletion Revive/SessionDetails.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ SessionDetails::HackInfo SessionDetails::m_known_hacks[] = {
{ nullptr, "lighthouse", HACK_SPOOF_SENSORS, false },
{ nullptr, "lighthouse", HACK_STRICT_POSES, false },
{ "DCVR-Win64-Shipping.exe", nullptr, HACK_DISABLE_STATS, true },
{ "DCVR-Win64-Shipping.exe", nullptr, HACK_WAIT_ON_SUBMIT, true }
{ "DCVR-Win64-Shipping.exe", nullptr, HACK_WAIT_ON_SUBMIT, true },
{ "WrathGame-Win64-Shipping.exe", nullptr, HACK_WAIT_ON_SUBMIT, true }
};

SessionDetails::SessionDetails()
Expand Down
2 changes: 1 addition & 1 deletion ReviveOverlay/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define REV_MAJOR_VERSION 1
#define REV_MINOR_VERSION 8
#define REV_PATCH_VERSION 2
#define REV_BUILD_NUMBER 5
#define REV_BUILD_NUMBER 6

#define REV_VERSION_STRING REV_STRINGIFY(REV_MAJOR_VERSION.REV_MINOR_VERSION.REV_PATCH_VERSION.REV_BUILD_NUMBER)
#define REV_VERSION_INT (REV_MAJOR_VERSION << 24 | REV_MINOR_VERSION << 16 | REV_PATCH_VERSION << 8 | REV_BUILD_NUMBER)