Commit graph

4735 commits

Author SHA1 Message Date
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
ZappoMan
b97ef2a2c6 made voxel stats a command line option 2013-07-19 13:54:20 -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
ZappoMan
11eabf3c51 more stats 2013-07-18 15:14:11 -07:00
ZappoMan
4d1ae43085 adjust server sleep time to allow 60fps 2013-07-18 15:13:55 -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
ZappoMan
12c519cbac Merge pull request #710 from birarda/master
don't not kill NODE_TYPE_VOXEL_SERVER
2013-07-18 14:11:08 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
ZappoMan
65f550e68e Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-18 11:30:39 -07:00
Stephen Birarda
402ec86bd1 Merge pull request #709 from PhilipRosedale/gyroTweaks
Gyros don't move view for small head movements
2013-07-18 11:27:49 -07:00
ZappoMan
f781829f91 Merge pull request #708 from ZappoMan/bug_fixes
fixed crash
2013-07-18 11:25:36 -07:00
ZappoMan
c41f5e27ef fixed crash 2013-07-18 11:25:01 -07:00
Philip Rosedale
b3b8ef3347 Gyros don't move view for small head movements 2013-07-18 11:24:39 -07:00
ZappoMan
d5812c8f34 more 2013-07-18 11:21:23 -07:00
ZappoMan
b90fc9cc0d more 2013-07-18 11:21:14 -07:00
Philip Rosedale
e6cd90fa37 Merge pull request #704 from Ventrella/particles
more code cleanup
2013-07-18 11:08:18 -07:00
ZappoMan
40f87817bf first cut at scene stats 2013-07-18 11:03:46 -07:00
Stephen Birarda
5edcfaa38b Merge pull request #705 from ZappoMan/bug_fixes
cleaned up some compiler warnings and constants
2013-07-18 10:27:30 -07:00
Stephen Birarda
da25821270 Merge pull request #706 from birarda/master
switch stars file URL to non-SSL
2013-07-18 10:26:57 -07:00
Stephen Birarda
2ad99f3129 point to stars file on non-SSL for easier RV redirect 2013-07-18 10:26:08 -07:00
ZappoMan
1e421d222d cleaned up some compiler warnings and constants 2013-07-18 10:20:01 -07:00
Jeffrey Ventrella
f89b1fcd4c more clean up of particle system 2013-07-17 18:10:30 -07:00
Jeffrey Ventrella
9c2ea6e7e4 more clean up 2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
1264b3ce66 removed deprecated code 2013-07-17 17:00:18 -07:00
Jeffrey Ventrella
ea7e16660c Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b clean up of particle system 2013-07-17 16:43:34 -07:00
Jeffrey Ventrella
7ceb549416 Merge pull request #700 from machinelevel/dev4
Rave Glove: Start of hand/finger reorganization for Leap glove stability and trails
2013-07-17 16:42:54 -07:00
Eric Johnston
57c2f16894 Merge branch 'master' of https://github.com/worklist/hifi into dev4
Conflicts:
	interface/src/Hand.cpp
2013-07-17 16:42:11 -07:00
Eric Johnston
aa0cab2180 Code review issues addressed. 2013-07-17 16:09:24 -07:00
Philip Rosedale
0bc0f3ca7a Merge pull request #701 from Ventrella/particles
added life stages to particles for effects to change over time
2013-07-17 16:07:52 -07:00
Jeffrey Ventrella
4389389f17 Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:03:38 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Eric Johnston
1a4a165c8b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 15:55:20 -07:00
ZappoMan
380db8f960 Merge pull request #703 from PhilipRosedale/master
No more very slight sliding/collision due to gravity
2013-07-17 15:32:26 -07:00
Philip Rosedale
0c272b44b6 Merge pull request #702 from ZappoMan/voxel_animation
Make "Send only changed voxels" work better
2013-07-17 15:24:11 -07:00
Philip Rosedale
52d8ece38a remove old pre-movement of avatar in gravity 2013-07-17 15:03:56 -07:00
Philip Rosedale
c0ef05f69f Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 14:58:21 -07:00
Philip Rosedale
4272f4da57 Tiny sliding with gravity removed 2013-07-17 14:57:29 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Jeffrey Ventrella
d572feecf9 Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 14:51:46 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -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
b1435fba44 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-17 14:46:20 -07:00
ZappoMan
677e2580e1 make send only changed bits work better 2013-07-17 14:42:20 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Philip Rosedale
0550bc643b Merge pull request #699 from ZappoMan/voxel_animation
Fix crashing bug in voxel-server related to animation
2013-07-17 13:48:26 -07:00