Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:01:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5885 commits 25 branches 0 tags 1.1 GiB
Commit graph

1228 commits

Author SHA1 Message Date
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
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
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -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
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
Stephen Birarda
055c644736 Merge branch 'qt5' into assignee 2013-07-24 12:23:08 -07:00
Stephen Birarda
5708188180 fixes for new message handler for qt5 2013-07-24 12:22:02 -07:00
Stephen Birarda
67912cc325 merge with birarda/qt5 and resolve conflicts 2013-07-24 12:14:31 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
atlante45
fec25d374f merge 2013-07-24 10:35:57 -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
Stephen Birarda
da0049933b rename Operative to Agent 2013-07-23 20:25:21 -07:00
Stephen Birarda
7a028aa43d cmake changes for update to qt5 2013-07-23 20:23:32 -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
Stephen Birarda
8d34c707a1 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-22 14:04:09 -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
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -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
atlante45
fc3aa2da9b Fixed typo in Tags.cpp top comments 2013-07-19 17:02:45 -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
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
ZappoMan
787c448856 include elapsed encoding time in voxel stats, fixed issue with subtree removal stats 2013-07-19 12:29:54 -07:00
ZappoMan
92f7f06af9 more stats 2013-07-19 12:00:51 -07:00
ZappoMan
c2ab5c4d98 more work on voxel stats 2013-07-19 11:42:37 -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
28bf0b5147 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
ZappoMan
11eabf3c51 more stats 2013-07-18 15:14:11 -07:00
Mark Peng
fe01067473 Merge remote-tracking branch 'upstream/master' 2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
ZappoMan
7cc887a2f7 Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-18 14:14:03 -07:00
ZappoMan
3aa6af21b1 more voxel scene stats 2013-07-18 14:13:45 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
Eric Johnston
06aeba7d29 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-18 12:27:47 -07:00
ZappoMan
65f550e68e Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-18 11:30:39 -07:00
ZappoMan
c41f5e27ef fixed crash 2013-07-18 11:25:01 -07:00
ZappoMan
b90fc9cc0d more 2013-07-18 11:21:14 -07:00
ZappoMan
40f87817bf first cut at scene stats 2013-07-18 11:03:46 -07:00
ZappoMan
1e421d222d cleaned up some compiler warnings and constants 2013-07-18 10:20:01 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Mark Peng
6006b8e96b Merge remote-tracking branch 'upstream/master' 2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -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
1a4a165c8b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 15:55:20 -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
e5fcd0b274 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 14:50:51 -07:00
ZappoMan
677e2580e1 make send only changed bits work better 2013-07-17 14:42:20 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
ZappoMan
74eaf72d53 removed bogus code that related to server crash 2013-07-17 11:52:50 -07:00
ZappoMan
9e9b379d66 Fix crashing bug in voxel-server related to animation 
- added VoxelNodeDeleteHook mechanism that allows users of VoxelNode to register for delete
  notification call backs
- added call back to VoxelNodeBag to remove and nodes from bags when the nodes get deleted.
 2013-07-17 11:49:42 -07:00
Eric Johnston
f21d2a477d Rave Glove Demo: Restructuring palm and finger data structures 2013-07-17 08:29:50 -07:00
Stephen Birarda
5c279777b6 Merge pull request #694 from ZappoMan/voxel_animation 
Fixed issue of "delta sending" not sending changed/animated voxels
 2013-07-16 17:31:16 -07:00
ZappoMan
adc09cec68 some CR feedback 2013-07-16 17:21:28 -07:00
ZappoMan
bdb14fee33 cleanup 2013-07-16 16:53:15 -07:00
ZappoMan
5ee6910256 cleanup 2013-07-16 16:51:09 -07:00
ZappoMan
d54bae8e76 cleanup 2013-07-16 16:47:18 -07:00
ZappoMan
75d052b997 cleanup 2013-07-16 16:46:58 -07:00
Stephen Birarda
fa155adc8c register the shared message handler to fix voxel-server output 2013-07-16 15:50:37 -07:00
ZappoMan
fbc59de081 latest cut at dirty bit sending 2013-07-16 15:08:09 -07:00
Stephen Birarda
be32ffff77 merge branch assignee with upstream/master 2013-07-16 14:41:08 -07:00
ZappoMan
70e54f0350 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 13:52:07 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
e66c1ca552 link Qt to the shared library 2013-07-16 13:01:46 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
ZappoMan
8626c95a20 whitespace fix 2013-07-16 12:01:09 -07:00
ZappoMan
c12ab63dc2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 12:00:07 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
ZappoMan
d71400a42a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 09:36:39 -07:00
Stephen Birarda
6844490dbe merge branch assignee with upstream/master 2013-07-16 09:17:39 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -07:00
Stephen Birarda
081a44dbff only process new domain list if it comes from current DS 2013-07-15 16:05:23 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Stephen Birarda
e3d1e5db5d correct reference to mutex to lock in Node 2013-07-15 15:45:27 -07:00
Stephen Birarda
94b6bfccf6 update the private mutex node variable to standard 2013-07-15 15:17:53 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Stephen Birarda
12697c6b14 add method to clear the NodeList 2013-07-15 14:30:13 -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
078a47b006 Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-15 12:03:04 -07:00
Stephen Birarda
3fdbf41011 use limits instead of INT16_MAX for unix 2013-07-15 11:50:52 -07:00
Stephen Birarda
a851f32d3e Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-15 09:39:22 -07:00
ZappoMan
8d4f7f8a2a CR feedback 2013-07-15 09:26:19 -07:00
ZappoMan
64681fa1e4 CR feedback 2013-07-15 09:21:47 -07:00
Stephen Birarda
28ce4f55c1 have the audio injector return intensity of last frame 2013-07-15 08:56:20 -07:00
ZappoMan
133bbd81fe small spacing change 2013-07-15 01:42:21 -07:00
ZappoMan
f078d646d7 small spacing change 2013-07-15 01:41:28 -07:00
ZappoMan
f415f4081a Fixed a bug in LOD boundaries 
- changed the way we calculate whether or not to render a parent "average" voxel so
  that if any of it's most distant child would not be visible, then it's used instead
  of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
  to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
  sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
  center of the voxel, but the distance from the camera to the furthest corner relative
  to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
  tell you which vertex of the box is furthest from the camera
 2013-07-15 01:32:14 -07:00
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -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
Stephen Birarda
0235993366 reset default packet version to 0 2013-07-12 16:00:44 -07:00
Stephen Birarda
3147ac3ac4 print packet version mismatch to Log 2013-07-12 15:54:12 -07:00
Stephen Birarda
33b6ca31b0 sent correct position for injected audio, first bird index is 1 2013-07-12 15:10:22 -07:00
Stephen Birarda
8f7379839d set the position of the audio injector to match the current position of the bird 2013-07-12 14:52:16 -07:00
Stephen Birarda
2821112485 randomize bird noise injection 2013-07-12 14:47:47 -07:00
ZappoMan
85b1ce3051 tweaks to low res moving, made monochrome off by default 2013-07-12 14:11:35 -07:00
Stephen Birarda
fd64ec44a1 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-12 10:19:15 -07:00
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Stephen Birarda
7c60fd4327 Merge pull request #657 from machinelevel/dev4 
Some Leap finger fixes, but also temporarily disable Leap data sending, ...
 2013-07-11 17:11:38 -07:00
ZappoMan
323644d877 CR feedback 2013-07-11 16:09:08 -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
8774cb7ca0 fix hungergames circle bug, and improve performance of isLeafOrLOD logic 2013-07-11 15:48:17 -07:00
Stephen Birarda
4ebc381e40 update dummy operative code for change to packet type 2013-07-11 14:43:41 -07:00
Stephen Birarda
d6601ad333 resolve conflicts on merge with upstream master 2013-07-11 14:33:50 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
Stephen Birarda
4cf0b7ea66 switch back to statics for domain server check in, fix environment packets 2013-07-11 13:40:29 -07:00
ZappoMan
241bd7ce37 added support for lower LOD when moving with low res moving 2013-07-11 13:16:52 -07:00
Stephen Birarda
66a998e752 correct use of member variables for DS check in 2013-07-11 13:05:15 -07:00
Stephen Birarda
a0226b2548 avoid static variable thread issue by switching to member variables 2013-07-11 13:02:25 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
a1747725d3 sensible default for checkInPacketSize 2013-07-11 12:28:29 -07:00
Stephen Birarda
769205253f remove extra plus in AvatarData parseData 2013-07-11 12:27:48 -07:00
Stephen Birarda
544f9c2e7a type squish and magic number removal 2013-07-11 11:15:02 -07:00
Stephen Birarda
6804ab8a33 type squish in NodeList 2013-07-11 11:12:14 -07:00