Bradley Austin Davis
|
7e60aee1bf
|
Merge branch 'master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
|
2015-08-06 11:03:37 -07:00 |
|
David Rowe
|
5e7cb72843
|
Reduce the speed of movement when in HMD view
When using hmdControls.js.
|
2015-08-03 13:02:12 -07:00 |
|
Sam Gondelman
|
c9ef6d5b26
|
fixed some scripts to work with plugins branch
|
2015-07-29 12:09:28 -07:00 |
|
Sam Gondelman
|
a0d4b7ec7c
|
without script, doesn't limit you to constant degree turns
|
2015-06-19 16:11:43 -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 |
|
Sam Gondelman
|
decae5c1f1
|
finished hmdControls.js
|
2015-06-18 18:43:47 -07:00 |
|
Sam Gondelman
|
012a508eb2
|
removed extraneous code
|
2015-06-18 16:25:12 -07:00 |
|
Sam Gondelman
|
c84a6cbf28
|
added warping
|
2015-06-18 16:05:58 -07:00 |
|
Sam Gondelman
|
fd0efd91ff
|
added shift action, added timers and fast mode to hmdControls.js
|
2015-06-18 13:59:37 -07:00 |
|
Sam Gondelman
|
f752534f7c
|
actionEvent signal, captureActions, began work on hmdControls.js
|
2015-06-18 09:52:36 -07:00 |
|