ZappoMan
|
d3197ef8f9
|
fix crash, and remove gravity while in hand
|
2013-12-12 13:54:36 -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
|
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 |
|
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 |
|
ZappoMan
|
82b5c53551
|
Merge branch 'master' of https://github.com/worklist/hifi into edit_particles
|
2013-12-11 18:01:45 -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 |
|
ZappoMan
|
03c72134cb
|
first cut at creatorTokenIDs for creating particles
|
2013-12-11 15:38: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 |
|
ZappoMan
|
dd85f145d2
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_details
|
2013-12-11 10:43:33 -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
|
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 |
|
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 |
|
ZappoMan
|
7a828794be
|
more work with particles added javascript support to particle update
|
2013-12-10 11:27:18 -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
|
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 |
|
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 |
|