Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 08:17:54 +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
Brad Hefta-Gaub
ac97f129d3 change interface since its confusing windows compiler 2014-01-10 20:49:08 -08:00
Brad Hefta-Gaub
124250b2c2 changed fmax to std::max 2014-01-10 20:38:13 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Brad Hefta-Gaub
44893b0a8c hackery to get windows to build 2014-01-10 19:58:10 -08:00
Brad Hefta-Gaub
a5c5a35c12 removed sys/time.h for Systime.h on windows 2014-01-10 19:54:20 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Brad Hefta-Gaub
2c30b8b5b4 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-10 17:36:53 -08:00
Brad Hefta-Gaub
f6d775e3e1 remove timeval and unistd.h 2014-01-10 17:27:23 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Andrzej Kapolka
f90bb3a0fd Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	libraries/metavoxels/src/MetavoxelData.cpp
 2014-01-10 16:29:59 -08:00
Andrew Meadows
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -08:00
Andrzej Kapolka
de0472cfc1 Merge pull request #1498 from birarda/remove-curl 
remove curl dependency by removing starfield loading from URL
 2014-01-10 16:02:17 -08:00
Andrew Meadows
8799ad133e merge again after some competing pull requests were processed 2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Philip Rosedale
ea0f7c1e05 Merge pull request #1475 from ZappoMan/local_voxel_cache 
Local voxel cache & some bug fixes
 2014-01-10 15:53:47 -08:00
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00
Andrew Meadows
c4c0c389ae Temporarily disabling DAMPING and non-unity ELASTICITY during particle-particle collisions 2014-01-10 11:42:23 -08:00
Andrew Meadows
71e5de8420 Adding Particle::_mass and correct elastic collisions between particles 2014-01-10 11:37:01 -08:00
Philip Rosedale
f0460bac5f Merge pull request #1492 from stojce/19466 
Code Review for Job #19466
 2014-01-10 11:19:43 -08:00
Brad Hefta-Gaub
e908121bcd fix bug in Octree server that wasn't properly surpressing duplicate packets 2014-01-09 19:13:17 -08:00
Brad Hefta-Gaub
5787d3d9e9 more cast coding standard fixes 2014-01-09 19:00:57 -08:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
03794f7218 make casts float match coding standard 2014-01-09 10:07:51 -08:00
Andrzej Kapolka
69ce7db072 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-08 11:58:41 -08:00
Andrzej Kapolka
3504cc6d5a More work on deltas. 2014-01-06 12:01:14 -08:00
Andrzej Kapolka
31443e4f4e Working on delta encoding. 2014-01-05 22:07:38 -08:00
Stephen Birarda
32be6199fd fix reference to downloaded byte array samples 2014-01-05 17:41:33 -08:00
Stephen Birarda
a06f18328c add downsampling so RAW audio for sound assumed to be 48Khz 2014-01-05 17:40:37 -08:00
Stephen Birarda
5b272bfd6a fix random UUID creation for injected audio 2014-01-05 17:09:57 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Brad Hefta-Gaub
7ce774da70 change particle update to support full script engine 2014-01-05 10:39:58 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Brad Hefta-Gaub
3efc1ea410 Merge branch 'master' of git://github.com/worklist/hifi into bugfixes 2014-01-04 01:47:49 -08:00
Brad Hefta-Gaub
207ea30c6d fix delete problem with voxels 2014-01-04 01:10:48 -08:00
Andrzej Kapolka
060e6e32d8 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-03 18:11:23 -08:00
Brad Hefta-Gaub
e97e211bc4 quiet down some debugging 2014-01-03 18:10:30 -08:00
Andrzej Kapolka
e37203d833 The overloaded function should be const, true. 2014-01-03 17:59:15 -08:00
Andrzej Kapolka
1bd069c4e2 Removed unused variable. 2014-01-03 17:56:55 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00
Andrzej Kapolka
c2af9becba Ray/capsule intersection test. 2014-01-03 17:48:58 -08:00
Brad Hefta-Gaub
5144a91d1f cleanup spacing and comments 2014-01-03 17:28:06 -08:00
Brad Hefta-Gaub
9aa3d31876 cleanup spacing 2014-01-03 17:24:55 -08:00
Brad Hefta-Gaub
b72dfbd3a4 fix tabs 2014-01-03 17:20:54 -08:00
Brad Hefta-Gaub
8abd76c055 fixed issue with voxels not always showing up when changed between clients 2014-01-03 17:10:35 -08:00
Andrew Meadows
6f21592ebd pulling latest upstream changes to local repo 2014-01-03 16:51:21 -08:00
Andrew Meadows
8f94cec746 Fixing build: missed some instances of VOXEL_ELASTICITY. 
Also enforcing C++ style casts.
 2014-01-03 16:49:13 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Andrew Meadows
d8e48f8cba Pulling latest worklist/hifi into local repo 2014-01-03 16:36:52 -08:00
Andrew Meadows
1882c9e43b Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-03 16:26:17 -08:00
Andrew Meadows
bce39e916a Pulling latest worklist/hifi into local repo 2014-01-03 16:10:21 -08:00
Andrew Meadows
74392a8835 Moved ParticleTreeUpdateArgs into ParticleTreeElement.h 2014-01-03 16:03:42 -08:00
Andrew Meadows
ea88f00ce5 Name changes, formatting, and comments for readability. 2014-01-03 16:01:31 -08:00
Philip Rosedale
83101d3d11 reduce elasticity to be less than 1 2014-01-03 15:31:16 -08:00
Stephen Birarda
decaf2e245 add property for volume in AudioInjectorOptions 2014-01-03 14:17:12 -08:00
stojce
594a20e248 Merge branch 'master' of https://github.com/worklist/hifi into 19466 2014-01-03 22:53:30 +01:00
Andrzej Kapolka
3f367c0c45 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-03 13:28:40 -08:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Andrzej Kapolka
67ed045869 More work on delta streaming. 2014-01-03 11:10:21 -08:00
Stephen Birarda
a4f2735739 fix a glaring omission - actually move the audioInjector to QThread 2014-01-03 10:39:09 -08:00
Stephen Birarda
a61e214c9a simplify loopback trigger for injected audio 2014-01-03 10:16:59 -08:00
ZappoMan
ec1f08b140 Merge pull request #1443 from birarda/master 
open up more audio to JS
 2014-01-03 10:12:44 -08:00
Stephen Birarda
6f60a22c07 fix copyright years 2014-01-03 09:50:13 -08:00
Stephen Birarda
2a422b84f2 fix broken build by removing ASI as friend to AI 2014-01-03 09:49:32 -08:00
Stephen Birarda
339ef93fc4 remove no longer needed QDebug includes 2014-01-03 09:41:01 -08:00
Stephen Birarda
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Andrzej Kapolka
a08afae319 More work on client/server communication. 2014-01-02 17:40:43 -08:00
Andrzej Kapolka
25b2353df1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-02 17:35:39 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
ZappoMan
1a67d946d8 more warnings fixes 2014-01-02 16:33:58 -08:00
ZappoMan
ce81b95eaa more warnings fixes 2014-01-02 16:21:58 -08:00
ZappoMan
696afd7875 more warnings fixes 2014-01-02 16:18:49 -08:00
Andrew Meadows
930d9957f3 Changed argument names in collision methods for improved readability. 2014-01-02 16:09:41 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Andrzej Kapolka
5df899c620 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-02 15:57:04 -08:00
ZappoMan
366209668d Merge pull request #1431 from stojce/19463 
Code Review for Job #19463
 2014-01-02 15:38:15 -08:00
Stephen Birarda
594bd58774 add AudioScriptingInterface to expose playSound to JS 2014-01-02 15:35:28 -08:00
Philip Rosedale
8f48ca0e95 Merge pull request #1437 from ey6es/master 
Restore bent arm behavior when pointing (lost in ball removal).  Fix compile warning.
 2014-01-02 15:26:33 -08:00
Philip Rosedale
c47ace6d7f Merge pull request #1436 from birarda/master 
changes to audio injector for overlapped sounds in preparation for JS
 2014-01-02 15:24:47 -08:00
Stephen Birarda
845176bbc6 expose Sound to ScriptEngine 2014-01-02 15:14:28 -08:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
Stephen Birarda
8cc4a33ad3 repair AudioInjector threading 2014-01-02 13:35:56 -08:00
Andrzej Kapolka
7178147535 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 13:23:39 -08:00
Andrzej Kapolka
6c27569e9b Fix arm bending, compile warning. 2014-01-02 13:23:15 -08:00
Andrew Meadows
f78b7cda6f Merge pull request 1435 into https://github.com/worklist/hifi 'master' 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-02 13:01:45 -08:00
Stephen Birarda
3a45fb8533 cleanup new API for sound injection 2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570 leverage new AudioInjector API for throw and catch sounds 2014-01-02 12:17:18 -08:00
Stojce Slavkovski
31fa8ad1fb Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 21:06:28 +01:00
Stephen Birarda
3123b83d0b audio API changes to allow multiple injections of single sound 2014-01-02 11:53:33 -08:00
Stephen Birarda
591876eaf3 notify for node kill on NodeList clear 2014-01-02 10:01:47 -08:00
Andrew Meadows
934b0f619b Particles now collide with avatars, but avatars don't react yet. 2014-01-02 09:36:21 -08:00
Andrew Meadows
d520adba98 exposed getVelocity() and findSpherePenetration() in Avatar base class 2014-01-02 09:31:24 -08:00
Andrew Meadows
5843c745cb minor formatting and code standard enforcement to Particle.* 2014-01-02 09:30:14 -08:00
Andrzej Kapolka
72b002ddc4 Allow streaming QVariantLists. 2013-12-31 17:30:41 -08:00
Andrzej Kapolka
839e5e085c Attempting to silence unused variable warning on Xcode. 2013-12-31 16:56:18 -08:00
Andrzej Kapolka
a8bb890187 Fixed a couple of Xcode warnings. 2013-12-31 16:27:54 -08:00
Andrzej Kapolka
d7d8cdce44 init -> commonInit, streaming tweaks. 2013-12-31 16:19:03 -08:00
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