Philip Rosedale
01108bdf6b
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
...
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
ZappoMan
49cf29ce8f
cleanup debugging and dead code
2015-08-17 15:57:20 -07:00
ZappoMan
47b0e2fda6
more hacking on click to focus
2015-08-17 14:02:24 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
ZappoMan
8cf450cb67
first cut at making focus click based
2015-08-17 11:41:54 -07:00
Brad Davis
9706a44ca1
Merge pull request #5571 from ZappoMan/hmdToolsRedux
...
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 20:11:27 -07:00
Brad Davis
dc2ddd0303
switch statement spacing
2015-08-14 17:12:00 -07:00
Howard Stearns
d28c555a79
Synchronize eye joint and debugging vectors when the other avatar is looking at me.
2015-08-14 16:47:34 -07:00
Brad Davis
db95657455
PR comments
2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 16:27:50 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub
31a49a551a
Merge pull request #5556 from jherico/bart
...
QML framerate improvments
2015-08-14 11:11:14 -07:00
Howard Stearns
1133e053d1
Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.
2015-08-14 07:33:36 -07:00
Howard Stearns
0f6c0a3117
Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate
2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638
Get default avatar url from resources.
2015-08-13 14:23:34 -07:00
Leonardo Murillo
cda5b29fd3
Another take at versioning details exchange - checkpoint
2015-08-13 14:19:13 -06:00
Howard Stearns
62941c0914
Remove dead code.
2015-08-13 12:39:30 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
David Rowe
0f56285283
Fix HMD look-at positions and lines
2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712
Fix to use new HMD methods
2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
35d6528d08
Merge pull request #5550 from jherico/marge
...
PLUGINS - Cleaning up HMD tools
2015-08-11 10:46:59 -07:00
Bradley Austin Davis
7694c1c0a6
Cleaning up HMD tools
2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac
Start eye tracker streaming such that don't block Interface
...
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
Bradley Austin Davis
61ecee93b8
Fix mis-positioning of QML elements when moving from retina to non-retina display
2015-08-10 15:18:49 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
57408c4338
Automatically show HMD tools when switching an HMD plugin
2015-08-09 12:14:29 -07:00
Brad Davis
5515b9d8ee
Decouple Application and plugin definitions, cleanup container usage
2015-08-08 17:51:16 -07:00
Bradley Austin Davis
2878950dbe
Fix crash on startup on mac
2015-08-08 15:26:38 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
Brad Davis
639a0822fe
Fixing aspect ratio
2015-08-08 14:08:41 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d
Merge fixes
2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
David Rowe
ea03067a02
When eye tracking data is lot for > N seconds handle as "not tracking"
...
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e
Resume eye tracking at start-up if was running at shut-down
2015-08-07 11:59:11 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
David Rowe
551c00dc23
Fix look-at position calculation when in HMD display
...
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
2015-08-06 16:41:06 -07:00
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
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Andrew Meadows
59f6988e56
Merge pull request #5465 from SamGondelman/connexionFixes
...
Trying to fix/clean up 3DConnexion stuff
2015-08-05 11:16:34 -07:00
Philip Rosedale
06710618d1
Merge pull request #5463 from ctrlaltdavid/20640
...
CR for 20640 - Add DDE option to couple eyelids
2015-08-05 08:47:28 -07:00
David Rowe
c771574578
Add 5 point eye tracker calibration option
2015-08-04 18:02:34 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
David Rowe
fefddb631f
Add 1 and 3 point eye tracker calibration
2015-08-04 14:46:03 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Bradley Austin Davis
29c9e6e45e
Updating plugins to core profile
2015-08-04 00:33:03 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
b71ad31812
Merge branch 'master' into 20639
2015-08-03 20:53:12 -07:00
Sam Gondelman
c9780338ae
merge from master
2015-08-03 16:27:45 -07:00
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
David Rowe
7749b912ea
Merge branch 'master' into 20639
2015-08-03 09:55:35 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Brad Davis
8ac33453b5
Fix v-sync functionality
2015-08-01 22:10:47 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
SamGondelman
8908c7c141
working on windows crash
2015-07-31 17:55:59 -07:00
Zander Otavka
0524155349
Expose face tracking to the script engine.
2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63
Expose address bar toggling to scripts.
2015-07-31 11:26:04 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Bradley Austin Davis
ac0ec0a458
Ensure the app moves back to a non-rift screen if the saved geometry is bad
2015-07-30 17:09:08 -07:00
Brad Davis
948d5dab0c
Cleaning up diff
2015-07-30 15:30:05 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93
Tweaking timing of geometry restoration
2015-07-30 12:44:47 -07:00
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
Brad Davis
5878a4661c
Restoring HMD tools dialog, phase 1
2015-07-30 11:35:55 -07:00
Brad Davis
382ef057b0
Revert to using QGLWidget
2015-07-30 10:59:05 -07:00
David Rowe
46b4817155
Add DDE option to couple eyelids
...
Use the most "open" value for both.
2015-07-29 20:08:58 -07:00
samcake
e32e45ed2b
make sure the writting mask is on for depth buffer
2015-07-29 18:06:46 -07:00
samcake
ac46b2bd17
Keep the resetstage in
2015-07-29 17:38:23 -07:00
Sam Gateau
8b7ad9cfcb
merge with upstream
2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Sam Gondelman
9025bc3ead
press o to toggle overlays in case you don't have a middle mouse click
2015-07-29 16:43:25 -07:00
David Rowe
02ae008c9c
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-07-29 16:24:30 -07:00
David Rowe
ed259e6bbb
Merge branch 'master' into 20639
2015-07-29 11:44:58 -07:00
David Rowe
e5d2a78980
Don't check SMI Eye Tracker menu item if tracking doesn't start
2015-07-29 11:33:21 -07:00
samcake
4ebc75da1f
Merge pull request #5369 from ericrius1/hitEffect
...
Added functionality for displaying a screen-space hit effect
2015-07-29 11:28:08 -07:00
David Rowe
76fe0c8764
Control eyes only if in HMD view or simulating
2015-07-29 11:14:00 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Brad Davis
900c2c11df
Another whack at touch events
2015-07-29 10:29:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
Brad Davis
07553e7a7c
Accept touch events in the GL window
2015-07-29 10:00:41 -07:00
David Rowe
1ae920368d
Calculate and look at the point the eye tracker user is looking at
2015-07-29 08:38:20 -07:00
Brad Davis
bb29127eff
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 23:14:41 -07:00
Anthony J. Thibault
044ea2ace5
Changed mirror position to not be achored to the head.
...
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
2015-07-28 19:31:43 -07:00
Brad Davis
3210037bc1
Merge pull request #5449 from ZappoMan/plugins
...
Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity
2015-07-28 16:49:30 -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
samcake
9cf3dfd3f7
test this on windows ?
2015-07-28 15:49:39 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -07:00
David Rowe
f0ed8d8cef
Add menu item that enables / disables simulated eye tracking
2015-07-28 14:07:25 -07:00
SamGondelman
482f064c64
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-28 12:56:54 -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
Bradley Austin Davis
6df260b3f9
Bad variable usage on OSX
2015-07-28 12:47:52 -07:00
