Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53127 commits 2 branches 0 tags 1.1 GiB
Commit graph

404 commits

Author SHA1 Message Date
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
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Ryan Huffman
9ff742c97c Fix typo 2016-06-22 12:09:12 -07:00
Ryan Huffman
2233b5ba64 Add user activity tracking for OculusLegacyDisplayPlugin 2016-06-22 11:57:41 -07:00
Ryan Huffman
23f57367e3 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-22 08:55:22 -07:00
Howard Stearns
a1844d8c19 Fix plugin include. (How did this build for me locally?) 2016-06-21 17:36:41 -07:00
howard-stearns
baa9139881 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 17:02:23 -07:00
howard-stearns
d6095d1f11 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 16:52:22 -07:00
Ryan Huffman
310adb0f45 Update spacemouse deviceConnected implementation 2016-06-21 16:42:39 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f Update connected device detection implementation 2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
f2f7e21eaf remove dead refereince to PluginContainer.h from space mouse 2016-06-21 16:17:43 -07:00
Brad Davis
f3bad3a63b Don't trigger keyboard on revealing the overlay layer 2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Ryan Huffman
251e2137d3 Remove old use of connectedDevice 2016-06-21 13:31:10 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
howard-stearns
2ac6dc8798 do not tilt virtual keyboard 2016-06-21 09:48:01 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
Bradley Austin Davis
87dc6649ce Better track keyboard open state, fix text replacement 2016-06-15 15:16:29 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Bradley Austin Davis
f3c47acbb2 Fix offset when UI transform is not identity 2016-06-14 09:49:25 -07:00
SamGondelman
df9fd6c7fc reset vive grip buttons to 0 if not pressed 2016-06-13 18:35:39 -07:00
Bradley Austin Davis
6707f889b8 Fixing laser offset, support laser in Oculus 2016-06-13 17:33:18 -07:00
Bradley Austin Davis
62051ad297 Working on touch 2016-06-13 14:40:15 -07:00
Brad Davis
bb3722d915 trying again to fix mac build. 2016-06-13 13:04:11 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub
fc5214c938 Merge pull request #8033 from SamGondelman/xboxFix 
Game pads work after falling asleep and being reactivated
 2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
8434aa9416 Merge pull request #8027 from SamGondelman/exposeHaptics 
Expose haptics to JS
 2016-06-08 16:17:04 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Brad Davis
40778d7f29 Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers 2016-06-08 10:41:19 -07:00
Brad Davis
79c68b2ecb Working on positioning of the keyboard 2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
SamGondelman
5daccba235 xbox controller works on restart 2016-06-07 15:14:08 -07:00
SamGondelman
2e71a63574 cr fixes 2016-06-07 13:28:10 -07:00
SamGondelman
ff2405437b can set strength to 0 2016-06-07 12:19:38 -07:00
SamGondelman
7a3cba8580 warning be gone 2016-06-06 17:06:59 -07:00
SamGondelman
8fa52fa159 trying to fix warning in joystick.cpp 2016-06-06 16:48:21 -07:00
SamGondelman
b59d597780 if overlapping calls, haptics take on strength and duration of call that will finish last 2016-06-06 15:35:12 -07:00
SamGondelman
cea0d74c35 fix spaces and touch duration 2016-06-06 15:20:10 -07:00
SamGondelman
e7743cd8e2 added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism 2016-06-06 15:03:08 -07:00
Atlante45
b635e32933 Rename Mac only Oculus display plugin 2016-06-06 13:28:36 -07:00
Atlante45
3dadb515f3 Add plugins name to their metadata file 2016-06-06 13:28:36 -07:00
SamGondelman
afca0ec2c9 moved vive pulses to correct thread, works with duration 2016-06-06 13:25:05 -07:00
SamGondelman
b01a00584a Merge branch 'exposeHaptics' of https://github.com/SamGondelman/hifi into exposeHaptics 2016-06-06 10:35:29 -07:00
SamGondelman
f51cb7ce0c trying to add duration support for vive 2016-06-06 10:34:32 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
howard-stearns
849bee977a Do not send stale vive data as valid after deactivating. 
(cherry picked from commit e6cc1fabe0)
 2016-06-04 09:07:51 -07:00
Brad Hefta-Gaub
c2a34f24cb Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid 
Do not send stale vive data as valid after deactivating.
 2016-06-04 08:41:26 -07:00
SamGondelman
2367cb1995 fixing input mapping for vive/touch grip button/trigger, script needs fixing 2016-06-03 15:07:21 -07:00
SamGondelman
c1eab61241 sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2 2016-06-03 11:22:06 -07:00
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -07:00
SamGondelman
912b35693b added vive single pulse haptics 2016-06-02 18:13:33 -07:00
SamGondelman
8b76af531b made touch hand orientation more comfortable, fixed all the touch key mappings, exposed capacitive touch keys for use later 2016-06-02 16:52:17 -07:00
howard-stearns
e6cc1fabe0 Do not send stale vive data as valid after deactivating. 2016-06-02 12:38:54 -07:00
SamGondelman
c9ea85e659 fixed left hand rotation 2016-06-02 10:50:22 -07:00
SamGondelman
9984667742 touch properly sets pose.valid and further corrected hand rotation 2016-06-02 10:09:41 -07:00