Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:52:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4952 commits 25 branches 0 tags 1.1 GiB
Commit graph

1004 commits

Author SHA1 Message Date
Stephen Birarda
2fde29e04a use a 0 public address to designate server local to DS 2013-08-01 11:53:18 -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
Jeffrey Ventrella
3444aa9158 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 16:16:20 -07:00
Andrzej Kapolka
4ae4623315 These casts should fix the warnings on OS X. 2013-07-29 16:12:11 -07:00
Jeffrey Ventrella
4b07d656f4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:47:22 -07:00
ZappoMan
1a73485e36 Improved VoxelNode delete callback based on CR feedback 
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
 2013-07-29 15:30:30 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
ZappoMan
e20f163e0a changed some defines to consts 2013-07-29 13:34:58 -07:00
ZappoMan
d6428a8145 removed unneeded cast 2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-29 13:02:14 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Jeffrey Ventrella
cecb908dc1 cleanup 2013-07-26 12:53:40 -07:00
Jeffrey Ventrella
13207c3b4c Merge remote-tracking branch 'upstream/master' into particles 2013-07-26 12:39:25 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
ZappoMan
0c95dc4adf Fixed voxel trails from animations 
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
 2013-07-26 11:12:48 -07:00
ZappoMan
79648ce656 fix bug with dragonfly leaving trailing bits 2013-07-25 15:22:23 -07:00
ZappoMan
919f2a4a93 fix voxel-server crash 2013-07-25 12:56:00 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Stephen Birarda
5708188180 fixes for new message handler for qt5 2013-07-24 12:22:02 -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
Jeffrey Ventrella
f85690c1c4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-23 20:46:34 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
ZappoMan
a12ebc63c3 made listen mode a typedef 2013-07-23 18:26:10 -07:00
ZappoMan
d5e62b0f5a CR feedback 2013-07-22 14:18:16 -07:00
ZappoMan
f4749aa916 CR feedback 2013-07-22 14:17:18 -07:00
ZappoMan
60750d1d80 CR feedback 2013-07-22 14:13:10 -07:00
ZappoMan
8186145d35 CR feedback 2013-07-22 14:09:29 -07:00
ZappoMan
70516c8cb4 CR feedback 2013-07-22 14:08:48 -07:00
Jeffrey Ventrella
fdebe166ba fixed it so both leap hands produce particles 2013-07-22 14:07:51 -07:00
ZappoMan
d3c46cce8f CR feedback 2013-07-22 14:01:47 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
ZappoMan
dc19a1c5cf Merge branch 'master' of mini:hifi 2013-07-21 16:25:14 -07:00
ZappoMan
76952a9d13 testing 2013-07-21 16:24:23 -07:00
ZappoMan
70c6ed040c added averages for bits per voxel and elapsed time 2013-07-21 07:21:23 -07:00
ZappoMan
de7cd4db03 added total voxel count to stats 2013-07-20 15:49:04 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
Eric Johnston
6ceb48127a Small fix when no Leap connected. 2013-07-19 19:56:05 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775 Rave glove: stabilization of Leap hands 2013-07-19 19:47:07 -07:00
ZappoMan
4e8ce1b193 tweaks to stats dialog 2013-07-19 18:15:06 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00