Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 07:06:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80025 commits 76 branches 59 tags 1.2 GiB
Commit graph

934 commits

Author SHA1 Message Date
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -07:00
ZappoMan
720f6ec529 completely remove six sense lasers 2015-07-23 11:17:22 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
David Rowe
a488a12151 Merge branch 'master' into 20602 2015-07-20 15:37:43 -07:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Brad Davis
f13152b2b4 Fixing reference to PI/2 2015-07-18 23:04:16 -07:00
Brad Davis
35f7307f30 More header cleanup 2015-07-18 22:15:50 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Anthony J. Thibault
060f6c19a6 almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly 2015-07-16 18:16:59 -07:00
David Rowe
6c6e3eb758 Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
David Rowe
9980233a0d Use estimated eye pitch and yaw from DDE to deflect eyes 2015-07-16 13:03:33 -07:00
David Rowe
228e8d4fc0 Velocity filter eye pitch and yaw 2015-07-16 12:37:47 -07:00
David Rowe
6b523ada2b Calculate eye pitch and yaw from DDE coefficients 2015-07-16 10:48:21 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
Sam Gondelman
f3cb25065f can't move when hydras at base, hands can deactivate individually 2015-07-14 17:36:22 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Anthony J. Thibault
ac9e1384c0 controllers render in right position, wrong rotation 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Anthony J. Thibault
0f30da64bc added Plugin interface to ViveControllerManager 
mostly I just added this to add the isSupported method, so it wouldn't
attempt to initialize if there was no HMD attached.
 2015-07-08 16:31:52 -07:00
Sam Gondelman
64118d9118 started moving hydra to use UserInputMapper::Poses, needs testing 2015-07-08 13:38:48 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Atlante45
4a777f600f Change DDE Packet struct name to avoid collision 2015-07-06 15:11:36 -07:00
David Rowe
87ca7626d7 Merge branch 'master' into 20601 2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716 Adjust gaze target for someone looking at me 2015-07-02 15:43:23 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -07:00
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -07:00
David Rowe
efbccc3a4e Fix storing Oculus eye positions 2015-07-01 13:32:50 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Sam Gondelman
1ea8e85fe8 Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers 2015-06-30 17:30:37 -07:00
Brad Davis
db1094418d Restoring from plugins 2015-06-30 15:41:47 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Sam Gondelman
a27196dfee initial testing of hand controller tracking 2015-06-29 17:13:33 -07:00
Brad Davis
a923c044a3 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-28 22:51:46 -07:00
Seth Alves
7f609dca26 Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire 2015-06-27 10:49:12 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Brad Davis
4417c00ae4 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.h
	interface/src/Menu.h
 2015-06-26 17:02:16 -07:00
Seth Alves
7c26641560 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-25 17:40:27 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Sam Gondelman
c1fdbeb3b4 hydra dead zone to prevent drifting 2015-06-23 10:52:44 -07:00
Seth Alves
7eafe2d48d quiet compiler 2015-06-22 19:55:25 -07:00
Seth Alves
f579027430 quiet compiler 2015-06-22 19:55:15 -07:00
Brad Davis
9f98547390 Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
Brad Davis
1cfc0b2e42 Fixing mac/linux compilation 2015-06-22 12:06:08 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Sam Gondelman
e78ce8055a hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G 2015-06-19 11:17:36 -07:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Sam Gondelman
53bbd519a3 two new customizable actions for use in js 2015-06-18 14:37:09 -07:00
Brad Davis
68595ef5dc Delete sync object after use 2015-06-18 14:27:19 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Brad Davis
1243c54767 More merge bugs 2015-06-18 12:44:57 -07:00
Brad Davis
4404917003 Fix HMD projection post-merge 2015-06-18 11:16:25 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Sam Gondelman
45a5f1364a fix compile issue if you don't have sdl2 2015-06-17 11:56:44 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Sam Gondelman
814e22364a coding standard fixes 2015-06-16 11:30:28 -07:00
Sam Gondelman
1ecc954656 coding standard fixes 2015-06-16 10:25:30 -07:00
Sam Gondelman
68a08d969d code review fixes 2015-06-16 10:19:40 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Sam Gondelman
4090fd6aa1 attempt to fix build errors 2015-06-15 12:53:14 -07:00
Sam Gondelman
40bd747080 added trigger buttons to hydra, removed hydraMove.js from default scripts 2015-06-15 11:13:07 -07:00
Sam Gondelman
fe576c6baf hands reset when hydras disconnect 2015-06-15 10:23:24 -07:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Brad Davis
737e418878 Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 
This reverts commit 0cdc2b53fe.
 2015-06-13 10:02:54 -07:00
Brad Davis
dac4a242c1 Removing cruft 2015-06-12 19:47:05 -07:00
Sam Gondelman
1a8df6509f userinputmapper supports hydra, but some hydra events still register as mouse events 2015-06-12 18:22:56 -07:00
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
Sam Gondelman
b4e108cd3b added zooming to default joystick controls 2015-06-12 10:16:00 -07:00
Sam Gondelman
72cc070f0a enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot 2015-06-11 18:24:32 -07:00
Sam Gondelman
2bdef6205e added more available inputs to joystick and keyboardmousedevice 2015-06-11 16:20:46 -07:00
Sam Gondelman
b8b61e7c62 integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js 2015-06-11 15:51:21 -07:00
Brad Davis
d3cdbc389a Code cleanup 2015-06-11 15:05:08 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Sam Gondelman
0e8ec81837 fixed lambda capture 2015-06-11 09:41:59 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
Brad Davis
7374fb84e8 Working on fixing overlays with team-teaching merge 2015-06-10 09:36:14 -07:00
Brad Davis
e5a9fa8cdc Fixing broken declarations 2015-06-09 11:20:23 -07:00
Brad Davis
78c3ba0e2c Removing dead code 2015-06-09 10:25:21 -07:00
Brad Davis
64bb120712 Be a little less heavy handed with the GPU sync 2015-06-09 10:25:05 -07:00
Sam Gondelman
d3a4eec5c5 removed dead code, magic numbers 2015-06-09 09:56:40 -07:00
Brad Davis
5680d58a19 Removing oglplus requirement for linux and mac 2015-06-09 03:09:10 -07:00
Brad Davis
6147844f93 Merge branch 'master' into ovr6 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.h
 2015-06-09 00:44:06 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Brad Davis
5faa53d7e9 Working on OVR SDK 0.6 2015-06-08 10:17:34 -07:00
Bradley Austin Davis
5a52a389be Working on SDK 0.6 2015-06-07 23:23:21 -07:00
Brad Davis
de268c47b3 Working on 0.6 2015-06-07 18:25:16 -07:00
Bradley Austin Davis
6a60da2a6c Working on SDK 0.6 2015-06-07 17:58:33 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
Brad Davis
171b6d18d0 Merge branch 'master' into plugins 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-05-28 10:31:20 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Brad Davis
b5e6b737c4 Working on display plugins 2015-05-26 17:32:41 -07:00
Atlante45
76fc59675b Merge branch 'team-teaching' into text-renderer 2015-05-26 20:01:26 +02:00
Brad Davis
e651c722c3 Merge remote-tracking branch 'upstream/master' into plugins 2015-05-25 15:22:28 -07:00
Atlante45
a44054f9db Make TextureCache::getImageTexture static 2015-05-23 03:24:26 +02:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
David Rowe
a0c3c974a9 Throttle DDE face acquisition attempts in order to reduce CPU usage 2015-05-21 19:44:38 -07:00
Brad Davis
c0d84cfc54 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-05-21 11:04:06 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1 
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
 2015-05-20 17:02:28 -07:00
Brad Hefta-Gaub
79023763ef Merge pull request #4869 from ctrlaltdavid/20543 
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
 2015-05-20 14:47:31 -07:00
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -07:00
Brad Davis
7f2552c690 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
 2015-05-16 22:38:15 -07:00
Philip Rosedale
0d00393eff Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation 
Fix facetracker rotation
 2015-05-15 17:17:30 -07:00
David Rowe
95a565627c Make DDE isTracking() behave the same as Faceshift's 2015-05-14 08:49:44 -07:00
Brad Davis
e20d2ffb15 Merge typo 2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
David Rowe
7319c7b767 Fix face-tracked head rotation for Faceshift, also 2015-05-13 11:35:04 -07:00
David Rowe
5050171d30 Fix face-tracked head disappearing into body 
Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and
r.w = 1.0 when r.x = r.y = r.z = 0.0.
 2015-05-13 11:34:19 -07:00
David Rowe
8a3c8e0d9a Merge branch 'master' into 20532 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-05-12 17:41:12 -07:00
Philip Rosedale
65277e0573 Merge pull request #4836 from ctrlaltdavid/20535 
CR for #20535 - Improve DDE eyelid control
 2015-05-12 17:00:02 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00