Philip Rosedale
|
2d30bf0d93
|
Merge pull request #1358 from ZappoMan/edit_particles
slight toy ball cleanup
|
2013-12-12 11:27:51 -08:00 |
|
ZappoMan
|
a80acc6806
|
slight toy ball cleanup
|
2013-12-12 11:25:31 -08:00 |
|
Philip Rosedale
|
c8c6165356
|
Merge pull request #1357 from ZappoMan/edit_particles
Edit Particles
|
2013-12-12 11:23:40 -08:00 |
|
ZappoMan
|
bc80862825
|
removed some debugging
|
2013-12-12 11:07:13 -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
|
0386c82076
|
Merge pull request #1356 from PhilipRosedale/XBOX_controller
Throw balls at each other, Xbox-style flying
|
2013-12-11 17:56:29 -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
|
6fab49b1b7
|
change ring buffer to interleaved for stereo
|
2013-12-11 12:02:22 -08:00 |
|
Stephen Birarda
|
af2fa15f55
|
initial work for change to 48KHz
|
2013-12-11 12:02:08 -08:00 |
|
Philip Rosedale
|
ee2fda1412
|
Merge pull request #1353 from ZappoMan/particle_details
First real pass at Particles
|
2013-12-11 11:02:33 -08:00 |
|
Andrzej Kapolka
|
eab9986316
|
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
|
2013-12-11 10:53:37 -08:00 |
|
Andrzej Kapolka
|
5ac393ccb9
|
Merge pull request #1355 from ey6es/master
Tiny fix for CMake caching on Linux/LibOVR.
|
2013-12-11 10:51:08 -08:00 |
|
Andrzej Kapolka
|
0a56f54675
|
Tiny fix for CMake caching on Linux/LibOVR.
|
2013-12-11 10:48:17 -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 |
|
ZappoMan
|
8934d73de3
|
Merge pull request #1351 from ey6es/master
Fix for segfault on Linux exit; enable alpha testing for models; allow coefficients to apply multiple blendshapes.
|
2013-12-10 18:34:02 -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
|
55c3e81801
|
added new file
|
2013-12-10 15:51:57 -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
|
ddb2ba128f
|
removed some dead code
|
2013-12-10 15:37:50 -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 |
|
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 |
|
Philip Rosedale
|
0f0ee07f8c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-10 14:06:11 -08:00 |
|
ZappoMan
|
ba9a113720
|
added gravity, damping, and shouldDie behavior to particles
|
2013-12-10 12:53:42 -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 |
|
ZappoMan
|
99e3a58a68
|
more work on update
|
2013-12-09 16:33:12 -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 |
|