Andrew Meadows
039d9a6a98
Merge pull request #6010 from ZappoMan/disableHandMouseByDefault
...
Disable hand mouse by default
2015-10-07 14:15:58 -07:00
Brad Hefta-Gaub
05fd62ac51
Merge pull request #6009 from jherico/homer
...
Enabling programmatic access to the IPD scale
2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395
Picking fixes in the HMD
2015-10-06 22:56:48 -07:00
Brad Hefta-Gaub
6e5847bb1c
make Hand Input Mouse off by default
2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8
Fixing bug in application compositor transform
2015-10-06 19:08:44 -07:00
Atlante45
60ebd3a544
Remove unused members (Mostly mouse stuff)
2015-10-06 13:56:25 -07:00
Atlante45
dde11c5cd1
More unused
2015-10-06 13:56:23 -07:00
Brad Hefta-Gaub
76825c2be7
only show hand cursors when menu is enabled
2015-09-30 09:06:45 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870
address Sam's concerns
2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53
fix mac build
2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
SamGondelman
42e7c5278c
attempt to fix ray picking in standing mode
2015-07-29 16:04:57 -07:00
Brad Davis
91768b3992
Merge pull request #5450 from SamGondelman/sam/input-plugins
...
Plugins branch - re-remove hand lasers
2015-07-28 16:25:55 -07:00
Brad Davis
8202862750
Working on display plugins stability
2015-07-28 16:22:22 -07:00
SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
SamGondelman
50f65b3a54
fixed controller mouse location in standing mode
2015-07-27 18:07:21 -07:00
Bradley Austin Davis
0cbc12af8b
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-27 10:15:10 -04:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Sam Gondelman
1af51572af
fixed init crash if you follow very specific startup steps
2015-07-24 17:10:39 -07:00
Bradley Austin Davis
0efa2c0eee
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-24 17:33:24 -04:00
Anthony J. Thibault
c602346cad
Update ApplicationCompositor to use QPropertyAnimation for alpha fades
2015-07-24 11:14:09 -07:00
samcake
f3dc159e33
Merge pull request #5401 from ZappoMan/renderLaserPointers
...
remove renderLaserPointers()
2015-07-24 10:41:32 -07:00
Anthony J. Thibault
87a0e48d30
Updates to overlay fade
...
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
2015-07-23 20:36:58 -07:00
Anthony J. Thibault
1d93abf90c
Overlay can be shown and hidden and has better behavior in Standing HMD Mode.
...
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
2015-07-23 17:17:03 -07:00
Bradley Austin Davis
901dd77f05
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-23 18:11:25 -04:00
ZappoMan
720f6ec529
completely remove six sense lasers
2015-07-23 11:17:22 -07:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Bradley Austin Davis
9596452c32
Trying to fix oculus rendering
2015-07-22 08:07:44 -04:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Sam Gateau
ad1771c738
removing dead code
2015-07-20 17:09:11 -07:00
Sam Gateau
59666f664a
merging my changes to remove cruff from application to AUstin;s latest
2015-07-20 15:37:17 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
f13152b2b4
Fixing reference to PI/2
2015-07-18 23:04:16 -07:00
Brad Davis
5b494c23fd
More header cleanup
2015-07-18 22:38:26 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
ZappoMan
8692f51399
dead code cleanup
2015-07-17 16:15:02 -07:00
ZappoMan
33464dfd6c
cleanup dead code
2015-07-17 11:35:42 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -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
Brad Davis
ae882c8347
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/ui/ApplicationCompositor.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-16 16:37:55 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
Anthony J. Thibault
56e7af081e
input plugin architecture, fixed sixense
2015-07-15 18:50:44 -07:00
ZappoMan
2ad2c4d554
remove some dead code
2015-07-15 15:33:28 -07:00
