Skip to content
This repository was archived by the owner on Jun 21, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
d94c26a
Started on VR support for Jedi Outcast
xLAva Aug 5, 2017
f3ed9cc
added 3rdparty submodules
xLAva Aug 5, 2017
1a36162
Fixed submodules
xLAva Aug 5, 2017
bd1e425
Fixed submodule
xLAva Aug 5, 2017
cbfdcf0
Updated CMakeList for VR support
xLAva Aug 5, 2017
805d031
VR: ported HMD changed over from JediAcademy with small adjustments (…
xLAva Aug 5, 2017
1228285
VR: first working prototype
xLAva Aug 5, 2017
2ba2193
VR: fixed wrong view height (porting error)
xLAva Aug 6, 2017
8b8e488
VR: experimenting with yet another world scale value
xLAva Aug 6, 2017
cea4bed
Use updated OculusSDK 1.3 dynamic lib
xLAva Aug 6, 2017
556585c
VR:
xLAva Aug 6, 2017
7d6f54c
VR: fixed wrong first person saber view height
xLAva Aug 6, 2017
b45f344
SDL: renamed sdl assets from assets4 to sdl_assets
xLAva Aug 6, 2017
fc08149
VR: new binary for Windows
xLAva Aug 6, 2017
663072a
VR: fixed Windows crash (wrong OpenAL32.dll)
xLAva Aug 7, 2017
470fc71
Allow weapons to track to a position/orientation
shinyquagsire23 Aug 9, 2017
ffb45d4
Add hmd_decoupleAim, allows aim to be separate from HMD orientation, …
shinyquagsire23 Aug 15, 2017
fd08c10
Add tracking support for Oculus Touch controllers
shinyquagsire23 Aug 15, 2017
eac4b8f
Initialize mUseHands to false
shinyquagsire23 Aug 16, 2017
c62a1f8
Cleanup, fixed crosshair with hands, fix right hand position
shinyquagsire23 Aug 16, 2017
c1368c0
Disable weapon bobbing when using hands
shinyquagsire23 Aug 16, 2017
b38f279
Decouple aim when hands are active
shinyquagsire23 Aug 16, 2017
cc00237
Add support for horizontal 'keyhole' aiming for decoupled aiming, cle…
shinyquagsire23 Aug 17, 2017
92046ce
Fix GameHmd indentation
shinyquagsire23 Aug 17, 2017
50ce806
Weapons rotate around their own origin instead of view origin, remove…
shinyquagsire23 Aug 26, 2017
f0478a3
Merge branch 'VR-Touch' of https://github.com/shinyquagsire23/JediOut…
xLAva Aug 27, 2017
e0d68b5
VR: added new dummy implementation for the Interface change of IHmdDe…
xLAva Aug 27, 2017
4e5a9d8
VR: small fix to get hand position if even if the left controller is …
xLAva Aug 27, 2017
a1c9ea5
VR: reintroduced hmd_useHands value
xLAva Aug 27, 2017
ce499a5
VR: added different METER_TO_GAME value for position tracking
xLAva Aug 27, 2017
85544f8
VR: use new OculusSDK Version 1.17
xLAva Aug 27, 2017
7e1b8c6
VR: new Windows binary
xLAva Aug 27, 2017
4d58609
Merge branch 'VR' into VR-Touch
xLAva Aug 27, 2017
b90638d
VR: added missing file
xLAva Aug 27, 2017
1324d46
Merge branch 'VR' into VR-Touch
xLAva Aug 27, 2017
c060def
Merge branch 'JediOutcastLinux' into VR
xLAva Aug 27, 2017
5786262
Merge branch 'VR' into VR-Touch
xLAva Aug 27, 2017
4b7ffc6
Rotate weapons around tag_weapon instead of weapon model origin
shinyquagsire23 Aug 29, 2017
9073b91
Merge pull request #55 from shinyquagsire23/VR-Touch-Rot
xLAva Aug 29, 2017
af810d4
Fix weapons to follow weapon view yaw again when tracked to hands
shinyquagsire23 Aug 30, 2017
2afc2bd
Ignore weapon view pitch and roll for hand position adjustment
shinyquagsire23 Aug 31, 2017
b872881
Merge pull request #56 from shinyquagsire23/VR-Touch-Yaw
xLAva Aug 31, 2017
f6a20e3
Allow tracking of lightsaber to right hand
shinyquagsire23 Aug 31, 2017
c8f3983
Correct rotation to be in line with what it should be for hands
shinyquagsire23 Sep 1, 2017
8c24d2a
Adjust saber height closer to where it should be, reduce animation ya…
shinyquagsire23 Sep 1, 2017
6f3d63a
Better saber offsetting vs animations, but stutters when changing wea…
shinyquagsire23 Sep 1, 2017
7a890d4
Merge remote-tracking branch 'upstream/VR-Touch' into VR-Touch-Saber
shinyquagsire23 Sep 1, 2017
83e6e39
Move saber tracking after saber throw updating
shinyquagsire23 Sep 1, 2017
1ba45ac
Bolt saber back to model hand when in third person
shinyquagsire23 Sep 1, 2017
c4130ed
Compensate for animation yaw on the model rotation as well
shinyquagsire23 Sep 1, 2017
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
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "3rdparty/OculusSDK_0.5"]
path = 3rdparty/OculusSDK_0.5
url = https://github.com/xLAva/OculusSDK.git
branch = master
[submodule "3rdparty/OculusSDK_0.8"]
path = 3rdparty/OculusSDK_0.8
url = https://github.com/xLAva/OculusSDK.git
branch = 0.8
[submodule "3rdparty/OculusSDK_1"]
path = 3rdparty/OculusSDK_1
url = https://github.com/xLAva/OculusSDK.git
branch = 1.3
1 change: 1 addition & 0 deletions 3rdparty/OculusSDK_0.5
Submodule OculusSDK_0.5 added at 18e4ec
1 change: 1 addition & 0 deletions 3rdparty/OculusSDK_0.8
Submodule OculusSDK_0.8 added at fb25f5
1 change: 1 addition & 0 deletions 3rdparty/OculusSDK_1
Submodule OculusSDK_1 added at fd025e
7 changes: 7 additions & 0 deletions 3rdparty/WINDOWS_OpenHmd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Checkout OpenHmd from this git repository
https://github.com/xLAva/OpenHmd

into the folder 3rdparty/OpenHmd

WINDOWS:
No building required. A Windows binary is included.
14 changes: 14 additions & 0 deletions 3rdparty/glm/WINDOWS_glm.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
WINDOWS and MACOS:

Get the sources here:
http://sourceforge.net/projects/ogl-math/files/latest/download?source=files

Extract glm into this folder. No building is required.


LINUX:
Just install the glm library from the repository of your distribution.

For example on Ubuntu:
sudo apt-get install libglm-dev

14 changes: 14 additions & 0 deletions 3rdparty/hidapi-0.7.0/WINDOWS_hidapi-0.7.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
WINDOWS:

Get the sources here:
https://github.com/downloads/signal11/hidapi/hidapi-0.7.0.zip

Extract hidapi into this folder and build it (32bit release version).


LINUX:
Just install the hidapi version from the repository of your distribution.

For example on Ubuntu:
sudo apt-get install libhidapi-dev:i386

Loading