David Rowe
|
c20cd40275
|
Merge branch 'master' into 20601
Conflicts:
interface/src/avatar/Head.cpp
|
2015-07-02 09:51:47 -07:00 |
|
Philip Rosedale
|
0905962d90
|
Merge pull request #5251 from ctrlaltdavid/20600
Fix Show Eye Focus and Show Look-at Vectors
|
2015-07-02 09:16:20 -07:00 |
|
Brad Hefta-Gaub
|
f16b8d5083
|
Merge pull request #5246 from jherico/inter_idle_timing
Instrument the inter-idle time and tweaking the timeout setting
|
2015-07-02 09:01:44 -07:00 |
|
David Rowe
|
925fd71262
|
Fix rendering of look-at vectors
|
2015-07-01 22:45:47 -07:00 |
|
David Rowe
|
0df9ebeda3
|
Fix rendering of look-at avatar sphere
postLighting is never true.
|
2015-07-01 22:45:13 -07:00 |
|
David Rowe
|
026f6d3690
|
Add mouth as third gaze target in addition to left and right eyes
|
2015-07-01 21:22:30 -07:00 |
|
David Rowe
|
4ced0dc6c4
|
Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw
|
2015-07-01 20:24:47 -07:00 |
|
David Rowe
|
26cbb14f45
|
Alternative look-at gaze left/right with face trackers too
Instead of looking at one or other eye depending on look direction.
|
2015-07-01 20:09:36 -07:00 |
|
David Rowe
|
fada70fe02
|
Remove redundant code
|
2015-07-01 18:32:33 -07:00 |
|
David Rowe
|
bc4c635106
|
Fix gazing at avatar (when no head tracking or HMD)
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
|
2015-07-01 18:31:16 -07:00 |
|
samcake
|
3564499824
|
Merge pull request #5249 from ZappoMan/entityServerEditStats
add more detailed edit timing to entity server
|
2015-07-01 18:11:19 -07:00 |
|
Brad Hefta-Gaub
|
bfd72a89af
|
Merge pull request #5250 from jherico/animation_perf_tester
Animation performance test script
|
2015-07-01 17:24:59 -07:00 |
|
Brad Davis
|
566842389b
|
Animation performance test script
|
2015-07-01 17:04:48 -07:00 |
|
Brad Davis
|
88a733181e
|
Fixing comment to reflect code
|
2015-07-01 16:54:59 -07:00 |
|
Brad Davis
|
4cffa26c01
|
CR comments and fixing the microsecond display
|
2015-07-01 16:53:12 -07:00 |
|
Brad Davis
|
59027959b8
|
CR comments and fixing the average calculation
|
2015-07-01 16:30:42 -07:00 |
|
Brad Hefta-Gaub
|
af932fde29
|
Merge pull request #5247 from ericrius1/handRender
Fixed broken rendering of hydra visualization paraphernalia
|
2015-07-01 16:21:32 -07:00 |
|
Brad Davis
|
0c88972f09
|
Instrument the inter-idle time and tweaking the timeout setting
|
2015-07-01 16:14:17 -07:00 |
|
Brad Hefta-Gaub
|
b4f04af66f
|
Merge pull request #5242 from jherico/packet_processing
Eliminate per-packet locking for processing
|
2015-07-01 16:11:27 -07:00 |
|
ZappoMan
|
24b4614703
|
add more detailed edit timing to entity server
|
2015-07-01 16:11:08 -07:00 |
|
ericrius1
|
a24df5c02f
|
added postLighting check back for rendering avatar Hands
|
2015-07-01 15:28:48 -07:00 |
|
ericrius1
|
f49f368ec3
|
removed dead commented out code
|
2015-07-01 15:16:34 -07:00 |
|
ericrius1
|
50a7332a5a
|
removed accidental lineRotations.js file commit
|
2015-07-01 15:14:53 -07:00 |
|
ericrius1
|
8129d0eb1f
|
hydra lasers are now rendering again
|
2015-07-01 15:12:37 -07:00 |
|
Brad Davis
|
5001c9af4b
|
Merge pull request #5245 from ZappoMan/entityServerEditStats
add inbound edit packet queue depth to entity server
|
2015-07-01 15:10:57 -07:00 |
|
ericrius1
|
8b00864175
|
hydra hand spheres and lasers are rendering again
|
2015-07-01 15:04:19 -07:00 |
|
Brad Davis
|
1d16d80c0c
|
Comments from CR
|
2015-07-01 14:55:24 -07:00 |
|
Brad Davis
|
1e1f199fdb
|
Undoing unwisdom
|
2015-07-01 14:54:26 -07:00 |
|
Brad Davis
|
4c200d75bc
|
Tweaking packet processing locking
|
2015-07-01 14:53:08 -07:00 |
|
ZappoMan
|
ce613d59fd
|
add inbound edit packet queue depth to entity server
|
2015-07-01 14:46:37 -07:00 |
|
Clément Brisset
|
93d51717ce
|
Merge pull request #5201 from ctrlaltdavid/20590
QA for #20590 - Delete Interface.ini.lock file at start-up if it exists
|
2015-07-01 13:54:02 -07:00 |
|
Clément Brisset
|
eb3bddfe4c
|
Merge pull request #5209 from ctrlaltdavid/20589
QA for #20589 - Vertical field of view preference change should be applied immediately
|
2015-07-01 13:53:25 -07:00 |
|
Clément Brisset
|
ede2eec283
|
Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size
Fix TextOverlay font size setting
|
2015-07-01 13:52:51 -07:00 |
|
David Rowe
|
6a48b56e0f
|
In mirror mode look directly at the camera in both normal and HMD view
|
2015-07-01 13:32:50 -07:00 |
|
David Rowe
|
efbccc3a4e
|
Fix storing Oculus eye positions
|
2015-07-01 13:32:50 -07:00 |
|
David Rowe
|
e85eb246d2
|
Delete old TextRenderer after new one is in place
|
2015-07-01 13:19:46 -07:00 |
|
Brad Hefta-Gaub
|
8ec3f7ea46
|
Merge pull request #5228 from DaveDubUK/walk-1.25
walk.js disable audio by default
|
2015-07-01 13:19:45 -07:00 |
|
Philip Rosedale
|
8ed4000560
|
Merge pull request #5239 from SamGondelman/zooming
DO NOT MERGE - quadratic zooming response
|
2015-07-01 12:22:23 -07:00 |
|
Philip Rosedale
|
f10b8329e1
|
Merge pull request #5243 from murillodigital/master
Enhancing PR installer titles
|
2015-07-01 11:29:17 -07:00 |
|
Clément Brisset
|
52d1ae18cc
|
Merge pull request #5233 from SamGondelman/cameraMode
correct menu shortcut for mouselook
|
2015-07-01 11:15:31 -07:00 |
|
Jenkins Slave Access
|
981ff2d5fa
|
Enhancing PR installer titles
|
2015-07-01 14:13:37 -04:00 |
|
Brad Hefta-Gaub
|
e25483cdde
|
Merge pull request #5241 from jherico/stats_fix
Fix inverted in/out mbps display on stats
|
2015-07-01 10:30:04 -07:00 |
|
Brad Davis
|
cd63b8a49d
|
Fix inverted in/out mbps display on stats
|
2015-07-01 10:10:53 -07:00 |
|
Brad Davis
|
d4d6f8f5d5
|
Eliminate per-packet locking for processing
|
2015-07-01 10:06:04 -07:00 |
|
David Rowe
|
215c260c9e
|
Fix TextOverlay font size setting
|
2015-06-30 17:08:43 -07:00 |
|
Sam Gondelman
|
c9d205de3e
|
quadratic zooming response
|
2015-06-30 14:04:43 -07:00 |
|
Brad Hefta-Gaub
|
448a0f01b6
|
Merge pull request #5236 from howard-stearns/wantEditLogging-off-by-default
Want edit logging off by default
|
2015-06-30 09:30:33 -07:00 |
|
Ryan Huffman
|
abab284f38
|
Merge pull request #5235 from ericrius1/lineTransform
line entities can now be properly rotated using rotation property
|
2015-06-30 09:30:01 -07:00 |
|
Brad Davis
|
09f32f6839
|
Merge pull request #5234 from birarda/hyperlink-photo
styling changes in hyperlink tooltip
|
2015-06-29 12:38:46 -07:00 |
|
Howard Stearns
|
a736d0d901
|
Initial value false for domain-server wantEditLogging (used by assignment clients).
|
2015-06-29 11:33:55 -07:00 |
|