Brad Davis
|
80c962a4cc
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-15 12:27:53 -07:00 |
|
Brad Hefta-Gaub
|
c4af4c7b10
|
basic mono preview for the oculus display plugin
|
2015-10-13 17:45:29 -07:00 |
|
Brad Davis
|
7f8f5f66c7
|
Working on plugin active concept
|
2015-10-13 10:01:01 -07:00 |
|
Brad Davis
|
6f5f6450df
|
Cleanup CMake files
|
2015-10-11 00:01:03 -07:00 |
|
Brad Davis
|
19fb4e92a6
|
Enabling programmatic access to the IPD scale
Conflicts:
interface/src/Application.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/scripting/HMDScriptingInterface.cpp
interface/src/scripting/HMDScriptingInterface.h
|
2015-10-06 19:08:17 -07:00 |
|
Brad Davis
|
8090bc8e8d
|
Revert "Enabling programmatic access to the IPD scale"
|
2015-10-06 10:16:42 -07:00 |
|
Brad Davis
|
725ed26ac2
|
Enabling programmatic access to the IPD scale
|
2015-10-04 16:55:49 -07:00 |
|
Brad Hefta-Gaub
|
255689e24f
|
add GLEW_STATIC to fix link warnings
|
2015-10-02 15:08:04 -07:00 |
|
Brad Davis
|
9b13aac37d
|
PR comments
|
2015-09-29 14:23:56 -07:00 |
|
Brad Davis
|
7b1c04512a
|
Adding support for accessing IPD in scripts
|
2015-09-28 16:24:38 -07:00 |
|
Shared Vive Room
|
4459708b0e
|
Fix for getEyePose in OpenVRDisplayPlugin
|
2015-09-17 17:16:12 -07:00 |
|
Brad Davis
|
5ba6242bda
|
Support a debug oculus plugin for performance testing
|
2015-09-16 19:55:57 -07:00 |
|
Sam Gateau
|
5410bc0945
|
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
|
2015-09-15 17:48:55 -07:00 |
|
Sam Gateau
|
8ab96fe907
|
Bringin back full screen for stereo mode
|
2015-09-15 17:02:30 -07:00 |
|
Sam Gateau
|
00688172dd
|
work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes
|
2015-09-14 15:49:05 -07:00 |
|
Seth Alves
|
49ee251238
|
quiet compiler
|
2015-09-12 09:59:25 -07:00 |
|
Seth Alves
|
72322c0270
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
|
2015-09-04 09:12:32 -07:00 |
|
Brad Davis
|
4a28361e05
|
Fix mirror to display on Oculus
|
2015-09-03 22:12:21 -07:00 |
|
Seth Alves
|
bb96ad1346
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
|
2015-09-03 09:38:58 -07:00 |
|
Brad Davis
|
2901155a7b
|
Fix Oculus mirroring to window
|
2015-09-02 18:28:44 -07:00 |
|
Brad Davis
|
1f83d04423
|
Fix oculus crash on switching display plugin to something else
|
2015-09-02 18:28:43 -07:00 |
|
Seth Alves
|
7194700c0b
|
pull from upstream
|
2015-09-01 13:39:33 -07:00 |
|
Andrew Meadows
|
fe2d03fd37
|
merge
Conflicts:
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
libraries/shared/src/GLMHelpers.cpp
|
2015-09-01 11:17:08 -07:00 |
|
Seth Alves
|
64d0ce47f3
|
attempting to stitch polyvox entites together
|
2015-08-30 09:59:33 -07:00 |
|
Andrew Meadows
|
614fad0811
|
remove warnings from linux build
|
2015-08-27 19:12:25 -07:00 |
|
Stephen Birarda
|
c5c73b7809
|
remove _ipd variable from OculusLegacyDisplayPlugin
|
2015-08-27 18:26:55 -07:00 |
|
Stephen Birarda
|
f7d32add0c
|
wrap OVR variables in ifdef for MAJOR_VERSION >= 6
|
2015-08-27 18:26:55 -07:00 |
|
Stephen Birarda
|
1d6f43e0d0
|
cleaned up some warnings
|
2015-08-27 18:26:55 -07:00 |
|
Brad Davis
|
270f2f7a3b
|
Fixing framerate limit, moving vsync to 2d plugin
|
2015-08-26 15:47:45 -07:00 |
|
Seth Alves
|
695ffa29c7
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
Brad Davis
|
f176003dad
|
Fixing aspect ratio on stereo plugins
|
2015-08-25 19:05:31 -07:00 |
|
Brad Davis
|
380b0cb23c
|
Removing tabs from our javascript and C++
|
2015-08-24 15:26:46 -07:00 |
|
Brad Davis
|
d3135dcfa6
|
Stereo rendering work
|
2015-08-22 16:15:10 -07:00 |
|
ZappoMan
|
270463fc4e
|
restore new oculus detect code from master
|
2015-08-21 09:29:25 -07:00 |
|
Brad Davis
|
cc037c8828
|
Fix culling calculations in HMD with new stereo mechanism
|
2015-08-21 00:29:27 -07:00 |
|
ZappoMan
|
62e8ec3fdf
|
add fullscreen menu item and rename side by side stereo plugin
|
2015-08-21 00:29:26 -07:00 |
|
Brad Davis
|
7fb491e48c
|
Cleanup plugin interface, break up oculus plugins
|
2015-08-21 00:29:25 -07:00 |
|
Brad Davis
|
76f236adf6
|
New stereo rendering implementation
|
2015-08-21 00:29:24 -07:00 |
|
Brad Davis
|
8c7711168c
|
Merge pull request #5603 from sethalves/linux-memory-debugger
memory debugging on linux
|
2015-08-20 19:19:24 -07:00 |
|
Seth Alves
|
c25082d86f
|
use -fsanitize=address in all code rather than just the top-level links
|
2015-08-20 10:14:16 -07:00 |
|
Brad Davis
|
002aea3333
|
Add fullscreen menu item to 2D display plugin
|
2015-08-20 00:30:44 -07:00 |
|
ZappoMan
|
6a7f367e5f
|
fix throttled rendering for the 2D display plugin
|
2015-08-19 21:11:48 -07:00 |
|
Brad Davis
|
3595f6a8a0
|
Fixing bad success macro for the Oculus SDK on windows
|
2015-08-11 14:06:35 -07:00 |
|
Bradley Austin Davis
|
bfd0362bd8
|
Fixing mac build
|
2015-08-08 18:00:08 -07:00 |
|
Brad Davis
|
5515b9d8ee
|
Decouple Application and plugin definitions, cleanup container usage
|
2015-08-08 17:51:16 -07:00 |
|
Brad Davis
|
ba498e8f33
|
Fixing plugin construction after removing OVR dependency from interface
|
2015-08-08 14:02:26 -07:00 |
|
Bradley Austin Davis
|
d415ee1f2e
|
Case sensitivity breaking ubuntu
|
2015-08-04 01:08:52 -07:00 |
|
Bradley Austin Davis
|
29c9e6e45e
|
Updating plugins to core profile
|
2015-08-04 00:33:03 -07:00 |
|
Bradley Austin Davis
|
f3e701e0d5
|
Don't allow leaving VR mode to target the rift
|
2015-07-30 17:40:02 -07:00 |
|
Bradley Austin Davis
|
a260be9a4d
|
HMDTools dialog restoration phase 2, electric boogaloo
|
2015-07-30 12:25:21 -07:00 |
|