Mark Peng
745dc03c72
Fixed AGENT_TYPE typo in Application::displayStats()
2013-06-28 15:42:27 -07:00
Mark Peng
a5c6cee433
Renamed getPingTime() to getPingMs() in Agent.h, etc.
2013-06-28 15:33:08 -07:00
Mark Peng
0aa3227228
Merge remote-tracking branch 'upstream/master'
2013-06-28 15:26:34 -07:00
Mark Peng
9313dbff52
ping reporter added to interface take 5
2013-06-28 15:17:21 -07:00
Mark Peng
a5dc47eaab
ping reporter added to interface take 4
2013-06-28 15:10:45 -07:00
Mark Peng
293031de6f
ping reporter added to interface take 3
2013-06-28 13:03:30 -07:00
Philip Rosedale
c1d23f5f63
Merge pull request #592 from machinelevel/dev
...
Hand rework in preparation for adding send/receive hand data
2013-06-28 11:47:36 -07:00
Eric Johnston
0ff3554dd8
Networked Leap fingers
...
- Simplified finger updates and storage
- added pack and unpack for the fingers
- not yet tested between multiple machines, but *should* be harmless and backward-packet-compatible
2013-06-28 11:34:20 -07:00
Mark Peng
ee005f19d9
ping reporter added to interface take 2
2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e
ping reporter added to interface
2013-06-28 11:07:01 -07:00
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Philip Rosedale
ddc85272b9
Merge pull request #591 from machinelevel/dev
...
Update .gitignore to exclude the Leap SDK files, but not the stub header
2013-06-27 16:53:33 -07:00
ZappoMan
7efe9264c7
Merge pull request #590 from birarda/voxel-noise
...
fix the default quaternion for audio injectors
2013-06-27 14:11:18 -07:00
Eric Johnston
b1d345f0dc
Update .gitignore to exclude the Leap SDK files, but not the stub header
2013-06-27 13:55:16 -07:00
Stephen Birarda
cece4de90e
fix the default orientation for an injector
2013-06-27 11:14:22 -07:00
Philip Rosedale
ae24c6c6b3
Merge pull request #589 from machinelevel/dev
...
(re-commit) Added support for Leap finger-sensing device.
2013-06-27 11:02:10 -07:00
Eric Johnston
b4f5df17ab
(re-commit) Added support for Leap finger-sensing device.
...
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
2013-06-27 10:54:36 -07:00
Stephen Birarda
89d6fd105c
Merge pull request #588 from birarda/audio-latency
...
remove missing includes
2013-06-26 18:25:55 -07:00
Stephen Birarda
6cf71fb49b
remove speex includes
2013-06-26 18:25:12 -07:00
Philip Rosedale
6d1b274f75
Merge pull request #587 from birarda/audio-latency
...
audio latency tuning + getting rid of speex
2013-06-26 18:21:10 -07:00
Stephen Birarda
14718980e5
tighten audio latency by clearing the network stack after starves
2013-06-26 18:17:50 -07:00
Stephen Birarda
1c0b256f92
remove echo cancellation from audio code
2013-06-26 16:22:54 -07:00
Stephen Birarda
59a9fc8eff
remove the Speex library
2013-06-26 16:08:03 -07:00
Leonardo Murillo
b4dec0cd70
Merge pull request #583 from birarda/jenkins
...
fix replacement in post build task
2013-06-26 14:34:31 -07:00
Stephen Birarda
7443040787
replace just the script command instead of the full block
2013-06-26 14:25:03 -07:00
Stephen Birarda
177ddd889d
differentiate dev grid and live deploy cURLs
2013-06-26 13:33:35 -07:00
Stephen Birarda
f08ad62faf
Merge pull request #581 from birarda/jenkins
...
use double double quotes for correct interpolation:
2013-06-26 12:59:12 -07:00
Stephen Birarda
ac9f4d4c30
double double quotes needed for correct interpolation
2013-06-26 12:56:55 -07:00
Stephen Birarda
928f8acdac
Merge pull request #580 from birarda/jenkins
...
use double quotes to fix env interpolation, fix role
2013-06-26 12:42:25 -07:00
Stephen Birarda
815283d6d5
clean up double quote usage
2013-06-26 12:35:09 -07:00
Stephen Birarda
8e07815322
use double quotes for env interpolation, change role
2013-06-26 12:34:26 -07:00
Leonardo Murillo
5144c84cda
Merge pull request #579 from birarda/jenkins
...
fix for cURL parameters for branch deploy job
2013-06-26 12:14:21 -07:00
Stephen Birarda
8a7897d326
use deploy-dev, add missing d options
2013-06-26 12:12:04 -07:00
Stephen Birarda
1f1e520ec8
fix cURL parameters for branch deploy job
2013-06-26 12:10:04 -07:00
Philip Rosedale
f8497b3ee7
Merge pull request #577 from ey6es/master
...
Blink less when talking (not at all when brows are raised); force a blink (currently, 250ms) after talking stops.
2013-06-25 20:57:18 -07:00
Andrzej Kapolka
f2f29d2e60
Well, I guess OS X doesn't like || and && without parentheses.
2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564
Blink less when talking (and never when brows are raised); force a blink after
...
we stop talking.
2013-06-25 16:51:22 -07:00
Andrzej Kapolka
9f681c0709
Merge pull request #576 from ey6es/master
...
Fix for OS X.
2013-06-24 17:27:22 -07:00
Andrzej Kapolka
7ab1055d47
Derp, need to bind the element array buffer.
2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d
Turns out sincos is a GNU thing.
2013-06-24 17:16:06 -07:00
ZappoMan
b36404fb98
Merge pull request #574 from ey6es/master
...
Very basic eyelids/blinking.
2013-06-24 16:04:20 -07:00
Andrzej Kapolka
a0ecd167fc
Replace 0/1 with FULLY_OPEN/CLOSED.
2013-06-24 10:31:11 -07:00
Andrzej Kapolka
1e258aae99
Define blink speed as a constant.
2013-06-24 10:20:01 -07:00
Andrzej Kapolka
ef7c6ebdc6
Basic blinking.
2013-06-21 18:11:31 -07:00
Andrzej Kapolka
81d0373bdc
Merge pull request #573 from ey6es/opencv
...
Fixed pointer warning, reordered #includes.
2013-06-21 14:41:23 -07:00
Andrzej Kapolka
5bbff6f63f
Merge branch 'master' of https://github.com/worklist/hifi into opencv
...
Conflicts:
interface/src/Balls.cpp
2013-06-21 14:40:47 -07:00
birarda
e50baad9c4
Merge pull request #572 from birarda/master
...
fix shared util casing in balls
2013-06-21 14:35:29 -07:00
Andrzej Kapolka
e18d9f7ea2
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 14:34:00 -07:00
Andrzej Kapolka
650e659ee8
Fixed includes, pointer warning.
2013-06-21 14:33:01 -07:00
Stephen Birarda
258eed5890
fix casing of SharedUtil include in balls
2013-06-21 14:32:55 -07:00