ZappoMan
cc8c92c4e0
Merge pull request #785 from machinelevel/dev4
...
Disable hand receive logic to keep team from crashing while a bug is bei...
2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb
Warning fix: virtual method needs virtual destructor
2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c
More cleanup after crash tracing
2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a
Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled
2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e
Disable hand receive logic to keep team from crashing while a bug is being tracked.
2013-08-05 15:46:12 -07:00
Jeffrey Ventrella
96b443ec5d
Merge pull request #781 from machinelevel/dev4
...
Rave glove demo: Network rave data
2013-08-05 14:07:57 -07:00
Eric Johnston
a3a5c3d6d4
Rave glove demo: Network rave data
...
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
2013-08-05 13:25:05 -07:00
Andrzej Kapolka
2722cfa5ac
Fix for GCC warning. #import?
2013-08-05 11:58:09 -07:00
Stephen Birarda
45d84add05
cleanup from code review comments
2013-08-05 10:37:23 -07:00
Stephen Birarda
d51e0b59bd
change DATA_SEND_INTERVAL_MSECS to DATA_SEND_INTERVAL_USECS
2013-08-05 10:30:56 -07:00
Stephen Birarda
1f8031770b
fix quoted includes in AudioInjector.cpp
2013-08-05 10:28:12 -07:00
Stephen Birarda
553c8088dd
fix include from AudioInjector.h
2013-08-05 10:27:06 -07:00
Stephen Birarda
cddbf85172
don't include AudioInjector in Agent class
2013-08-05 10:13:25 -07:00
Stephen Birarda
0120ac2d0f
remove an extra debug
2013-08-05 10:09:00 -07:00
Stephen Birarda
8f876b91ae
changes for stub pull request of assignee work
2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a
resolve conflicts on merge with upstream master
2013-08-05 09:56:07 -07:00
ZappoMan
06e249b872
added command line options for jurisdiction settings
2013-08-02 15:38:43 -07:00
ZappoMan
db55160f9a
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 14:40:39 -07:00
atlante45
1cae9fc6c7
merge
2013-08-02 14:14:21 -07:00
ZappoMan
558fca7936
latest jurisdiction work
2013-08-02 11:12:33 -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
ZappoMan
f57d86ddb2
writing jurisdiction map configs
2013-08-02 08:56:55 -07:00
ZappoMan
81a363f053
added reading/writing to jurisdiction files
2013-08-01 22:05:13 -07:00
ZappoMan
983db5f70d
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-01 20:50:24 -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
ZappoMan
0a4fcdccb5
Merge branch 'master' of https://github.com/worklist/hifi into tile_import
...
Conflicts:
interface/src/Application.cpp
2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679
implement grid landscape import
2013-08-01 15:40:39 -07:00
atlante45
b6049c9a10
Merge branch 'master' of https://github.com/worklist/hifi into pie_menu
2013-08-01 15:28:35 -07:00
Stephen Birarda
269e040263
Qt5 find package cleanup
2013-08-01 15:27:55 -07:00
Stephen Birarda
121abc40b6
remove newline at end of shared CMakeLists
2013-08-01 15:19:54 -07:00
Stephen Birarda
2b0cfe3c67
resolve conflicts on merge with upstream master
2013-08-01 14:33:23 -07:00
ZappoMan
75fe53263c
first cut at jurisdiction maps, not working yet
2013-08-01 12:40:40 -07:00
Stephen Birarda
2fde29e04a
use a 0 public address to designate server local to DS
2013-08-01 11:53:18 -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
Stephen Birarda
9e63b78a69
Merge branch 'master' of github.com:worklist/hifi into qt5
2013-07-31 11:35:24 -07:00
Jeffrey Ventrella
1f48de891b
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 11:06:31 -07:00
Andrzej Kapolka
c787781efb
Send color and depth as separate streams (rather than one on top of the other)
...
so that we can control their bitrates separately.
2013-07-30 15:11:32 -07:00
ZappoMan
c7e3fe5ef6
Added false colorization by voxel server source
...
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
2013-07-30 11:08:48 -07:00
ZappoMan
620fe12358
support for multiple voxel servers in ping stats
2013-07-29 16:31:14 -07:00
ZappoMan
95e6fb16d0
cleanup
2013-07-29 16:17:57 -07:00
Jeffrey Ventrella
3444aa9158
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 16:16:20 -07:00
ZappoMan
69bae24d82
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-07-29 16:16:04 -07:00
Andrzej Kapolka
4ae4623315
These casts should fix the warnings on OS X.
2013-07-29 16:12:11 -07:00
ZappoMan
c5ab321bd9
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
4b07d656f4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:47:22 -07:00