Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-11 00:58:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8460 commits 74 branches 59 tags 1.2 GiB
Commit graph

4331 commits

Author SHA1 Message Date
Philip Rosedale
13be1ea825 added catch, throw, new ball sounds. Tuned ball speed for handball. 2013-12-17 22:08:52 -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
45c31cece3 Removed insertion test code. 2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 18:10:39 -08:00
ZappoMan
a443570106 Merge pull request #1397 from birarda/master 
fix for 8 channel audio output
 2013-12-17 18:04:12 -08:00
Andrzej Kapolka
f7aa464bf2 Somehow, I overwrote this value in Camera. 2013-12-17 17:21:56 -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
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stephen Birarda
c6dc93c28e fix for 8 channel output devices (HDMI capture) 2013-12-17 16:08:38 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -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
Stojce Slavkovski
4509b8dbe5 don't cut long lines 2013-12-17 23:16:16 +01: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
Stojce Slavkovski
36109c090e 720px width 2013-12-17 22:41:38 +01:00
Stojce Slavkovski
9d3cc9a5b4 70% initial width 2013-12-17 22:32:36 +01:00
Stojce Slavkovski
4566114175 Log dialog geometry 2013-12-17 22:25:26 +01:00
Stojce Slavkovski
57b4148867 Dialog position / toggle 2013-12-17 22:12:24 +01:00
Stojce Slavkovski
3e1c857a2e Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 22:11:29 +01: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
Stojce Slavkovski
841d491b2f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 20:44:51 +01:00
ZappoMan
a2f1b3e325 Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 11:35:49 -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
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
Philip Rosedale
35e7cfddba Made drumming and slaps into menu choices from ‘Hand Options’ 2013-12-17 11:20:26 -08:00
Stojce Slavkovski
365d1eea10 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Menu.h
 2013-12-17 20:15:40 +01:00
Stephen Birarda
8ece758107 spacing fix in Audio.cpp 2013-12-17 11:13:45 -08:00
Philip Rosedale
d6efcce28e Debugging render call for head/hand positions, debugging for ball injection 2013-12-17 11:08:38 -08:00
Stephen Birarda
cc5c04c82f remove doubling of right channel for injected audio 2013-12-17 10:31:32 -08:00
Stephen Birarda
a634881477 have linearResampling handle mono to stereo 48KHz conversion 2013-12-17 09:52:42 -08:00
Stephen Birarda
964558d514 add a QAudioOutput object for local loopback 2013-12-17 09:41:28 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
Philip Rosedale
d4bad3421f fix: get velocity from either hand or fingertip according to where ball is thrown from 2013-12-16 21:49:15 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
ZappoMan
e969331f5c implement catching of particles 2013-12-16 20:29:28 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Stojce Slavkovski
cc6f7ed4cc display all log data on load 2013-12-17 03:07:57 +01: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
Philip Rosedale
6ab4839c3b it’s the other guys palms you want 2013-12-16 17:14:19 -08:00
Philip Rosedale
0d76b370df only check palms if active 2013-12-16 17:01:46 -08:00
Stephen Birarda
a31f15ee79 don't blow away a channel on local injection loopback 2013-12-16 16:57:30 -08:00
Stephen Birarda
efe05adcae fix audio graphs for new audio infrastructure 2013-12-16 16:52:04 -08:00
Stephen Birarda
30b22a13ad remove an unecessary condition in Audio.cpp 2013-12-16 16:30:04 -08:00
Stephen Birarda
bb93c64d8d some initial audio stat render fixes 2013-12-16 16:21:50 -08:00
Stephen Birarda
90ea978278 fix some clipping in procedural audio 2013-12-16 16:03:46 -08:00
Stephen Birarda
e5d2647e70 fix last input loudness for mouth movement with no depth camera 2013-12-16 16:01:03 -08:00
Stephen Birarda
89beff4253 fix the scope and last input loudness 2013-12-16 15:41:58 -08:00
Stephen Birarda
f7ed8cef8f fixes for all current headsets work 2013-12-16 15:31:05 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stojce Slavkovski
5a27ded669 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Application.cpp
 2013-12-16 22:57:47 +01: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
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01:00
Stephen Birarda
2d4a8ca997 fix scope for audio output 2013-12-16 12:19:19 -08:00
Stephen Birarda
cdc6f33128 fix scope for input 2013-12-16 12:16:08 -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
ZappoMan
f8830ed9b1 cleaned up hand target code a bit 2013-12-16 12:04:16 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
Leonardo Murillo
4f1ff5b566 Using QStandardPaths for cache directory 2013-12-16 13:55:04 -06:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
Leonardo Murillo
5ac125fdd8 Typo fix 2013-12-16 13:32:12 -06:00
Leonardo Murillo
06d14436bd Printing build version on title 2013-12-16 13:29:17 -06: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
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
Philip Rosedale
893a3900d9 added palm collision sounds 2013-12-15 20:55: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
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
Philip Rosedale
a04c544c17 Merge fixes 2013-12-13 16:35:11 -08:00
Philip Rosedale
b6ae9869c2 Merge pull request #1369 from ZappoMan/particle_voxel_collisions 
New Particle Features
 2013-12-13 15:46:00 -08:00
Andrzej Kapolka
c9b734dad3 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-13 15:28:03 -08:00
Andrzej Kapolka
41fdbcb30f Fix for crash that Philip was seeing. 2013-12-13 15:25:03 -08:00
Philip Rosedale
1b1fdd3dc4 add menu option for sixense filter 2013-12-13 15:21:32 -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
Andrzej Kapolka
a10aca59f3 Visitor cleanup. 2013-12-12 18:29:23 -08:00
Philip Rosedale
caed884583 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 18:17:23 -08:00
Philip Rosedale
63243b2e14 merge fix 2013-12-12 17:58:37 -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
Stephen Birarda
25b7065298 changes for broken test 2013-12-12 17:19:54 -08:00
ZappoMan
21bdbe3128 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-12 15:59:34 -08:00
ZappoMan
0560b16133 only render local toy ball sphere if there is an actual toy ball 2013-12-12 15:47:51 -08:00
ZappoMan
08591481a6 added shadows to particles 2013-12-12 15:44:06 -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
Philip Rosedale
b87d5fe98c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 15:36:13 -08:00
Philip Rosedale
99f6ce2733 merge fix 2013-12-12 15:36:06 -08:00
Philip Rosedale
d9573f6d6c Merge pull request #1362 from ZappoMan/edit_particles 
Implement Prune for Particle Tree to fix long run time stability.
 2013-12-12 15:34:35 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
Stephen Birarda
acc90bf153 Merge pull request #1361 from murillodigital/master 
We can let qt find things on its own, which will let us add frameworks/p...
 2013-12-12 13:55:42 -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
Leonardo Murillo
939a9bf5c4 We can let qt find things on its own, which will let us add frameworks/plugins inside the bundle 2013-12-12 12:59:34 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
Philip Rosedale
305a75c2b7 don’t render toy ball if hand controller trigger not pressed at all 2013-12-12 12:33:04 -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
a80acc6806 slight toy ball cleanup 2013-12-12 11:25:31 -08:00
ZappoMan
28c5d5b7bf removed unused variable 2013-12-12 11:01:37 -08:00
ZappoMan
e1b3b9d967 fixed indent, added some damping debugging 2013-12-12 10:59:28 -08:00
Stephen Birarda
d5aadf6598 repair linear resampling for same number of channels 2013-12-12 10:48:42 -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
Philip Rosedale
2d72bea27a cleanup test toy ball throwing code 2013-12-11 17:35:02 -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
e27aa11216 remove a debug line 2013-12-11 12:03:14 -08:00
Stephen Birarda
af2fa15f55 initial work for change to 48KHz 2013-12-11 12:02:08 -08:00
ZappoMan
dd85f145d2 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-11 10:43:33 -08:00
Andrzej Kapolka
8ba2cf9a8b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-11 10:30:30 -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
132b313c9c remove voxel glow on local add 2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
ZappoMan
8bbdae0e64 fix extra debugging 2013-12-10 15:50:39 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
cde7eb1f30 removed some dead code 2013-12-10 15:36:49 -08:00
ZappoMan
a8fff62832 removed some dead code 2013-12-10 15:36:07 -08:00
Philip Rosedale
0f0ee07f8c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-10 14:06:11 -08:00
Stephen Birarda
9db662afaa Merge branch 'master' of github.com:worklist/hifi into qt-for-portaudio 2013-12-10 11:59:05 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
Andrzej Kapolka
c423205709 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-09 16:00:34 -08:00
Andrzej Kapolka
f268797bde Merge branch 'master' of https://github.com/worklist/hifi 2013-12-09 16:00:00 -08:00
Andrzej Kapolka
569425df88 Merge pull request #1348 from PhilipRosedale/narcissus 
Improved full screen mirror view to allow leaning
 2013-12-09 15:42:06 -08:00
Andrzej Kapolka
9641ca1e66 More efficient (though perhaps overkill) blendshape mapping. 2013-12-09 15:37:09 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
Andrzej Kapolka
a431268815 Somewhat inefficient take on allowing blendshapes coefficients to apply 
multiple blendshapes.
 2013-12-09 15:21:20 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
Andrzej Kapolka
9a3c44ce7d Enable alpha testing for models. 2013-12-09 14:49:37 -08:00
ZappoMan
d0944b0278 make particles spheres for now 2013-12-09 14:06:45 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
Philip Rosedale
9616268da7 Improved full screen mirror view to allow leaning 2013-12-09 13:02:18 -08:00
Andrzej Kapolka
2381b2bbaf Get rid of initial glow. 2013-12-09 12:30:14 -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
c36e04c435 This should fix the erroneous persistence on startup. 2013-12-09 11:21:32 -08:00
Andrzej Kapolka
85f7995700 Don't apply ambient occlusion to avatars (just voxels). 2013-12-09 11:00:35 -08:00
Philip Rosedale
3bd8c53115 Fix to get other avatar’s model data 2013-12-07 11:36:51 -08:00
Andrzej Kapolka
039a2410b7 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-06 17:51:24 -08:00
Andrzej Kapolka
4c2c8675e7 Merge pull request #1343 from PhilipRosedale/remove_avatar_balls 
Fix to jerky avatar movement, fix for rotation broken
 2013-12-06 17:51:11 -08:00
Philip Rosedale
4edb7decdf removed printf 2013-12-06 17:47:01 -08:00
Philip Rosedale
9195d60b71 Fix to jerky avatar movement, fix for rotation broken 2013-12-06 17:45:28 -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
91d6ef633d Merge pull request #1340 from PhilipRosedale/remove_avatar_balls 
Remove avatar balls
 2013-12-06 17:11:53 -08:00
Andrzej Kapolka
65c21105ae Merge pull request #1339 from PhilipRosedale/remove_avatar_touch 
Removed _avatarTouch class
 2013-12-06 17:11:41 -08:00
Philip Rosedale
66c5a10020 Fix chat message height 2013-12-06 16:47:13 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Stephen Birarda
bcdc066a98 don't set _lastInputLoudness if input is muted 2013-12-06 13:26:40 -08:00
Stephen Birarda
098010e099 don't crash if there is no output 2013-12-06 13:22:07 -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
Andrzej Kapolka
16cfeff00d Ignore further up the hierarchy. 2013-12-05 16:37:40 -08:00
Andrzej Kapolka
02cd97deb1 Adjust palm collision size, use last free index when ignoring. 2013-12-05 16:28:33 -08:00
Philip Rosedale
a1027b7dda reverse Hz change because I’ve got some other stuff in there 2013-12-05 16:03:06 -08:00
Philip Rosedale
006472cb24 tweaked RGB->Hz for drum to make piano 2013-12-05 15:56:55 -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
Philip Rosedale
e9e6f97084 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:26:14 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Andrzej Kapolka
d238d3c35a Called addPenetrations wrong. 2013-12-05 14:49:30 -08:00
Stephen Birarda
5e73e803e9 fixes for procedural audio input 2013-12-05 14:49:28 -08:00
Andrzej Kapolka
9be30acf82 Render the palm collision proxies. 2013-12-05 14:40:24 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Andrzej Kapolka
3c167da8a4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:26:37 -08:00
Andrzej Kapolka
d2cb6f0243 Test hand against other avatars. 2013-12-05 14:19:13 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix 
for meshes with only one joint influence.
 2013-12-05 14:00:38 -08:00
Philip Rosedale
a9bd6718ff Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 13:41:13 -08:00
Philip Rosedale
a7dacec63d Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me. 2013-12-05 13:36:00 -08:00
Stephen Birarda
487209e270 fix bandwidth meter for audio 2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Andrzej Kapolka
1edfc90e5e Missed a scale multiplier. 2013-12-05 12:02:48 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Philip Rosedale
0c4b66ef54 Merge pull request #1312 from ZappoMan/more_on_particle_server 
First cut at basic Particle Server
 2013-12-05 11:29:01 -08:00
Andrzej Kapolka
0ea0887f66 Add a scale factor to bone radii. 2013-12-05 11:21:56 -08:00
Andrzej Kapolka
9b3560d414 Skip the hands' parents as well as the hands themselves. 2013-12-05 11:10:22 -08:00
Stephen Birarda
6765ce2f1f some spacing cleanup in Audio 2013-12-05 10:23:06 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -08:00
Philip Rosedale
8d518f85fe Turn off Sixense (kalman?) filtering, cleanup code 2013-12-04 17:55:32 -08:00
Stephen Birarda
0e3cb11863 use invokeMethod for Audio reset 2013-12-04 16:58:21 -08:00
Stephen Birarda
ab1cd7bd2c fix red/green display in audio debug rendering 2013-12-04 16:24:14 -08:00
Philip Rosedale
c1f96ab6b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-04 15:49:30 -08:00
Philip Rosedale
0c32f94116 Better drums 2013-12-04 15:48:41 -08:00
Stephen Birarda
d722e0bf6a repairs to Audio class after merge with upstream master 2013-12-04 14:24:07 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -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
188d52c06e get client working in refactored mode 2013-12-04 10:05:37 -08:00
Philip Rosedale
2dfbaf605e Stars a bit dimmer, have horizon 2013-12-03 23:01:13 -08:00
ZappoMan
4e18eaa6c5 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:48 -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
b04d48a7b8 Longer drum sticks 2013-12-03 17:19:00 -08:00
Philip Rosedale
423b2e8e0f Highlight voxel being touched 2013-12-03 16:52:38 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -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
Andrzej Kapolka
905320a963 That didn't really help. What did help was simply ignoring the wrist 
constraints.
 2013-12-03 11:30:47 -08:00
Stephen Birarda
3301796997 change const HifiSockAddr in DataServerClient to remove error 2013-12-03 11:20:12 -08:00
Andrzej Kapolka
817946bed5 Attempting to rotate longitudinally at elbow, rather than wrist. 2013-12-03 11:05:38 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Andrzej Kapolka
2633223f4e Compute the bone radii from the vertices. It's more error-prone than I 
expected, but it more or less works.
 2013-12-02 18:07:29 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -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
ZappoMan
44f92fb47c Merge pull request #1297 from PhilipRosedale/master 
Voxel editing with hands, flying by pointing hands
 2013-12-02 12:46:04 -08:00
ZappoMan
858268b990 Merge pull request #1296 from stojce/19418 
Code review for #19418
 2013-12-02 12:44:06 -08:00
Andrzej Kapolka
b4466e3e34 Make sure we can still compile if we don't have the Linux Oculus dependencies. 2013-12-02 12:24:42 -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
Andrzej Kapolka
635eb7c52d Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-12-02 09:55:27 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
2456c26207 changed function name so less confusing 2013-12-01 20:46:42 -08:00
Philip Rosedale
ea850368de First working voxel insertion at fingertip 2013-12-01 20:16:14 -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
stojce
681a72746e Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-11-28 07:45:06 +01:00
Andrzej Kapolka
e84f5a59aa Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-27 16:17:30 -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
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
d8259f67f0 Re-request skeleton/face URLs on login. 2013-11-27 13:09:52 -08:00
Andrzej Kapolka
b294b328dd Only render ball avatars when "avatars as balls" is checked. 2013-11-27 12:56:31 -08:00
ZappoMan
21bf10b9bf added expandable server details to voxel stats dialog 2013-11-27 11:53:28 -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
e389c5daa1 adding additional per server voxel stats 2013-11-27 08:25:24 -08:00
ZappoMan
3a16a4935d added additional flight time debugging 2013-11-26 22:43:49 -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
Andrzej Kapolka
7874a2aa85 Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-26 19:14:21 -08:00
Andrzej Kapolka
f6b3a6ceca The other part of the Oculus ambient occlusion fix. 2013-11-26 17:53:31 -08:00
ZappoMan
2ce9937126 major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:27:08 -08:00
Andrzej Kapolka
fa5f8b093c Screw it; just use the standard mouse hiding. 2013-11-26 15:07:40 -08:00
Andrzej Kapolka
bdba05785e Mouse pointer fix fix. 2013-11-26 15:00:49 -08:00
Andrzej Kapolka
600b05fcc9 Oculus mouse pointer fix. 2013-11-26 14:50:43 -08:00
Andrzej Kapolka
a557dc3ae2 Sign fix. 2013-11-26 14:31:19 -08:00
Andrzej Kapolka
b17f6a1c66 Spacing fix. 2013-11-26 14:16:52 -08:00
Andrzej Kapolka
39414bbd86 Farther down the path of demagicking the numbers and using the actual info 
reported by LibOVR>
 2013-11-26 13:56:34 -08:00
Andrzej Kapolka
c5406c47a6 Moved Oculus code out of Application, started on using StereoConfig to get 
actual values to replace the magic numbers.
 2013-11-26 11:59:06 -08:00
Philip Rosedale
534c5105b0 echo the right one 2013-11-26 11:46:11 -08:00
Philip Rosedale
f27039853c Merge branch 'master' of https://github.com/worklist/hifi 2013-11-26 11:25:26 -08:00
Philip Rosedale
09ca2a45db Add local audio monitor option, tweak turning with head 2013-11-26 11:25:06 -08:00
Stephen Birarda
ec909a6c13 add a mutex lock and unlock on Menu instance creation 2013-11-26 10:58:02 -06:00
stojce
901216f286 Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-11-26 07:14:58 +01:00
Andrzej Kapolka
1aaf6f2620 Mac library with RTTI enabled, prevent crash on startup when there's no 
Oculus.
 2013-11-25 18:36:23 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Philip Rosedale
2cb701bce6 Added adjustment for hydra position to user (it matters) 2013-11-25 17:28:33 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
63a82af449 allow client to set voxels MaxPPS in Preferences 2013-11-25 15:13:31 -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
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
e2f5069e6a more VoxelPacket compression tuning 2013-11-24 14:41:50 -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
57831b377f tweaks and cleanup 2013-11-23 14:07:09 -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
Philip Rosedale
a1ba36d543 Lean drive works with keys and no up/down 2013-11-22 20:08:44 -08:00