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

2328 commits

Author SHA1 Message Date
Andrzej Kapolka
a210d57c03 Add back this spammy log message that I disabled. 2013-12-31 15:40:01 -08:00
Andrzej Kapolka
effd00a405 Basic "meta type compiler" for streaming, streaming fixes and test. 2013-12-31 15:30:15 -08:00
Andrzej Kapolka
f9043c3cb9 Working on streaming types. 2013-12-31 11:34:10 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
Andrew Meadows
14b88fd141 Changing meaning of "elasticy" in applyHardCollision() to range in [0,1] instead of [1,2] 
Also enforcing C++ style casts as per coding standard.
 2013-12-31 09:49:46 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
Andrew Meadows
6e661e05e5 minor cleanup and enforcement of coding standards 2013-12-31 09:30:01 -08:00
Andrzej Kapolka
ecd9c9f41d Communication between client and server. 2013-12-30 18:28:30 -08:00
ZappoMan
5057517b78 pass scriptable particle on collisions 2013-12-30 16:35:58 -08:00
ZappoMan
cd11545613 change to setScript() since it does more than update 2013-12-30 15:55:46 -08:00
ZappoMan
8e6f924c73 add access to Voxels and Particles inside of collision scripts 2013-12-30 15:48:50 -08:00
ZappoMan
f4b28041fa first cut at running scripts on particle collisions 2013-12-30 14:59:00 -08:00
Andrzej Kapolka
f70670d0a9 Working on sessions. 2013-12-30 13:39:08 -08:00
Andrzej Kapolka
97e7340ba6 Working on server sessions. 2013-12-28 18:27:37 -08:00
Andrzej Kapolka
b986d91217 One more piece of the datagram sequencing puzzle. 2013-12-26 18:26:29 -08:00
Andrzej Kapolka
6357bd0019 More work on datagram sequencing. 2013-12-26 00:27:47 -08:00
Andrzej Kapolka
51d5a37613 More work on datagram streaming. 2013-12-24 18:19:35 -08:00
Andrzej Kapolka
71ce244a0a More work on datagram sequencing. 2013-12-23 13:15:14 -08:00
Stojce Slavkovski
840d1a33ef Reveal log file 
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
 2013-12-23 21:23:47 +01:00
Andrzej Kapolka
7ab1a4b849 More work on datagrams. 2013-12-20 17:54:20 -08:00
Andrzej Kapolka
775f32b94c First pass at datagram sequencer. 2013-12-20 14:33:11 -08:00
Philip Rosedale
f4a28850cf Merge remote-tracking branch 'upstream/master' 2013-12-19 23:05:37 -08:00
Andrzej Kapolka
11e729c3cc Starting on delta encoding. 2013-12-19 18:03:49 -08:00
Philip Rosedale
e29b366b7e Merge pull request #1415 from birarda/injected-audio 
hook throw and catch sounds to Hand ball tests
 2013-12-19 17:37:17 -08:00
Andrzej Kapolka
f2ebd76362 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-19 16:54:13 -08:00
Andrzej Kapolka
b7f0057fe9 More streaming work. 2013-12-19 16:53:38 -08:00
Philip Rosedale
a6c2334f49 Merge pull request #1414 from birarda/injected-audio 
C++ API for Audio Injection of samples from URL
 2013-12-19 16:41:55 -08:00
Stephen Birarda
87e5579e52 reinstate delete for starved but started audio ring buffers 2013-12-19 15:51:14 -08:00
Stephen Birarda
0446aeb4d3 loopback injected sound effects to the node by default 2013-12-19 15:44:47 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
Stephen Birarda
8681e66ed3 default to max volume, add a bool flag for loopback 2013-12-19 15:30:33 -08:00
Stephen Birarda
534010347b add a volume setter to the AudioInjector 2013-12-19 15:28:10 -08:00
Stephen Birarda
7ed609633a complete the test injector stub 2013-12-19 15:23:31 -08:00
ZappoMan
90a2fd31ef fixed spacing 2013-12-19 15:17:29 -08:00
Stephen Birarda
0eb22fdc60 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 15:17:10 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
ZappoMan
98e511a71c removed extra debug messages 2013-12-19 15:16:43 -08:00
Philip Rosedale
6a941a024d Merge remote-tracking branch 'upstream/master' 2013-12-19 15:01:58 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
Andrzej Kapolka
de175e97b6 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-19 13:52:20 -08:00
Andrzej Kapolka
d19f32fefa Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	assignment-client/CMakeLists.txt
 2013-12-19 13:52:10 -08:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08:00
Stephen Birarda
4c15c54535 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 12:42:06 -08:00
Stephen Birarda
b035f74f94 fix for build busters with changed AbstractAudioInterface 2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65 add AudioInjector class to pull samples from URL and inject 2013-12-19 12:28:37 -08:00
Philip Rosedale
c0f3ec5b6a merge fix 2013-12-19 10:55:00 -08:00
ZappoMan
864fc10d3a debug cleanup and change to Particle::update() to handle clock skew slightly better 2013-12-19 10:39:42 -08:00
Stephen Birarda
9c39bcba4c Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 10:23:33 -08:00
ZappoMan
26366e9fe7 cleanup debug 2013-12-19 10:05:20 -08:00
Philip Rosedale
c287e37691 Reverted key mapping change since Andrzej fixed the underlying problem. 2013-12-19 10:02:43 -08:00
ZappoMan
b48161ae26 cleanup debug 2013-12-19 09:59:36 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
d430558ea9 fix expectedBytes() mismatch between edit packets and normal packets 2013-12-18 21:08:34 -08:00
Philip Rosedale
9980065659 Merge pull request #1406 from ZappoMan/particle_blinky_bug 
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
 2013-12-18 20:02:38 -08:00
ZappoMan
95df772707 make really old 30 seconds not 300 2013-12-18 19:36:34 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
6e2c0032b5 removed dead code 2013-12-18 19:22:15 -08:00
ZappoMan
c6933239d9 fixed comment 2013-12-18 19:21:30 -08:00
ZappoMan
920ef65ccb removed _lastedEdited changed to editedAgo 2013-12-18 19:01:42 -08:00
ZappoMan
c68a226094 removing of created timestamp from wire format, still supports lifetime 2013-12-18 17:43:48 -08:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
Andrzej Kapolka
130ec7488a More work on streaming. 2013-12-18 17:10:53 -08:00
ZappoMan
8b1c39a471 more lastUpdated-ectomy 2013-12-18 17:03:53 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
Philip Rosedale
9786d1b21d Merge pull request #1404 from PhilipRosedale/master 
Fix to see other people animate hydra hands
 2013-12-18 16:43:43 -08:00
Philip Rosedale
17f35ce97b Fix to see other people animate hydra hands 2013-12-18 16:37:15 -08:00
ZappoMan
41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	interface/src/Application.h
 2013-12-18 15:50:03 -08:00
Andrzej Kapolka
9affd60e04 Stubbed out metavoxel server. 2013-12-18 13:04:27 -08:00
ZappoMan
8549894ff8 add support for palm and tip spatial data to JS interface 2013-12-18 09:53:47 -08:00
ZappoMan
efdef1ad35 added all buttons triggers and joysticks 2013-12-18 09:33:48 -08:00
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
Philip Rosedale
b3bb33e48c Merge remote-tracking branch 'upstream/master' 2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
ZappoMan
a59650beac Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 2013-12-17 19:50:39 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
Stephen Birarda
589dde5139 more stubbing of AudioInjectionManager 2013-12-17 16:07:18 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
ZappoMan
4b3fd2166d make getNumPalms() const 2013-12-17 15:28:29 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -08:00
Stephen Birarda
db8661f152 add a stubbed AudioInjectionManager 2013-12-17 14:13:23 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Andrzej Kapolka
d535d3b115 More progress on getting values in and out of scripts. 2013-12-17 13:44:56 -08:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
ZappoMan
77d29153b6 Merge pull request #1390 from PhilipRosedale/slaps 
throwing from fingertips, less gravity, lighter target rendering
 2013-12-17 13:02:05 -08:00
Philip Rosedale
ae1cc99f3d throwing from fingertips, less gravity, lighter target rendering 2013-12-17 12:48:59 -08:00
ZappoMan
b724dcf0ba Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 12:41:23 -08:00
ZappoMan
11a5ff2eb8 added edited times to particles and don't change local tree if particle has not been edited 2013-12-17 12:39:35 -08:00
Philip Rosedale
1c46b6d482 Merge pull request #1388 from birarda/master 
fix sample delay pull with negative index
 2013-12-17 11:49:37 -08:00
Stephen Birarda
ff0d31857a correct sample delay pulls with negative index 2013-12-17 11:47:50 -08:00
ZappoMan
4852aca86c Merge pull request #1386 from PhilipRosedale/slaps 
Hand games are now menu options, hydra hands in fixed L/R orientation, added slaps game
 2013-12-17 11:34:43 -08:00
ZappoMan
95639c7ce7 first cut, not working yet 2013-12-17 10:58:36 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
ZappoMan
524a847aa5 fix spelling error 2013-12-17 08:39:23 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
Andrzej Kapolka
07ed688a8a A few more script bits. 2013-12-16 18:13:29 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Philip Rosedale
4bf4ba22bd Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 18:00:02 -08:00
Philip Rosedale
03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio 
move from 44.1 to 48 on audio
 2013-12-16 17:58:41 -08:00
Andrzej Kapolka
6385a73379 Working on scripty bits. 2013-12-16 17:53:53 -08:00
Philip Rosedale
be27f36a7e Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 17:37:22 -08:00
Stephen Birarda
bb93c64d8d some initial audio stat render fixes 2013-12-16 16:21:50 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
ZappoMan
8f3997da19 use findSpherePenetration() which fixes target zone detection of particles 2013-12-16 15:03:45 -08:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
Andrzej Kapolka
0ca2320711 Working on guide/script support. 2013-12-16 13:44:24 -08:00
ZappoMan
540c2a77f9 fixed file banner 2013-12-16 12:13:36 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
Andrzej Kapolka
5458e7a555 Working on polymorphic attributes, average -> merge. 2013-12-16 12:05:16 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
af52be7860 tweaks to script engine shutdown behavior 2013-12-16 09:32:01 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
Philip Rosedale
ce986c367e palms detect collision 2013-12-15 19:53:24 -08:00
ZappoMan
a220804fb0 properly connect signals and slots to shut down script properly, fix null termination in script file load 2013-12-14 14:23:33 -08:00
ZappoMan
dacaade9ed first cut at client scripts working 2013-12-14 13:54:25 -08:00
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -08:00
Andrzej Kapolka
41c7b9ce29 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-13 15:00:05 -08:00
Andrzej Kapolka
50e4691568 Pointer attributes, cleanup. 2013-12-13 14:33:18 -08:00
ZappoMan
aaf4ff7dfc added lifetime to particles 2013-12-13 14:30:29 -08:00
ZappoMan
38d928fa4e make balls for both hands, allow you to change color, remove red wire simulation 2013-12-13 11:58:12 -08:00
ZappoMan
7a4f9cf722 particle to particle collisions 2013-12-13 10:23:37 -08:00
Andrzej Kapolka
a10aca59f3 Visitor cleanup. 2013-12-12 18:29:23 -08:00
ZappoMan
d5c6c60836 fix crash in collisions 2013-12-12 18:04:27 -08:00
ZappoMan
51f07cad88 removed some debug 2013-12-12 17:56:56 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Philip Rosedale
1c4f02d568 Merge pull request #1363 from ZappoMan/edit_particles 
Add shadows and only render local toy ball if one has been created
 2013-12-12 17:51:54 -08:00
Andrzej Kapolka
652248bf2b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 16:56:15 -08:00
Andrzej Kapolka
17b2ee6984 Fix for obnoxious C++0x warning in GCC. 2013-12-12 16:46:17 -08:00
Andrzej Kapolka
c003a55c37 Diffuse lighting. 2013-12-12 16:19:05 -08:00
ZappoMan
c9da89cde7 fix compiler warning 2013-12-12 15:50:25 -08:00
Andrzej Kapolka
4a7efa5ef9 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:48 -08:00
Andrzej Kapolka
652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
 2013-12-12 15:36:37 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -08:00
ZappoMan
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
ZappoMan
cd830efdd4 fixed typo 2013-12-12 12:26:12 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -08:00
ZappoMan
bc80862825 removed some debugging 2013-12-12 11:07:13 -08:00
ZappoMan
e1b3b9d967 fixed indent, added some damping debugging 2013-12-12 10:59:28 -08:00
ZappoMan
5ec8de1bf3 have ParticleEditHandle update local tree as well 2013-12-12 10:41:55 -08:00
ZappoMan
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26:55 -08:00
Stephen Birarda
b06af3cd6c copy all passed samples to AudioRingBuffer 2013-12-12 10:15:43 -08:00
ZappoMan
82b5c53551 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-11 18:01:45 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
Andrzej Kapolka
dce9599201 More progress on generic attributes; color attributes. 2013-12-11 16:13:36 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
Andrzej Kapolka
79a2e409a8 Basic voxel visitation with multiple attributes. 2013-12-11 13:52:52 -08:00
Philip Rosedale
bad5d82ceb Merge branch 'master' of https://github.com/worklist/hifi into XBOX_controller 2013-12-11 12:40:06 -08:00
Stephen Birarda
af2fa15f55 initial work for change to 48KHz 2013-12-11 12:02:08 -08:00
ZappoMan
1225e20fad fix flashy particles caused by server deleting octree elements while particles still exist 2013-12-11 09:54:30 -08:00
Andrzej Kapolka
88eeb17f28 More progress on metavoxels with generic attributes. 2013-12-10 17:53:11 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
ZappoMan
55c3e81801 added new file 2013-12-10 15:51:57 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
ddb2ba128f removed some dead code 2013-12-10 15:37:50 -08:00
ZappoMan
542019a491 add script to the particle wire and disk format 2013-12-10 15:28:59 -08:00
ZappoMan
d65479406c only render particle elements that are in view 2013-12-10 14:22:52 -08:00
ZappoMan
ba9a113720 added gravity, damping, and shouldDie behavior to particles 2013-12-10 12:53:42 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
ZappoMan
99e3a58a68 more work on update 2013-12-09 16:33:12 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Andrzej Kapolka
e0138257f4 Trivial additions related to attributes. 2013-12-09 10:49:35 -08:00
Andrzej Kapolka
913b14893d Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-06 17:24:04 -08:00
Andrzej Kapolka
29870877a8 More work on metavoxel bits. 2013-12-06 17:12:29 -08:00
ZappoMan
4df2f2189d moved voxels scripting interface 2013-12-06 16:07:59 -08:00
ZappoMan
3d2a00b732 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 
Conflicts:
	animation-server/src/main.cpp
 2013-12-06 16:03:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
ZappoMan
ebb0a792a3 particle scripting 2013-12-06 15:57:11 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Andrzej Kapolka
dfbf896304 Some work on bitstreaming. 2013-12-06 10:27:09 -08:00
Andrzej Kapolka
01b7af0b0a Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-06 10:21:49 -08:00
ZappoMan
bb004e53c3 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-06 10:19:08 -08:00
ZappoMan
426c89b639 First cut at new ParticleEditPacketSender class 2013-12-05 18:00:56 -08:00
Andrzej Kapolka
e97099a9b2 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-05 17:53:21 -08:00
Stephen Birarda
04b13149b5 remove unneeded include in NodeList 2013-12-05 17:39:37 -08:00
Stephen Birarda
c2e11e8d8c more NodeList cleanup 2013-12-05 17:39:02 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
ZappoMan
c067f8ad11 moved most of VoxelEditPacketSender into new generic base class OctreeEditPacketSender 2013-12-05 16:27:35 -08:00
ZappoMan
072ced0185 first cut at PACKET_TYPE_PARTICLE_ADD implementation 2013-12-05 15:38:36 -08:00
Andrzej Kapolka
9ecef89c6c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:36:56 -08:00
Andrzej Kapolka
ecff3a0542 Basic sphere/capsule-cone penetration test. 2013-12-05 15:36:34 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Andrzej Kapolka
3c167da8a4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:26:37 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
ZappoMan
a9d16862c8 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-05 12:09:48 -08:00
ZappoMan
86ffbc3d33 first pass at adding actual particles to the ParticleTree 2013-12-05 12:07:52 -08:00
Stephen Birarda
baae2a3e41 fix reference to NodeList in OctreeServer destructor 2013-12-05 11:44:11 -08:00
Stephen Birarda
5b6c2531a4 use correct cleanup calls in OctreeServer destructor 2013-12-05 11:43:48 -08:00
Stephen Birarda
aac01ee70d rename in OctreeServer destructor debug 2013-12-05 11:42:34 -08:00
Stephen Birarda
5e429250d3 merge with upstream/master 2013-12-05 11:41:28 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
Stephen Birarda
7613f3d00c fix VoxelServer to be correctly event-driven, closes #1314 2013-12-05 10:08:41 -08:00
ZappoMan
9654f025b4 fix build buster 2013-12-04 21:33:59 -08:00
ZappoMan
2930ae0f9b attempt to fix build buster 2013-12-04 21:29:25 -08:00
ZappoMan
33b3cbaa43 fix cmake 2013-12-04 21:18:40 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
3ca7dc7196 added CMakeLists.txt 2013-12-04 20:19:49 -08:00
ZappoMan
eb66064a18 tweak 2013-12-04 20:04:26 -08:00
ZappoMan
1b1f9cbf3b actually added the octree-server base class library 2013-12-04 19:46:42 -08:00
ZappoMan
d9e60f502c clean up server name 2013-12-04 19:46:03 -08:00
ZappoMan
b3e9d369e4 removed all dead VoxelServer code, now mostly handled by OctreeServer 2013-12-04 19:20:11 -08:00
ZappoMan
fad3a5957d removing dead code 2013-12-04 17:50:42 -08:00
ZappoMan
5ff12ab8d1 first cut at getting voxel server based on octree server 2013-12-04 17:41:52 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
ZappoMan
2119f0da7d Merge branch 'master' of https://github.com/worklist/hifi into more_on_particle_server 
Conflicts:
	libraries/particle-server/CMakeLists.txt
	libraries/particle-server/src/ParticleServer.h
	libraries/particles/src/ParticleTree.cpp
 2013-12-04 13:27:44 -08:00
ZappoMan
37466251d4 added some scripts, latest particle server work 2013-12-04 13:25:50 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -08:00
ZappoMan
c24e32ce06 basic ParticleTree and ParticleTreeElement classes 2013-12-04 12:32:46 -08:00
ZappoMan
bc5317f20b removed not yet ready for prime time libraries 2013-12-04 12:09:05 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master 
Voxel drumming, search function to find leaf voxel containing a point
 2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread 
Move Hide/Show local voxels to a dedicated thread
 2013-12-04 11:27:14 -08:00
ZappoMan
2cb46c3447 added DEADBEEF support to debug class 2013-12-04 10:37:10 -08:00
ZappoMan
188d52c06e get client working in refactored mode 2013-12-04 10:05:37 -08:00
ZappoMan
d7ae023492 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:40 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Andrzej Kapolka
70ca1106b1 Working on testing the Leap/Hydra hands against the avatar body. 2013-12-03 17:28:36 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Stephen Birarda
da580ecbaf fix inclusion of QThread in Assignment 2013-12-03 12:31:39 -08:00
Stephen Birarda
8fbd1e4cfb repairs after merge with upstream master 2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Stephen Birarda
3d14fba7ab have AssignmentFactory return a ThreadedAssignment 2013-12-03 12:14:24 -08:00
Stephen Birarda
bdf9f9eb22 remove extra debugging line 2013-12-03 12:11:31 -08:00
Stephen Birarda
5143c68b91 fix packet sending from VoxelScriptingInterface 2013-12-03 12:09:47 -08:00
Stephen Birarda
6f7e16dc22 hook VS to new QCA infrastructure 2013-12-03 11:11:08 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
c3b6a7b24c setup subclass for threaded assignments 2013-12-03 10:22:13 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -08:00
Stephen Birarda
1e279cf99c hook AudioMixer to new event-driven assignment setup 2013-12-02 16:34:38 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Andrzej Kapolka
91aa9918ee Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-02 12:54:01 -08:00
Andrzej Kapolka
4033baa5ca Starting work on "metavoxels." 2013-12-02 12:15:43 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
a9139b05e8 Drive with trigger pointing 2013-11-29 20:46:16 -08:00
Philip Rosedale
65ec91ec13 Add hand thrusters 2013-11-29 17:49:35 -08:00
Philip Rosedale
abca79ea3e Add button detection for hydra controller to palmData 2013-11-29 16:20:43 -08:00
Philip Rosedale
9680941500 Add palm velocity 2013-11-29 14:50:18 -08:00
Philip Rosedale
14129cd86d Merge pull request #1295 from ZappoMan/compressed_packets 
Major improvements to Voxel Packet "packing" and compression
 2013-11-29 10:06:36 -08:00
ZappoMan
a3b69c1e75 bumb version number of PACKET_TYPE_VOXEL_QUERY 2013-11-27 15:55:49 -08:00
ZappoMan
0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 
Conflicts:
	interface/src/Menu.cpp
	interface/src/Menu.h
 2013-11-27 15:44:51 -08:00
ZappoMan
f527ed6e7f removed debug 2013-11-27 15:35:00 -08:00
ZappoMan
040ad1853e properly handle sequence numbers to not skip when supressing duplicate packets 2013-11-27 15:33:48 -08:00
ZappoMan
7f9d0849bd added more client side voxel stats including lost packets, out of order packets, and average flight time 2013-11-27 13:37:47 -08:00
Andrzej Kapolka
ac714773d3 Initialize chat circling flag. 2013-11-27 13:13:36 -08:00
Andrzej Kapolka
cabd6ccbad Advertise to others whether we have chat circling enabled, only include people 
with it enabled when doing the computations.
 2013-11-27 11:47:23 -08:00
ZappoMan
17e979dc9f improved client side stats, don't suppress initial stats message in server since it includes jurisdiction 2013-11-27 10:20:49 -08:00
ZappoMan
7cc5339702 cleanup comments and coding standard 2013-11-27 07:40:23 -08:00
ZappoMan
77636678a8 moved debug into if 2013-11-26 22:27:48 -08:00
ZappoMan
dac211cebd pack more compressed sections into wire packets if there is room 2013-11-26 22:18:24 -08:00
ZappoMan
b7ee2ea2db add section size to compressed packets to allow packing of multiple sections 2013-11-26 19:47:14 -08:00
ZappoMan
77590b5b87 cleanup debug, readd fix to not recurse subtrees when node is colored 2013-11-26 19:23:21 -08:00
ZappoMan
491512fbce major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:26:54 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
ZappoMan
70213630e1 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-25 13:38:22 -08:00
ZappoMan
66ebaae7c8 added debugging/logging of sleep times removed bail early loging in send thread since it wasn't needed and reduced sending potential in high PPS case 2013-11-25 13:34:53 -08:00
ZappoMan
78d39ed948 added timing details for better debugging and results measurement 2013-11-25 10:41:07 -08:00
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
Philip Rosedale
62c882b788 Rounding numbers 2013-11-25 09:44:40 -08:00
ZappoMan
78a8f2d0cc added comments 2013-11-25 08:56:37 -08:00
ZappoMan
17f5530893 fixed wasted bitmasks bug where we would include colors and extra layers 2013-11-25 01:42:19 -08:00
ZappoMan
8bb2bd2ecf get voxel packet statistics to work and add them to server status page 2013-11-25 00:26:37 -08:00
ZappoMan
8d8d73a940 start of statistics, convert level key into class 2013-11-24 20:49:47 -08:00
ZappoMan
ed80895eb3 fix issue where we sometimes don't completely fill a packet mid scene 2013-11-24 20:29:54 -08:00
ZappoMan
0cd269632e fix bug where some parts of scene weren't sent, turned out it was in the octal code not fitting voxels getting ignored 2013-11-24 17:49:10 -08:00
ZappoMan
32e770d2b7 tweaks to debugging 2013-11-24 16:02:05 -08:00
ZappoMan
3ef7c1a732 moved const definitions to better file 2013-11-24 15:28:50 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
94584d4ead disable voxel packet compression for now 2013-11-24 15:01:37 -08:00
ZappoMan
e2f5069e6a more VoxelPacket compression tuning 2013-11-24 14:41:50 -08:00
ZappoMan
57633f8b92 fixed comment 2013-11-24 00:05:06 -08:00
ZappoMan
ba26e5c3e3 add back non-compression mode to VoxelPacket and tweaks to how compression works to make it more efficient 2013-11-24 00:02:51 -08:00
ZappoMan
c28027b7ca better compressed packets with fewer calls to checkCompress 2013-11-23 22:30:15 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code" 
This reverts commit 99c427c97d.
 2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
cb43b0dea1 cleaned up some comments and code 2013-11-23 15:10:03 -08:00
ZappoMan
b0cc6494da cleaned up some comments and code 2013-11-23 14:58:23 -08:00
ZappoMan
7ff7b13c6b cleaned up some comments 2013-11-23 14:52:34 -08:00
ZappoMan
a9f336e34e cleaned up packet sending accounting and debug output to be less verbose unless requested 2013-11-23 14:49:53 -08:00
ZappoMan
a9642a3e15 tweaks and cleanup 2013-11-23 14:21:14 -08:00
ZappoMan
51547f6f8d tweaks and cleanup 2013-11-23 14:20:12 -08:00
ZappoMan
13e6a187bd tweaks and cleanup 2013-11-23 14:19:18 -08:00
ZappoMan
0ed31b5b9f tweaks and cleanup 2013-11-23 14:14:00 -08:00
ZappoMan
29522d1e50 tweaks and cleanup 2013-11-23 14:07:01 -08:00
ZappoMan
ae5d5324c1 added some comments to VoxelPacket 2013-11-23 14:02:46 -08:00
ZappoMan
4c0569fc60 removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs 2013-11-23 13:55:21 -08:00
ZappoMan
11d7cb64c2 switch back to qDebug 2013-11-23 13:42:11 -08:00
ZappoMan
b1a0ed6480 remove old buffer style approach to encoding 2013-11-23 13:36:38 -08:00
ZappoMan
661152956a clean up comments 2013-11-23 13:23:03 -08:00
ZappoMan
00b3451729 properly handle update fails when encoding 2013-11-23 13:11:06 -08:00
ZappoMan
b1adf82d4b cleaned up const semantics in streaming voxel packets, fixed double reset bug 2013-11-23 13:05:37 -08:00
ZappoMan
1d88399476 cleaning up semantics of VoxelPacket 2013-11-22 20:39:11 -08:00
ZappoMan
0cd0012aab cleaning up semantics of VoxelPacket 2013-11-22 20:08:58 -08:00
ZappoMan
9d8f0b82df make append() private 2013-11-22 17:59:47 -08:00
ZappoMan
69eee541db removed some old debug, standardize callers of VoxelPacket to use semantic entry points instead of direct access to bytes 2013-11-22 17:53:25 -08:00
ZappoMan
01488ed332 don't send any voxel stats till we've succesfully encoded at least one voxel 2013-11-22 17:23:12 -08:00
ZappoMan
80cfba465c move sending of packet to immediately following scene end to get better synch of stats packets, also fix duplicate suppression bug 2013-11-22 17:00:39 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
ZappoMan
e60c482086 supress empty packets in handlePacketSend(), DRY up code in deepestLevelVoxelDistributor() 2013-11-22 12:59:52 -08:00
ZappoMan
a426f97e52 removing some debug output 2013-11-22 10:04:59 -08:00
ZappoMan
48dad5ab86 fix bug in packet filling related to octcodes for new trees not fitting 2013-11-22 09:49:50 -08:00
ZappoMan
4fc9d5409c voxel sender now uses maximum bytes in packets with VoxelPacket class 2013-11-21 23:46:12 -08:00
ZappoMan
c25199c80a removed some debugging 2013-11-21 21:27:37 -08:00
ZappoMan
b9429eeb1e working version of writeToSVO that uses VoxelPacket and fills it to limit before writing 2013-11-21 21:18:31 -08:00
ZappoMan
5a9baf2779 moved some debug code 2013-11-21 20:36:09 -08:00
ZappoMan
e8c3670cdd added packet.reset() in writeToSVO() 2013-11-21 20:18:19 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
9784288b63 added some debugging 2013-11-21 13:51:40 -08:00
ZappoMan
e2e9c29824 implement old vs new side by side encoding to test for correctness 2013-11-21 13:26:28 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
ZappoMan
e959be82f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-21 11:18:47 -08:00
Andrzej Kapolka
cd4ef08dae Merge pull request #1272 from ZappoMan/stats_crash_bug_fix 
fix to crash in client side VoxelSceneStats crash
 2013-11-21 10:59:57 -08:00
ZappoMan
cb56ad2e2f fix a couple of bugs in display of voxel stats on server status 2013-11-21 10:43:40 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
ZappoMan
8c90e96740 addeding VoxelPacket class for encoding bit streams 2013-11-19 15:36:21 -08:00
ZappoMan
c2cb6df61c first cut at compresses voxel packets 2013-11-18 09:46:32 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
ZappoMan
1d272c333a fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle 2013-11-13 21:31:34 -08:00
ZappoMan
865d2d19f1 added some debugging to see why the servers are spinning out constantly checking for dirty tree 2013-11-13 17:29:01 -08:00
ZappoMan
3c17c70541 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-13 17:15:41 -08:00
ZappoMan
496f3a1380 removed some noise, and made persist thread less sleepy 2013-11-13 16:37:08 -08:00
ZappoMan
1a4ffcec93 removing more noise and dont sleep if we failed to lock the node 2013-11-13 16:24:01 -08:00
ZappoMan
02df4a82b5 removing more noise 2013-11-13 16:04:55 -08:00
ZappoMan
ba9cd6fdd4 removing more noise 2013-11-13 16:04:21 -08:00
ZappoMan
5b09248ba9 remove noisy debugging 2013-11-13 15:15:54 -08:00
ZappoMan
3d20152c36 use node->trylock() in VoxelSendThread() to handle shutdown race condition 2013-11-13 15:11:43 -08:00
ZappoMan
4640d337b7 added more noisy debugging 2013-11-13 13:47:39 -08:00
ZappoMan
4ac6338b8b added Noisy debugging to voxel server main loop 2013-11-13 12:54:34 -08:00
ZappoMan
e32bfc38f5 change voxelServersExist() to make sure that all existing voxel servers have a legitimate jurisdiction 2013-11-13 01:06:17 -08:00
ZappoMan
2b604864d6 fix bug where VoxelEditPacketSender oversends to unknown jurisdictions 2013-11-12 00:35:55 -08:00
ZappoMan
c625d79fd2 removed comment 2013-11-11 17:27:29 -08:00
ZappoMan
59cfa89f1b fixed CR feedback 2013-11-11 17:26:04 -08:00
ZappoMan
0eace966e9 added support to also show inbound packet stats per sender 2013-11-11 17:20:31 -08:00
ZappoMan
af8438b098 add stats to voxel server to show average voxel edit packet statistics 2013-11-11 16:31:36 -08:00
ZappoMan
d9ed6443db style cleanup, correct some comments 2013-11-10 14:06:44 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
eb73de6b67 added a couple more JS APIs and removed some debug code 2013-11-10 12:33:54 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
2e8cb63abb add more voxel edit transit time debugging 2013-11-08 10:47:47 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
ZappoMan
b0a4ffb11c fix comments line breaks 2013-11-08 02:27:34 -08:00
ZappoMan
3da6062639 fix comment 2013-11-08 02:26:23 -08:00
ZappoMan
a708486834 fix comment 2013-11-08 02:25:51 -08:00
ZappoMan
20c66386f8 fix comment 2013-11-08 02:24:46 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
f1704e9d79 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 18:53:06 -08:00
ZappoMan
cad51885e8 removed some hackery 2013-11-07 17:21:45 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
afaa448f92 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 15:52:29 -08:00
ZappoMan
fffbdb1db0 reverted code 2013-11-07 15:52:19 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
ZappoMan
385865c6c1 remove comment 2013-11-07 15:25:21 -08:00
ZappoMan
ce41477f46 fix VS crash on domain server restart 2013-11-07 15:23:23 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -08:00
ZappoMan
77ba88e56d removed dead comment 2013-11-07 13:06:57 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
Stephen Birarda
72b2309dc0 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-11-07 12:43:58 -08:00
Stephen Birarda
24c88512e2 only attempt to deleteLater on linkedData if it exists 2013-11-07 12:41:29 -08:00
Stephen Birarda
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00
ZappoMan
100439784d got rid of redundant getTree() 2013-11-06 17:37:37 -08:00
ZappoMan
76ad42015a added debugging to JurisdictionMap for server crashes 2013-11-06 16:41:08 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
c3914e648f lock our node while using it to prevent crash on domain shutdown 2013-11-06 13:52:31 -08:00
ZappoMan
5cd0ecde18 small tweak in debug out 2013-11-06 12:10:19 -08:00
ZappoMan
0da28fd44c debbugging for node shutdown in VS 2013-11-06 11:20:40 -08:00
ZappoMan
987ce16b10 more potential fixes for voxel server crashes 2013-11-06 01:55:04 -08:00
ZappoMan
1b18b53cfd removed force_crash by default 2013-11-06 00:09:37 -08:00