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
Brad Davis
5878a4661c
Restoring HMD tools dialog, phase 1
2015-07-30 11:35:55 -07:00
Brad Davis
382ef057b0
Revert to using QGLWidget
2015-07-30 10:59:05 -07:00
Bradley Austin Davis
80ee31edd9
Address crashes on exit
2015-07-29 11:00:00 -07:00
Brad Davis
8202862750
Working on display plugins stability
2015-07-28 16:22:22 -07:00
Bradley Austin Davis
108be1c7ab
Fixing proprocessor usage
2015-07-27 10:30:08 -04:00
Bradley Austin Davis
18d4575831
Missed saving some files
2015-07-27 10:15:20 -04:00
Bradley Austin Davis
6d8adbf2b5
Make OpenVR windows only for now
2015-07-27 09:13:04 -04:00
Bradley Austin Davis
7edf138843
Attempting to fix offscreen UI event handling
2015-07-25 19:26:38 -04:00
Sam Gondelman
0aee95fe38
oculus sdk initialization done in activate/deactivate, not init/deinit
2015-07-24 17:44:20 -07:00
Sam Gondelman
1af51572af
fixed init crash if you follow very specific startup steps
2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc
Merge remote-tracking branch 'upstream/plugins' into macPluginsFix
2015-07-24 16:52:16 -07:00
Bradley Austin Davis
08a1c6c5ab
Removing dead code
2015-07-24 17:33:41 -04:00
Anthony J. Thibault
87a0e48d30
Updates to overlay fade
...
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
2015-07-23 20:36:58 -07:00
Sam Gondelman
7c9189cfbe
trying to fix init issue
2015-07-23 16:13:27 -07:00
Bradley Austin Davis
00342d2c76
Fixing the avatar / HMD pose compisition for Oculus
2015-07-23 17:48:06 -04:00
Bradley Austin Davis
3d2139691c
Removing some debug code from OSX Oculus plugin
2015-07-23 16:37:27 -04:00