Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
1ecd823
Added Oculus SDK (0.2.3) with Xcode project, SDK.framework (for Mac O…
jeremiah-sypult Jul 12, 2013
855f695
Separated the initialization of the HMD Renderer and the Oculus Rift …
jeremiah-sypult Jul 12, 2013
995482d
Update README.md
jeremiah-sypult Jul 12, 2013
83ef667
Merge branch 'master' of https://github.com/phoboslab/Quakespasm-Rift
jeremiah-sypult Aug 3, 2014
aff41b4
Updated Oculus SDK (0.3.2 Preview 2). VR code simplified to make use …
jeremiah-sypult Aug 4, 2014
b3ddc2b
Hacked up the Oculus SDK v0.3.2 to support the Rift DK2
jeremiah-sypult Aug 4, 2014
066b14f
squash a small but very important bug with vr_ovr.cpp OVREndEyeRender…
jeremiah-sypult Aug 4, 2014
f566a71
joystick support, added vr_crosshair_alpha and vr_debug for determini…
jeremiah-sypult Aug 6, 2014
47fc12b
added black ghosting fix in LibOVR for DK2, cleaned up input/joystick…
jeremiah-sypult Aug 7, 2014
30cdffc
cvar docs in README, save vr_ipd and vr_debug
jeremiah-sypult Aug 7, 2014
fe448ac
bump RIFTQUAKE_VERSION to 1.8
jeremiah-sypult Aug 7, 2014
158c08e
normalize LibOVR line endings
jeremiah-sypult Aug 7, 2014
4a16e79
Fixes to compile on Windows (VS2010 Express)
jeremiah-sypult Aug 7, 2014
ef3142e
added joy_axis* commands for reassigning move x/y and look x/y. joy_a…
jeremiah-sypult Aug 7, 2014
6fe6eab
joystick hat support mapped to K_AUX29 - K_AUX32
jeremiah-sypult Aug 7, 2014
a374d27
Menu + Oculus SDK v0.4 Position Support!
jeremiah-sypult Aug 9, 2014
664396b
removed old LibOVR
jeremiah-sypult Aug 9, 2014
12fe804
Added Windows-only Oculus SDK v0.4
jeremiah-sypult Aug 9, 2014
379d022
Updated quakespasm.vcxproj
jeremiah-sypult Aug 9, 2014
1f63628
Update README.md
jeremiah-sypult Aug 10, 2014
b4eebf3
Update README.md
jeremiah-sypult Aug 10, 2014
03facc4
Update README.md
jeremiah-sypult Aug 10, 2014
e926d67
Update README.md
jeremiah-sypult Aug 10, 2014
75c130c
Update README.md
jeremiah-sypult Aug 10, 2014
be5016d
Update README.md
jeremiah-sypult Aug 10, 2014
2b12fd3
Update README.md
jeremiah-sypult Aug 11, 2014
c86d7fc
update Oculus SDK/LibOVR to v0.4.1
jeremiah-sypult Aug 12, 2014
a9a15fa
support Oculus SDK LibOVR v0.4.1, removed v0.3 support
jeremiah-sypult Aug 12, 2014
43fc350
attempt to implement/port ovrDistortionCap_Overdrive for OpenGL Disto…
jeremiah-sypult Aug 13, 2014
fd5560f
Merge branch 'LibOVR_v0.4'
jeremiah-sypult Aug 13, 2014
da8d472
hack 2D VR menu support. console still needs some love.
jeremiah-sypult Aug 12, 2014
6119db0
added initial VR boot-up menu support
jeremiah-sypult Aug 13, 2014
bd9ca0d
updated LibOVR include paths for Windows/Visual Studio
jeremiah-sypult Aug 13, 2014
160b7d2
added .gitattributes to assist with line endings
jeremiah-sypult Aug 13, 2014
f9a2c7b
normalize line endings with .gitattributes
jeremiah-sypult Aug 13, 2014
eecd84b
updated .gitignore
jeremiah-sypult Aug 13, 2014
317bc3a
bump version to 1.90
jeremiah-sypult Aug 13, 2014
9dc9a0a
Update README.md
jeremiah-sypult Aug 13, 2014
f033da9
correct QUAKE_TO_METER multiplier to improve accuracy
jeremiah-sypult Aug 13, 2014
023f8a2
fix crash with vr_enabled and vid_restart, handle multisampling for V…
jeremiah-sypult Aug 14, 2014
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
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.c text eol=lf
*.cpp text eol=lf
*.h text eol=lf

*.sln text eol=crlf
*.vcxproj text eol=crlf
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Linux objects

Quake/*.o
Quake/quakespasm


## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

Expand Down Expand Up @@ -148,4 +154,6 @@ Desktop.ini
$RECYCLE.BIN/

# Mac crap
.DS_Store
.DS_Store
xcuserdata
*.xccheckout
1 change: 1 addition & 0 deletions Libs/LibOVR/Include/OVR.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/************************************************************************************Filename : OVR.hContent : The main public interface to Oculus for C++ Developers. Includes C API and helper classes.Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form.You may obtain a copy of the License athttp://www.oculusvr.com/licenses/LICENSE-3.1 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions andlimitations under the License.*************************************************************************************/#ifndef OVR_h#define OVR_h#include "OVR_Version.h"#include "../Src/Kernel/OVR_Math.h"#include "../Src/OVR_CAPI.h"#endif
Expand Down
1 change: 1 addition & 0 deletions Libs/LibOVR/Include/OVR_Kernel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/************************************************************************************Filename : OVRKernel.hContent : This contains references to all OVR Kernel headers in Src folder. Should be generated automatically based on PublicHeader tags.Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form.You may obtain a copy of the License athttp://www.oculusvr.com/licenses/LICENSE-3.1 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions andlimitations under the License.*************************************************************************************/#ifndef OVR_h#define OVR_h#include "../Src/Kernel/OVR_Types.h"#include "../Src/Kernel/OVR_Allocator.h"#include "../Src/Kernel/OVR_RefCount.h"#include "../Src/Kernel/OVR_Log.h"#include "../Src/Kernel/OVR_Math.h"#include "../Src/Kernel/OVR_System.h"#include "../Src/Kernel/OVR_Nullptr.h"#include "../Src/Kernel/OVR_String.h"#include "../Src/Kernel/OVR_Array.h"#include "../Src/Kernel/OVR_Timer.h"#include "../Src/Kernel/OVR_SysFile.h"#endif
Expand Down
1 change: 1 addition & 0 deletions Libs/LibOVR/Include/OVR_Version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/************************************************************************************Filename : OVRVersion.hContent : Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form.You may obtain a copy of the License athttp://www.oculusvr.com/licenses/LICENSE-3.1 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions andlimitations under the License.*************************************************************************************/#ifndef _OVR_VERSION_H#define _OVR_VERSION_H#define OVR_MAJOR_VERSION 0#define OVR_MINOR_VERSION 4#define OVR_BUILD_VERSION 1#define OVR_VERSION_STRING "0.4.1"#endif
Expand Down
Binary file added Libs/LibOVR/Lib/Win32/VS2010/libovr.lib
Binary file not shown.
Binary file added Libs/LibOVR/Lib/Win32/VS2010/libovrd.lib
Binary file not shown.
Binary file added Libs/LibOVR/Lib/Win32/VS2012/libovr.lib
Binary file not shown.
Binary file added Libs/LibOVR/Lib/Win32/VS2012/libovrd.lib
Binary file not shown.
Binary file added Libs/LibOVR/Lib/Win32/VS2013/libovr.lib
Binary file not shown.
Binary file added Libs/LibOVR/Lib/Win32/VS2013/libovrd.lib
Binary file not shown.
767 changes: 767 additions & 0 deletions Libs/LibOVR/Projects/Mac/Xcode/LibOVR.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E82D4CD21906FE640070CB3F"
BuildableName = "libovr.a"
BlueprintName = "LibOVR"
ReferencedContainer = "container:LibOVR.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>LibOVR.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E82D4CD21906FE640070CB3F</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Loading