Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7808 commits 29 branches 0 tags 1.1 GiB
Commit graph

7808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
ZappoMan
6af9ae0e82 Merge pull request #1372 from PhilipRosedale/grabStepping 
Grab and move yourself around with button 4
 2013-12-14 11:36:46 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -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
931ac38bb2 Merge pull request #1370 from ey6es/master 
Fix for crash that Philip was seeing.
 2013-12-13 15:25:42 -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
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
Philip Rosedale
09258cb17b Merge branch 'master' of https://github.com/worklist/hifi 2013-12-13 10:38:21 -08:00
Philip Rosedale
d5c6612ec7 Merge pull request #1366 from ZappoMan/particle_voxel_collisions 
particle to particle collisions
 2013-12-13 10:37:27 -08:00
ZappoMan
7a4f9cf722 particle to particle collisions 2013-12-13 10:23:37 -08:00
Philip Rosedale
caed884583 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 18:17:23 -08:00
Philip Rosedale
90832313e2 Merge pull request #1365 from ZappoMan/particle_voxel_collisions 
Particle voxel collisions
 2013-12-12 18:13:17 -08:00
ZappoMan
d5c6c60836 fix crash in collisions 2013-12-12 18:04:27 -08:00
Philip Rosedale
63243b2e14 merge fix 2013-12-12 17:58:37 -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
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
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
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
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
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