Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 20:54:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7787 commits 71 branches 56 tags 1.2 GiB
Commit graph

7787 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
5cdd36b95a Merge pull request #1364 from ey6es/master 
Fix for obnoxious C++0x warning in GCC.
 2013-12-12 16:47:16 -08:00
Andrzej Kapolka
17b2ee6984 Fix for obnoxious C++0x warning in GCC. 2013-12-12 16:46:17 -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
c9da89cde7 fix compiler warning 2013-12-12 15:50:25 -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
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
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -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
Philip Rosedale
8682b32a66 Merge pull request #1359 from ZappoMan/edit_particles 
add findClosestParticle()
 2013-12-12 13:00:59 -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
ZappoMan
cd830efdd4 fixed typo 2013-12-12 12:26:12 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -08:00
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
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
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
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
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
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
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
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
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