Anthony J. Thibault
|
ac9e1384c0
|
controllers render in right position, wrong rotation
|
2015-07-10 18:27:12 -07:00 |
|
Anthony J. Thibault
|
94918be949
|
another fix for viewing vive user in third person
|
2015-07-10 18:27:12 -07:00 |
|
Brad Davis
|
86a51806a5
|
Fix issue with overlay stuck to face
|
2015-07-10 10:48:54 -07:00 |
|
Anthony J. Thibault
|
c69665e0fe
|
fix for goToLocation
|
2015-07-10 09:43:33 -07:00 |
|
Anthony J. Thibault
|
51e24ea466
|
head model follows HMD for observers
|
2015-07-10 09:20:38 -07:00 |
|
Anthony J. Thibault
|
653b0d7789
|
started working on rendering controllers
|
2015-07-09 19:03:11 -07:00 |
|
Anthony J. Thibault
|
b6c0ae4bea
|
Fix for flying in HMDMode with avatar collisons disabled
|
2015-07-09 16:29:43 -07:00 |
|
Anthony J. Thibault
|
f2436bc00a
|
controller/hand offset
|
2015-07-09 13:30:26 -07:00 |
|
Anthony J. Thibault
|
2ac6b6cd32
|
misc. changes
|
2015-07-09 09:57:12 -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
|
dcaa294778
|
removed vive zooming
|
2015-07-08 13:38:48 -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
|
07141fd1e3
|
rotation and thrust work in both 2d and hmd mode
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
|
2015-07-08 12:25:57 -07:00 |
|
Anthony J. Thibault
|
754e55553a
|
modified rotation in MyAvatar::updatePosition, reenabled trackpad input
|
2015-07-07 17:29:46 -07:00 |
|
Anthony J. Thibault
|
15cf008f13
|
hand controllers and arrow keys now work
|
2015-07-07 17:29:45 -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 |
|
Anthony J. Thibault
|
5293effc2e
|
more work in progress vive room tracking
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
|
2015-07-07 00:12:48 -07:00 |
|
Anthony J. Thibault
|
834b75f4c4
|
work in progress room scale tracking work.
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
|
2015-07-06 18:25:42 -07:00 |
|
Sam Gondelman
|
f69b755166
|
merge with hifi/plugins
|
2015-07-06 17:41:45 -07:00 |
|
Sam Gondelman
|
8fbbb26b15
|
vertical hand offset (temporary)
|
2015-07-06 17:04:28 -07:00 |
|
Sam Gondelman
|
33e4893c17
|
correct hand rotation, buttons and axes work
|
2015-07-06 16:30:56 -07:00 |
|
Brad Davis
|
95000eec3c
|
Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
interface/src/ui/overlays/LocalModelsOverlay.cpp
|
2015-07-06 16:22:03 -07:00 |
|
Brad Hefta-Gaub
|
96fecd093d
|
Merge pull request #5237 from samcake/yellow
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
|
2015-07-06 15:41:58 -07:00 |
|
samcake
|
a8ddc71946
|
Merge pull request #5262 from bwent/cookies
Added checkbox functionality, double-click to reset panel
|
2015-07-06 15:09:16 -07:00 |
|
Sam Gateau
|
fe633cd545
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-06 15:04:02 -07:00 |
|
bwent
|
8b4398cd5a
|
Update cookies.js
|
2015-07-06 15:03:21 -07:00 |
|
bwent
|
2bdd2b8c2c
|
Update cookies.js
|
2015-07-06 15:02:51 -07:00 |
|
Sam Gateau
|
4d48b98364
|
For a fistfull of magic numbers
|
2015-07-06 14:22:09 -07:00 |
|
bwent
|
5d91f1be83
|
Removed header comments
|
2015-07-06 13:26:16 -07:00 |
|
Sam Gateau
|
95f5b14d45
|
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
|
2015-07-06 12:47:35 -07:00 |
|
Sam Gateau
|
e63be58251
|
CLenaing the interface of Item::Status to be more explicit
|
2015-07-06 12:23:57 -07:00 |
|
bwent
|
93fbfcbff7
|
Added checkbox functionality, double-click to reset panel
|
2015-07-06 12:09:08 -07:00 |
|
Brad Davis
|
21562c0766
|
Merge pull request #5258 from ericrius1/nakedGLStripping
Removing naked GL calls from overlay code
|
2015-07-06 10:25:50 -07:00 |
|
Sam Gateau
|
2bbffff22f
|
Fixing typos
|
2015-07-06 10:22:25 -07:00 |
|
Clément Brisset
|
c5a043f2e1
|
Merge pull request #5253 from ZappoMan/inBoundStats
add edit update stats
|
2015-07-04 21:11:48 -07:00 |
|
ZappoMan
|
c4a5160b89
|
CR feedback
|
2015-07-04 19:13:35 -07:00 |
|
ZappoMan
|
74733452da
|
some tweaks to make stats dialog more readable
|
2015-07-04 11:25:27 -07:00 |
|
ZappoMan
|
40cdd8646e
|
add packets per second to octree processing stats
|
2015-07-03 15:53:53 -07:00 |
|
ZappoMan
|
2aa345dfc6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
|
2015-07-03 15:04:59 -07:00 |
|
Eric Levin
|
3d06b011aa
|
adding batch to renderHUD
|
2015-07-03 13:27:00 -07:00 |
|
samcake
|
c6a613eaa9
|
Merge pull request #5260 from ZappoMan/deadCodeRemovalMachine
remove dead code
|
2015-07-03 11:53:21 -07:00 |
|
ZappoMan
|
29a7584ee6
|
remove dead code
|
2015-07-03 11:29:59 -07:00 |
|
Eric Levin
|
9d3995ae25
|
Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping
|
2015-07-03 09:42:19 -07:00 |
|
Brad Davis
|
ba7c3a2c27
|
Attempting to get UI and navigation keys/mouse working
|
2015-07-03 07:10:33 -07:00 |
|
Brad Davis
|
b529901b1a
|
Attempting to protect against infinite recursion
|
2015-07-03 07:09:57 -07:00 |
|
Brad Davis
|
e459d0cb83
|
Fixing the 0.6 Oculus plugin
|
2015-07-03 07:08:48 -07:00 |
|
Brad Davis
|
2a1776303d
|
Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
|
2015-07-03 06:17:35 -07:00 |
|
Brad Davis
|
ed5835ff05
|
Trying to get mac display plugins working:
|
2015-07-02 22:29:22 -07:00 |
|
Sam Gateau
|
e3c06a30a1
|
removing dead code
|
2015-07-02 19:29:09 -07:00 |
|