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

8984 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
e13bc71f39 Adding avatar info back into ParticleCollisionSystem ctor arguments. 2014-01-28 14:43:36 -08:00
Andrew Meadows
714dbf8493 Moving MY_AVATAR_KEY back into AvatarManager.cpp 2014-01-28 14:37:32 -08:00
Andrew Meadows
f972bfd024 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/avatar/AvatarManager.cpp
 2014-01-28 14:30:59 -08:00
Andrew Meadows
1cc992a7f8 import --> include 2014-01-28 14:18:21 -08:00
Andrew Meadows
167acb8873 Adding avatars back into ParticleCollisionSystem. 
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
 2014-01-28 14:16:34 -08:00
Andrew Meadows
ade02c0259 Bug fix: update ALL avatars in the AvatarManager (rather than just one). 
Reviewed with Birarda and pushed directly to upstream.
 2014-01-28 09:32:58 -08:00
Andrew Meadows
c4f429dcd0 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-27 18:05:39 -08:00
Andrew Meadows
2b5675b077 Fix issue #1684 : particles collide against avatars again. 
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
 2014-01-27 18:01:53 -08:00
Andrew Meadows
2fa3fc523d Fix for AABox::touches(otherBox) 2014-01-27 17:51:05 -08:00
ZappoMan
f2cfb1634b Merge pull request #1717 from stojce/19483 
2nd Code Review for Job #19483
 2014-01-27 14:23:39 -08:00
ZappoMan
8de7bfe55e Merge pull request #1715 from stojce/19491 
Code Review for Job #19491
 2014-01-27 14:22:11 -08:00
stojce
3fde4078c5 ignore double-click on disabled items 2014-01-27 21:48:26 +01:00
stojce
4d1992485f removed unused QSound reference 2014-01-27 21:17:17 +01:00
stojce
c82a8a152e Set JPG quality to 100 2014-01-27 20:59:46 +01:00
stojce
40ea552981 filename format changes 
- new wav file
- changed filename format
 2014-01-27 20:35:06 +01:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
Andrew Meadows
31a2e467f4 more efficient ParticleTree::getParticles() and adding ParticleTree::getParticlesForUpdate() 2014-01-26 16:14:11 -08:00
Andrew Meadows
daf11692d8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-26 15:19:52 -08:00
stojce
dcdbf729c9 importing file w/ double click 2014-01-26 17:57:21 +01:00
stojce
ef39d019ac Voxel import fix 2014-01-26 16:28:21 +01:00
ZappoMan
c17476c985 Merge pull request #1683 from kordero/19487 
Code Review for Job #19487
 2014-01-25 12:25:44 -08:00
ZappoMan
8ef3e7c44f Merge pull request #1675 from stojce/19483 
Code Review for Job #19483
 2014-01-25 12:21:23 -08:00
Lucas Crisman
28d6171be5 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-25 11:24:51 -03:00
Lucas Crisman
f56e4b0820 build error fix 2014-01-25 11:24:33 -03:00
stojce
b8db07be5f CR fixes 2014-01-25 12:08:20 +01:00
stojce
f4698065ce Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-25 07:39:17 +01:00
AndrewMeadows
d19cb6da36 Merge pull request #1694 from ZappoMan/dont_edit_bad_particles 
New particles JS features
 2014-01-24 17:23:30 -08:00
Andrew Meadows
2f02ee0b31 Moving applyHardCollision to the Particle class. Adding daming and elasticity to CollisionInfo. 2014-01-24 16:29:44 -08:00
ZappoMan
afb7ab07da added new example of particle bird 2014-01-24 15:35:21 -08:00
ZappoMan
67ef3282cb handle preventing edits to non-existant particles 2014-01-24 15:30:40 -08:00
Andrew Meadows
5cc2b029cf Adding ParticleTree::findParticles(box, QVector<Particle*>) method 2014-01-24 14:01:34 -08:00
Andrew Meadows
998b772be4 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 14:01:03 -08:00
Andrew Meadows
f6a49c96a7 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 13:59:35 -08:00
Andrew Meadows
52511b2baf Adding AABox::touches(box) 2014-01-24 13:59:03 -08:00
ZappoMan
2720b98d57 fix comment 2014-01-24 13:00:54 -08:00
ZappoMan
c5dd94f0cf add example 2014-01-24 13:00:01 -08:00
ZappoMan
0b871c80c3 added Particles.getParticleProperties() to JS 2014-01-24 12:56:36 -08:00
ZappoMan
bcaafb25f0 added findParticles() to JS api 2014-01-24 12:36:06 -08:00
AndrewMeadows
fd34d2cee3 Merge pull request #1687 from ZappoMan/particles_switch_domains 
clear particles when switching domains
 2014-01-24 11:18:00 -08:00
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Lucas Crisman
3b767fff04 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-24 15:13:27 -03:00
Lucas Crisman
759448bef7 resolving reverted change on last merge 2014-01-24 15:13:14 -03:00
ZappoMan
dbde1a29fe Merge pull request #1682 from ZappoMan/master 
Fix Windows Build
 2014-01-24 10:07:50 -08:00
Lucas Crisman
cece4add27 Merge branch 'master' of git://github.com/worklist/hifi into 19487 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-01-24 15:01:24 -03:00
Brad Hefta-Gaub
0c891ddfa8 Merge branch 'master' of https://github.com/ZappoMan/hifi 2014-01-24 09:55:52 -08:00
Brad Hefta-Gaub
177f09aa4d Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:55:38 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Brad Hefta-Gaub
7c507b44eb Merge branch 'master' of git://github.com/worklist/hifi 2014-01-24 09:53:19 -08:00
Brad Hefta-Gaub
692358bf6e fix windows builds 2014-01-24 09:51:17 -08:00
Brad Hefta-Gaub
54faeae13e fix windows builds 2014-01-24 09:51:06 -08:00