David Rowe
|
02ae008c9c
|
Merge branch 'master' into 20639
Conflicts:
interface/CMakeLists.txt
|
2015-07-29 16:24:30 -07:00 |
|
David Rowe
|
212327dd46
|
Fix eye tracker conditional compile
|
2015-07-29 16:20:45 -07:00 |
|
David Rowe
|
f2ae7bfac0
|
Don't apply saccades to tracked eyes
|
2015-07-29 15:14:43 -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 |
|
ericrius1
|
65e04337bf
|
removed synccache line
|
2015-07-29 11:15:20 -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 |
|
ericrius1
|
697cb4c9d0
|
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
|
2015-07-29 10:02:06 -07:00 |
|
samcake
|
bc941147f4
|
Merge pull request #5446 from bwent/cookies
Add cookies.js functionality for collapsable subpanels, key navigation
|
2015-07-29 09:53:07 -07:00 |
|
bwent
|
7805cf4e48
|
Format fixes, UI logos for collapse/expand toggle
|
2015-07-29 09:19:33 -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 |
|
Marcel Verhagen
|
1d29fb9d7f
|
replace tabs with whitespaces.
|
2015-07-29 14:56:24 +02:00 |
|
Brad Davis
|
6a5c2982ac
|
Merge pull request #5453 from hyperlogic/ajt/mirror-anchor-fix
Changed mirror position to not be achored to the head.
|
2015-07-28 20:26:19 -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 |
|
ericrius1
|
469bace7ca
|
removed unnessary computations from hit effect fragment shader
|
2015-07-28 15:15:34 -07:00 |
|
Andrew Meadows
|
fa49342f00
|
Merge pull request #5420 from bwent/solar-system
Example script solarsystem.js with orbiting satellite game
|
2015-07-28 15:06:23 -07:00 |
|
Howard Stearns
|
a383f43f75
|
Merge pull request #5447 from AndrewMeadows/calcium
fix broken unit test builds
|
2015-07-28 14:34:20 -07:00 |
|
David Rowe
|
8f0663841c
|
Provide more user-friendly eye tracking error messages
|
2015-07-28 14:09:19 -07:00 |
|
David Rowe
|
f0ed8d8cef
|
Add menu item that enables / disables simulated eye tracking
|
2015-07-28 14:07:25 -07:00 |
|
Philip Rosedale
|
cce6f15de2
|
Merge pull request #5443 from huffman/edit-camera-up
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
|
2015-07-28 13:32:34 -07:00 |
|
Marcel Verhagen
|
34d63cdb43
|
Removed double ""
|
2015-07-28 22:02:36 +02:00 |
|
bwent
|
1107742188
|
Clean up formatting for satellite.js
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
5272a1d6e7
|
refactoring variables and constants, fix update loop to continue over unlaunched satellites
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
e0d6609a99
|
resolve file path issue
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
ccb3d433af
|
Example script solarsystem.js with orbiting satellite game
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
2be95997d1
|
clean up formatting
|
2015-07-28 13:00:41 -07:00 |
|
bwent
|
d9693796bc
|
Capture key events
|
2015-07-28 13:00:40 -07:00 |
|
bwent
|
774b4851c3
|
Add tab to highlight widgets and update using left and right arrow keys
|
2015-07-28 13:00:40 -07:00 |
|
bwent
|
b7d195e817
|
more subpanel fixes
|
2015-07-28 13:00:40 -07:00 |
|
bwent
|
252780dc5d
|
fix checkbox class, make subpanels collapsable
|
2015-07-28 13:00:40 -07:00 |
|
bwent
|
4ae03184ec
|
add subpanel functionality
|
2015-07-28 13:00:40 -07:00 |
|
bwent
|
b46ad0c397
|
Created subpanel panel item
|
2015-07-28 13:00:40 -07:00 |
|
Andrew Meadows
|
d03a7d1b70
|
fix physics-tests build errors
|
2015-07-28 12:24:17 -07:00 |
|
Andrew Meadows
|
2aa453b610
|
fix build errors for shared-tests
|
2015-07-28 12:05:45 -07:00 |
|
David Rowe
|
72a590e34c
|
Initialize, start, and stop eye tracking with simulated data
|
2015-07-28 11:02:56 -07:00 |
|
Andrew Meadows
|
6e41a79551
|
Merge pull request #5360 from BingShearer/Leaves
New falling leaf script based on the existing rain.js
|
2015-07-28 10:08:16 -07:00 |
|
Brad Hefta-Gaub
|
26111b9b80
|
Merge pull request #5365 from kevinmthomas-carpool/20485
20485
|
2015-07-28 09:59:43 -07:00 |
|
Brad Hefta-Gaub
|
43eec08514
|
Merge pull request #5376 from venkatn93/avatar
New ambient occlusion effect in render pipeline
|
2015-07-28 09:58:51 -07:00 |
|
Brad Hefta-Gaub
|
d8c2b41655
|
Merge pull request #5428 from kevinmthomas-carpool/20628
CR for Job #20628 - JS Stream Player For Domain-Zone
|
2015-07-28 09:58:04 -07:00 |
|
Brad Hefta-Gaub
|
ee641335fa
|
Merge pull request #5421 from thoys/20552
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
|
2015-07-28 09:57:22 -07:00 |
|
Brad Hefta-Gaub
|
6d1bfd8134
|
Merge pull request #5427 from kevinmthomas-carpool/20622
CR for Job #20622 - JS Stream Player
|
2015-07-28 09:56:39 -07:00 |
|
Philip Rosedale
|
275ab6b96b
|
Merge pull request #5442 from ctrlaltdavid/throttle-fps-by-default
Make Throttle FPS If Not Focus be enabled by default
|
2015-07-27 20:39:56 -07:00 |
|
Howard Stearns
|
6433a48fdb
|
Merge pull request #5441 from sethalves/fix-vhacd
if OBJ data isn't from a url, don't dereference null QUrl pointers
|
2015-07-27 20:27:44 -07:00 |
|
David Rowe
|
8a7cdb1c64
|
Make Throttle FPS If Not Focus be enabled by default
|
2015-07-27 19:53:38 -07:00 |
|
Seth Alves
|
f4a23065b4
|
if obj data isn't from a url, don't dereference null url pointer
|
2015-07-27 19:06:14 -07:00 |
|
Niraj Venkat
|
34e400ac67
|
Changing var name to 'DebugAmbientOcclusion'
|
2015-07-27 17:14:09 -07:00 |
|
David Rowe
|
e0ca6eb5ed
|
Add eye tracker class and menu item
|
2015-07-27 15:33:15 -07:00 |
|
David Rowe
|
70d155048f
|
Add SMI iViewHMD eye tracking as an optional library
|
2015-07-27 14:43:32 -07:00 |
|