Jeffrey Ventrella
7693165578
merge
2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
c60acfad28
merge
2013-08-02 11:00:53 -07:00
Jeffrey Ventrella
6ebe33bb0b
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 11:00:10 -07:00
Jeffrey Ventrella
8fc800acff
some work on hands
2013-08-02 10:59:04 -07:00
Andrzej Kapolka
69cac69067
Go ahead and show the leap hand by default, but don't include the fingers if
...
the palms are inactive (!)
2013-08-01 18:56:14 -07:00
Andrzej Kapolka
c038e2c9ba
Wrong array index here, and finger needs to be flagged as active so that the
...
avatar mixer will encode it.
2013-08-01 18:32:48 -07:00
Stephen Birarda
269e040263
Qt5 find package cleanup
2013-08-01 15:27:55 -07:00
Jeffrey Ventrella
1df7026b26
merge?
2013-08-01 10:54:09 -07:00
Stephen Birarda
71ab8ae4f8
some necessary changes for AvatarData transmission
2013-08-01 10:07:10 -07:00
Jeffrey Ventrella
6c1cc911d5
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
cecb908dc1
cleanup
2013-07-26 12:53:40 -07:00
Jeffrey Ventrella
9890cf72ce
added keyboard mode switching for rave glove effects
2013-07-26 12:37:37 -07:00
Stephen Birarda
9f2b2d09a9
changes to CMakeLists for Qt5
2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542
switch to new qt5 find module setup
2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9
changes to CMakeLists to up to qt5
2013-07-23 20:28:11 -07:00
Jeffrey Ventrella
fdebe166ba
fixed it so both leap hands produce particles
2013-07-22 14:07:51 -07:00
Eric Johnston
6ceb48127a
Small fix when no Leap connected.
2013-07-19 19:56:05 -07:00
Eric Johnston
b8cf4a9775
Rave glove: stabilization of Leap hands
2013-07-19 19:47:07 -07:00
Eric Johnston
262851346c
Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing)
...
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
2013-07-19 09:31:45 -07:00
Eric Johnston
cb6f542b9f
First-pass finger motion trails
2013-07-17 17:00:23 -07:00
Eric Johnston
aa0cab2180
Code review issues addressed.
2013-07-17 16:09:24 -07:00
Eric Johnston
8ebf5fbd6b
Rave & Leap: cleanup and move over to new hand/finger structures
2013-07-17 14:54:18 -07:00
Eric Johnston
46c5383d10
minor cleanup
2013-07-17 12:54:44 -07:00
Eric Johnston
f21d2a477d
Rave Glove Demo: Restructuring palm and finger data structures
2013-07-17 08:29:50 -07:00
ZappoMan
d71400a42a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-07-16 09:36:39 -07:00
Eric Johnston
0239341127
updated per feedback
2013-07-15 14:27:58 -07:00
Eric Johnston
c61966ebcd
made Leap unit-conversion method public
2013-07-15 14:12:52 -07:00
atlante45
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
280afed7f0
added scale in avatar packets eand slots to change it from the menu
2013-07-12 17:51:47 -07:00
Eric Johnston
58b50067ad
Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash.
...
Will resolve the crash before re-enabling.
2013-07-11 16:06:31 -07:00
ZappoMan
c26e39764a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce
add support for Low Res sending while moving
2013-07-11 12:43:43 -07:00
Stephen Birarda
769205253f
remove extra plus in AvatarData parseData
2013-07-11 12:27:48 -07:00
Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
ZappoMan
9aed3d3cc6
enable delta sending by default
2013-07-11 10:37:28 -07:00
ZappoMan
dc70675c22
removed obsolete ResIn mode
2013-07-10 19:04:28 -07:00
ZappoMan
17e70271ff
make occlusion culling default
2013-07-10 17:21:51 -07:00
Stephen Birarda
81e6bccd08
use packet version helpers in parseData methods
2013-07-08 14:13:36 -07:00
Stephen Birarda
8a684244cc
packet versioning for HEAD_DATA packets
2013-07-08 12:53:07 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
Andrzej Kapolka
f9f2c66115
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Application.cpp
interface/src/Avatar.cpp
interface/src/Avatar.h
libraries/avatars/src/AvatarData.h
2013-07-05 22:52:42 -07:00
Andrzej Kapolka
30f77975cf
Trying to get the right rotations, send them on the wire.
2013-07-03 17:07:22 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
Eric Johnston
5d59bcbec7
(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements
...
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
2013-07-02 17:03:32 -07:00
Andrzej Kapolka
52e7ff9a68
Working on filling in missing joint data.
2013-07-02 14:51:27 -07:00
Eric Johnston
6c42922288
Minor bug fixes for networked Leap hands
2013-06-28 15:22:56 -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
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
ZappoMan
7fe6c0e3b3
added occlusion culling menu option
2013-06-18 09:34:12 -07:00
