Al Bernstein
ead4793392
removed whitespace
2017-04-06 17:26:12 -07:00
Al Bernstein
c628b23895
removed whitespace
2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd
used thread safe moving average for the quaternions
2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca
made requested changes in PR10147
2017-04-06 16:18:40 -07:00
Anthony J. Thibault
4e49774d0e
Moved device class check into handleTrackedObject
2017-04-06 13:20:00 -07:00
Al Bernstein
e6e5224647
clean ups - coding standard
2017-04-06 11:27:58 -07:00
Al Bernstein
001c92416b
clean ups - coding standard
2017-04-06 11:23:33 -07:00
Al Bernstein
4a17112478
Kinect moving average filter for hands
2017-04-06 11:08:09 -07:00
Anthony J. Thibault
42262aac78
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-05 18:41:43 -07:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
Dante Ruiz
81ae3e44fd
Merge branch 'master' of github.com:highfidelity/hifi into oculus-tracking
2017-04-04 22:11:08 +01:00
Dante Ruiz
a31812821a
oculus lost tracking, delay hand to side
2017-04-04 22:10:47 +01:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
ZappoMan
4da8e5e18f
fix left/right legs for kinect
2017-03-30 20:01:59 -07:00
samcake
26000288d7
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-30 11:45:12 -07:00
Anthony J. Thibault
d47c040768
Vive: Expose all 16 tracked poses to the controller system.
...
This is in preparation for the Vive hockey puck trackers...
2017-03-29 18:15:29 -07:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
ZappoMan
6f2f80e334
make sure kinect plugin debugging setting is actually saved and loaded
2017-03-29 14:06:11 -07:00
ZappoMan
9d3e8818f7
fix build
2017-03-28 18:49:36 -07:00
ZappoMan
80fb7bc287
add extra debugging to the kinect plugin
2017-03-28 18:42:15 -07:00
ZappoMan
bdfbc13185
add support for hand rotations to the kinect plugin, add notes on mapping from kinect orientations to our frame orientations
2017-03-28 15:09:03 -07:00
Ryan Huffman
56c5f06365
Fix Oculus Touch + Remote not being detected after initial launch
2017-03-23 16:29:08 -07:00
Brad Davis
e94f803b84
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-08 09:03:21 -08:00
Bradley Austin Davis
ce9d637b3f
Expose ASW activation status, provide normalized present rate information
2017-03-03 10:46:05 -08:00
Bradley Austin Davis
fa5b315e09
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-01 15:16:18 -08:00
Seth Alves
7a31a99e3c
back out previous experiment
2017-02-25 21:13:20 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
Brad Hefta-Gaub
edf4cfa377
Merge pull request #9615 from kencooke/audio-packetloss-fix
...
Reduce audio clicks/pops caused by packet loss
2017-02-06 13:12:08 -08:00
Ken Cooke
4acb99cd4f
Use interpolated audio (codec packet-loss concealment) or zero samples (if no codec) when audio packets are lost. This audio is still processed by the audio pipeline to avoid clicks/pops.
2017-02-06 09:29:39 -08:00
Brad Hefta-Gaub
2a20ce6062
fix kinect plugin claiming to have hands when not enabled
2017-02-04 10:38:46 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Brad Davis
15b9e750f9
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 10:51:26 -08:00
Stephen Birarda
8f279ce1f7
only pop to check entitlements if oculus store build
2017-01-05 14:21:35 -08:00
Stephen Birarda
46086cdcce
set the OCULUS_STORE property with oculus store arg
2017-01-05 14:02:35 -08:00
Stephen Birarda
2ec9b81aa6
fix passing of OCULUS_APP_ID to platform SDK initialization
2017-01-05 11:38:57 -08:00
Stephen Birarda
f592d8d894
force entitlement check for all builds with OCULUS_APP_ID
2017-01-05 11:38:47 -08:00
Stephen Birarda
b87a1b2b2b
only fire the entitlement check if OCULUS_APP_ID is set
2017-01-05 11:38:32 -08:00
Stephen Birarda
ea3e5f702a
add popping of messages for entitlement check
2017-01-05 11:20:45 -08:00
Stephen Birarda
4278d7b20d
download and link oculus platform for oculus plugin
2017-01-05 11:20:44 -08:00
Brad Davis
9bf4804d3d
Use a higher thread priority for Oculus present
2017-01-05 11:04:50 -08:00
Brad Hefta-Gaub
84eca0159e
Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
...
Conflicts:
tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Atlante45
e5901fa875
Make getHardwareStats thread safe
2016-12-29 11:13:55 -08:00
Atlante45
f46b8f3e6d
Track compositor dropped frames as well.
2016-12-29 10:17:40 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Atlante45
f79c6e08f5
Track dropped frames as reported by the Oculus SDK
2016-12-28 14:18:23 -08:00
Seth Alves
1bcb5ceaff
quiet some warnings
2016-12-26 20:16:05 -08:00
Brad Davis
e58623bcc0
Working on test/trace script interface
2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Ryan Huffman
2e25f18e76
Adjust positioning of avatar hands to match touch controller position
2016-12-16 11:03:20 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
Stephen Birarda
4c1f99954b
fix confusing MIN_CORES_SPEC comment
2016-12-14 17:49:08 -08:00
Atlante45
0dec97fc03
Make Steamworks a plugin
2016-12-14 15:37:49 -08:00
Atlante45
07802eb284
Fix Oculus Touch flags check
2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
a2ba03284e
Merge pull request #9186 from ZappoMan/kinectPlugin
...
Kinect Plugin
2016-12-13 15:29:41 -08:00
Brad Hefta-Gaub
1d07711937
CR feedback
2016-12-12 17:36:01 -08:00
Brad Hefta-Gaub
d51b408c12
more work on hand tracking
2016-12-12 08:46:21 -08:00
Brad Hefta-Gaub
fdf9dc432d
only build if kinect SDK is available
2016-12-09 08:30:33 -08:00
Brad Hefta-Gaub
053b1bedc4
add orientation
2016-12-09 08:29:21 -08:00
Brad Hefta-Gaub
b6838c6ec4
more debugging
2016-12-08 23:32:03 -08:00
Brad Hefta-Gaub
4959a88581
first cut at kinect input plugin
2016-12-08 22:13:56 -08:00
Atlante45
7b0b777051
Honor reorient and quit request from OVR
2016-12-07 17:29:54 -08:00
Anthony J. Thibault
9b0ce556e7
Added preferences for the Perception Neuron plugin.
...
By default this plugin is disabled.
The server address and port number are also configurable.
2016-11-23 10:10:00 -08:00
Brad Hefta-Gaub
3a68f48cd7
disable threaded reprojection when running oculus in OpenVR
2016-11-14 16:30:18 -08:00
Seth Alves
7a160ce5e8
try, try again
2016-11-13 13:39:31 -08:00
Seth Alves
645134e4b0
try, try again
2016-11-13 13:26:15 -08:00
Seth Alves
da83fd9fa4
try, try again
2016-11-13 12:56:16 -08:00
Seth Alves
946dc256f0
try, try again
2016-11-13 12:15:35 -08:00
Seth Alves
359f05426c
try, try again
2016-11-13 12:14:48 -08:00
Seth Alves
45bcf626aa
try, try again
2016-11-13 11:48:49 -08:00
Seth Alves
f8fb5b9709
avoid some more static/global QStrings in plugins
2016-11-13 11:29:19 -08:00
Seth Alves
9b4a8427e6
global/static QString
2016-11-13 11:09:27 -08:00
Seth Alves
9868ddd602
global/static QStrings in plugins appear to cause crashes during shutdown
2016-11-13 10:22:14 -08:00
Chris Collins
b9b90cc646
Merge pull request #9047 from jherico/stutter
...
Add stutter tracking
2016-11-11 11:39:00 -08:00
Brad Davis
162f24decd
Add stutter tracking for Oculus
2016-11-11 10:12:41 -08:00
Brad Davis
90f55f0cd5
Add stutter tracking
2016-11-10 11:56:38 -08:00
Brad Davis
e2991c3665
Change minimum cores to 3 to enable OpenVR
2016-11-10 10:35:05 -08:00
Ryan Huffman
687605ad38
Add proper adding and removal of subdeviceNames in SDL2Manager after startup
2016-11-03 14:02:58 -07:00
Ryan Huffman
ba7eac5281
Override getSubdeviceNames in OculusControllerManager
2016-11-01 13:53:10 -07:00
Ryan Huffman
ba0dbeac80
Add InputManager::getSubdeviceNames
2016-11-01 13:36:20 -07:00
Brad Davis
23fc865d40
Updates for min spec check
2016-10-27 19:28:46 -07:00
Brad Davis
018d945b85
Display warning overlay instead of scene when below min spec
2016-10-27 15:51:26 -07:00
Brad Hefta-Gaub
6d94df346f
add async reprojection stat to oculus too
2016-10-27 14:00:30 -07:00
Brad Hefta-Gaub
bfe6ebb44f
some tweaks
2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
c3f5df8f0b
Merge branch 'master' of https://github.com/highfidelity/hifi into report45hzTarget
2016-10-27 11:36:56 -07:00
Brad Hefta-Gaub
03946748bc
Merge pull request #8928 from hyperlogic/bug-fix/more-openvr-crash-fixes
...
Fix for crash in openvr on startup
2016-10-26 22:45:33 -07:00
Anthony J. Thibault
1ea018db1d
Fix for crash in openvr on startup
...
pluginActivate can fail and return false, when steamvr is in a "Not Ready" state.
In practice this can occur on a botched steamvr install, or when the vr compositor process is unable to start.
When pluginActivate returns false, there's some sort of race condition where pluginUpdate will still be called.
But it's only reproducible in release builds, without the debugger attached.
This commit prevents pluginUpdate from crashing by making sure that the openvr _system ptr is valid first.
2016-10-26 17:40:34 -07:00
Brad Davis
a53049b186
Consolidate activity tracking code
2016-10-26 17:19:24 -07:00
Brad Davis
f4f1b04cf0
Use OpenVR to determine if async reprojection is enabled
2016-10-26 16:02:06 -07:00
Brad Davis
1c89fa2291
Make threaded submit in OpenVR controllable from menu
2016-10-26 15:28:42 -07:00
Brad Davis
857f5a69d6
Don't reserve additional thread when we're not using one
2016-10-26 15:28:41 -07:00
Brad Davis
e7355e84f3
Disable OpenVR submit thread
2016-10-26 15:28:40 -07:00
Brad Hefta-Gaub
23b74c7aff
when vive is on i5 report a target frame rate of 45 so we can see that in stats
2016-10-26 14:20:58 -07:00
Anthony J. Thibault
ca9d497159
Updated viveControllerConfiguration.js with new controller offset
...
(cherry picked from commit ec2bc3495082dfb0b472948efa9d6881562ed3f9)
2016-10-19 15:59:44 -07:00
Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
Zach Pomerantz
876f70709e
change oculus init errors to critical
2016-10-17 11:57:32 -07:00
Zach Pomerantz
2191903803
avoid uninitialized oculus gl calls
2016-10-17 11:08:38 -07:00
Brad Davis
ff3d1b3d01
Don't use VR compositor if it doesn't exist
2016-10-13 16:53:37 -07:00
Brad Davis
d4e83a7461
Don't crash on OpenVR activation when SteamVR isn't running
2016-10-13 16:37:50 -07:00
Brad Hefta-Gaub
0e1b377227
Merge pull request #8785 from jherico/oculus_crash
...
Additional plugin debugging, better plugin resource cleanup
2016-10-13 13:54:34 -07:00
Brad Davis
2d6522a76f
Merge pull request #8786 from hyperlogic/bug-fix/more-openvr-shutdown-crashes
...
Prevent crashes in openvr on shutdown
2016-10-12 13:54:56 -07:00
Brad Hefta-Gaub
8ac31a041d
Merge pull request #8654 from ZappoMan/betterAway
...
fix away HMD unmouted logic
2016-10-11 20:35:08 -07:00
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07:00
Anthony J. Thibault
973ee544fb
Prevent crashes in openvr on shutdown
...
By ensuring that there is an opengl context is bound before calling VR_Shutdown()
2016-10-11 16:36:29 -07:00
Anthony J. Thibault
7ab76984ad
Fix crash when switching to desktop mode from oculus HMD mode
...
Removed internalPresent in oculus uncustomizeContext. It had no ill effects.
2016-10-10 16:54:08 -07:00
Brad Hefta-Gaub
735a6ca994
Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes
...
openvr deadlock and crash on exit fixes
2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
3aa1c36f53
Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway
2016-10-08 11:50:10 -07:00
Brad Hefta-Gaub
87d66ffdf8
Merge pull request #8756 from jherico/i5_reprojection
...
Turn on forced reprojection on i5 systems
2016-10-08 10:51:27 -07:00
Anthony J. Thibault
ec801cb9d8
Addressed feedback from code review.
2016-10-07 17:46:46 -07:00
Ryan Huffman
de14fdffb7
Remove commented log line
2016-10-07 13:38:18 -07:00
Brad Davis
8526ac74a5
Turn on forced reprojection on i5 systems
2016-10-07 13:36:49 -07:00
Anthony J. Thibault
17d00ee3f9
Workaround openvr crash by calling Submit before VR_Shutdown
2016-10-07 11:41:58 -07:00
Ryan Huffman
d589812c52
Update hand controller detection
2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc
Update tutorial to work with HMD + Hand Controllers only
2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f
Add the ability to ignore invisible entities in findRayIntersection
2016-10-07 10:30:18 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Bradley Austin Davis
ce8fcfed36
Fix mac build (again?)
2016-10-02 17:42:10 -07:00
Brad Davis
488d191428
Remove all oglplus usage and references
2016-10-02 11:44:34 -07:00
Brad Davis
d3d3aa587c
Remove oglplus usage from OpenVR
2016-10-02 11:44:33 -07:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
Brad Hefta-Gaub
73e3e993fb
fix Vive's HMD.mounted
2016-09-26 17:29:11 -07:00
Brad Hefta-Gaub
8f96715521
only activate a touch device if one is connected
2016-09-23 14:30:34 -07:00
Seth Alves
92bda6827b
remove vive keyboard
2016-09-13 11:27:10 -07:00
Brad Davis
94210d2e69
Use dynamic count for global thread pool
2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Stephen Birarda
3f1545008d
don't target any plugins for android
2016-08-31 11:19:01 -07:00
Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Brad Davis
02c79d9714
Fix the OpenVR issues on AMD
2016-08-26 19:05:29 -07:00
James B. Pollack
f7697c88ae
Merge pull request #8476 from zzmp/fix/vive-ati
...
fix vive crash in AMD driver
2016-08-24 18:06:18 -07:00
howard-stearns
6daf91166f
pr comments
2016-08-22 15:03:51 -07:00
Zach Pomerantz
dbb916e2d9
fix redundant openvr fence condition
2016-08-22 13:59:18 -07:00
Zach Pomerantz
a67c5221e3
flush openvr fence before looking for it
2016-08-22 13:46:00 -07:00
howard-stearns
b8b345fb43
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
2016-08-19 13:04:39 -07:00
Brad Davis
a32ab77b7d
Address issues with random camera locations caused by bad HMD sensor poses
2016-08-17 15:22:30 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
Brad Davis
99009d8a2d
Enable reprojection on OpenVR
2016-08-12 22:29:04 -07:00
Brad Davis
6d7edd38cc
Rename clearViewTransform
2016-08-12 22:28:59 -07:00
Brad Davis
ff24bc982c
Re-disable reprojection in OpenVR
2016-08-12 22:28:58 -07:00
Brad Davis
82081d7d57
Address vsync weirdness
2016-08-12 22:28:58 -07:00
Brad Davis
e352883a88
Fix Gamma in Oculus display plugin
2016-08-12 22:28:56 -07:00
Brad Davis
719e555381
Restoring reprojection to OpenVR
2016-08-12 22:28:55 -07:00
Brad Davis
39a47b7559
Fix Oculus compositing and gamma
2016-08-12 22:28:54 -07:00
Bradley Austin Davis
d2fd7f88fd
Enabling OSX Oculus plugin
2016-08-12 22:28:43 -07:00
Brad Davis
a4c5c7bc16
Hopefully better handling of the OpenVR api
2016-08-12 22:28:40 -07:00
Brad Davis
b662ae4cfa
More profiling ranges
2016-08-12 22:28:36 -07:00
Brad Davis
d8b0fee934
Fixing color balance, enabling vive controllers
2016-08-12 22:28:30 -07:00
Brad Davis
901e2da828
Hand lasers
2016-08-12 22:28:29 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf
Working on reprojection
2016-08-12 22:28:22 -07:00
Bradley Austin Davis
d0912c6063
Threaded Oculus support
2016-08-12 22:18:38 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
howard-stearns
e6746acf4c
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-11 15:40:26 -07:00
Atlante45
45921a5c8d
Restore split behavior for inputs/displays on quit
2016-08-08 15:39:25 -07:00
Seth Alves
8f76c43bc1
if call to ovr_GetSessionStatus fails, also don't take input from controllers
2016-08-02 19:49:58 -07:00
Seth Alves
8c43c12249
clear pose before short-circuiting update
2016-08-02 16:49:24 -07:00
Seth Alves
03a47af628
if the HMD isn't on someone's head, don't take input from the controllers
2016-08-02 15:38:04 -07:00
howard-stearns
6e7b828203
keep qml text fields up to date with vive virtual keyboard
2016-08-02 10:13:35 -07:00
James B. Pollack
5202038210
Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
...
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
Seth Alves
4e308914b2
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:37:30 -07:00
Seth Alves
c36d0d91ad
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:29:57 -07:00
Seth Alves
406b08ffa1
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:29:00 -07:00
Anthony J. Thibault
90beb30e8a
Filter out bad openvr HMD poses that are below the floor
...
When interface is launched and steam vr is NOT running, openvr can return bad HMD poses for a few frames.
To workaround this, filter out any hmd poses that are obviously bad, i.e. beneath the floor.
2016-07-19 18:12:20 -07:00
Brad Hefta-Gaub
0a6aee1707
Merge pull request #8254 from murillodigital/master
...
Changes for hifiCodec plugin building on Linux
2016-07-18 21:14:46 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Brad Davis
90299a98fe
PR feedback
2016-07-15 12:19:02 -07:00
Leonardo Murillo
53d524eb2f
Checkpoint
2016-07-15 12:04:45 -06:00
Brad Davis
8d5b60a266
Simulate LTClick/RTClick for Oculus Touch and Hydra controllers
2016-07-14 12:30:17 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Brad Hefta-Gaub
c2fd055f0f
more hacking
2016-07-14 08:20:07 -07:00
Brad Hefta-Gaub
6f0967f3fc
add mac support to the codec plugin
2016-07-11 18:28:04 -07:00
Brad Hefta-Gaub
ceffa219b3
support for lost packets
2016-07-11 15:18:02 -07:00
Brad Hefta-Gaub
125aa6b337
make zlib and pcm codecs not actually allocate encoder/decoders
2016-07-11 14:21:32 -07:00
Brad Hefta-Gaub
743576134f
fix warnings
2016-07-11 13:38:08 -07:00
Brad Hefta-Gaub
540ab9f07c
wire up audio codec
2016-07-11 13:00:58 -07:00
Brad Hefta-Gaub
f5b693cebb
added support for external hificodec and hifi codec plugin
2016-07-11 12:22:27 -07:00
Brad Hefta-Gaub
ba6bb24595
rework plugins to allow different decoder/encoder instances per streams
2016-07-10 16:49:03 -07:00
Brad Hefta-Gaub
a71baf5601
handle codec prioritization, handle multiple codec choices
2016-07-08 21:18:03 -07:00
Brad Hefta-Gaub
126e5c2926
codec pipeline working, zlib example
2016-07-08 14:34:44 -07:00
Brad Hefta-Gaub
3c6447326e
more codec plumbing
2016-07-07 21:24:24 -07:00
Brad Hefta-Gaub
38f0cd218b
make client server plugins properly copy into plugins directory
2016-07-07 10:31:12 -07:00
Brad Hefta-Gaub
ac2d3e1cc7
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
abcd1e0062
Merge pull request #8164 from SamGondelman/macHMDPreview
...
Added Mac preview image if VSync is enabled
2016-07-07 09:01:40 -07:00
Brad Hefta-Gaub
9333c7dcca
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-06 13:26:19 -07:00
Brad Davis
88d28120b6
Adding missed file
2016-07-01 15:48:58 -07:00
SamGondelman
12b5cccfc7
merge from master
2016-06-28 14:05:43 -07:00
Brad Hefta-Gaub
7a4b11ee97
more work on codecs
2016-06-27 13:06:19 -07:00
SamGondelman
0bfe3ea817
added support for disabling vsync on macs, but doesn't work with the rift
2016-06-27 11:34:44 -07:00
Seth Alves
bbe9b931be
on Linux, don't mess with the menus from the hydra plugin because it makes Qt stop
2016-06-26 14:59:42 -07:00
Howard Stearns
c4398c3950
Merge pull request #8129 from ZappoMan/reduceLogSpam
...
reduce log spam in Vive plugins
2016-06-24 13:00:13 -07:00
Brad Hefta-Gaub
4bc6a3fb3b
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-06-24 12:54:55 -07:00
Brad Hefta-Gaub
1c19d61035
Merge pull request #8122 from SamGondelman/macHydrasFix
...
Removed Mac Hydra support
2016-06-24 12:21:13 -07:00
Brad Hefta-Gaub
39ff03cfb5
reduce log spam in Vive plugins
2016-06-24 10:53:46 -07:00
Brad Hefta-Gaub
d7bffc3eab
first cut at negotiating codecs
2016-06-23 17:14:41 -07:00
SamGondelman
284fcc8a0b
better check for oculus display in oculus legacy plugin because the sdk is buggy
2016-06-23 13:50:17 -07:00
Brad Hefta-Gaub
be37921845
first cut at codec plugins
2016-06-23 10:42:02 -07:00
SamGondelman
a9ed0b1c83
completely destroyed sixense on macs
2016-06-22 16:56:50 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
SamGondelman
f495f5e3b5
removed mac hydra support
2016-06-22 16:05:55 -07:00