Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 03:47:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

287 commits

Author SHA1 Message Date
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Andrew Meadows
5e2b8bb2c3 connect SIGNAL to SIGNAL to avoid forwarding slot 2014-04-04 10:43:06 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
ZappoMan
c90d4a9514 fix failed lock causing particle collisions to not work 2014-03-04 15:07:30 -08:00
Stephen Birarda
a48185053e repair a typo in particles link to widgets lib 2014-03-04 12:42:08 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
455ef15754 fix warning about signed/unsigned comparison 2014-03-04 12:05:00 -08:00
Andrew Meadows
c8149f95a3 fix warning for unused variable (we forgot to use it) 2014-03-04 11:06:23 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
ZappoMan
d01090afbc reversing some changes 2014-03-03 17:13:06 -08:00
ZappoMan
493648b56e reversing some changes 2014-03-03 17:06:46 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
ZappoMan
98bf85173a more octree locking cleanup 2014-03-03 13:54:07 -08:00
ZappoMan
fd47602945 various particle crash and deadlock fixes 2014-03-03 12:49:34 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
Andrew Meadows
335141049c Cleaning up collision check API's and re-enabling collisions with particles. 2014-02-14 16:33:19 -08:00
Andrew Meadows
be1aaee359 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 09:05:08 -08:00
Andrew Meadows
7a8186f1da Adding ModelCollisionInfo struct to get more info about collisions against avatars. 
Had to disable some collisions.  Will go back and make them work again soon.
 2014-02-07 10:48:30 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Andrew Meadows
082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-06 14:37:19 -08:00
ZappoMan
76bc4564ad push to force rebuild 2014-02-05 10:24:00 -08:00
ZappoMan
53e7cd7797 fix particle init 2014-02-05 10:16:43 -08:00
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -08:00
Andrew Meadows
466a43c77f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-03 10:47:00 -08:00
ZappoMan
289be04f0f use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface 2014-01-31 17:12:50 -08:00
ZappoMan
5b825ecd5b fix isKnownID 2014-01-31 15:46:19 -08:00
ZappoMan
19f218f37c fix typo 2014-01-31 15:45:31 -08:00
ZappoMan
9798538ea5 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-31 14:10:45 -08:00
AndrewMeadows
bed63513a9 Merge pull request #1745 from ZappoMan/scripting_work 
support for global collision callbacks in JS
 2014-01-31 10:42:44 -08:00
Stephen Birarda
dc70c74733 fix a double push in added particle response 2014-01-31 09:30:26 -08:00
ZappoMan
3b17550d92 make sure to flush edit queue on script shutdown 2014-01-30 16:36:26 -08:00
Andrew Meadows
f3f1539111 Splitting avatar collision check in two: vs hands and vs skeleton. 2014-01-30 09:28:21 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
Andrew Meadows
f093a571c5 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/shared/src/CollisionInfo.h
 2014-01-29 14:12:22 -08:00
Stephen Birarda
7d8b7a79ac fix Particle update signature 2014-01-29 12:30:20 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6 really get controller key, mouse, etc scripting working 2014-01-28 19:47:45 -08:00
Andrew Meadows
e13bc71f39 Adding avatar info back into ParticleCollisionSystem ctor arguments. 2014-01-28 14:43:36 -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
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
568d5bc05d first cut at particle meshes 2014-01-28 09:26:47 -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
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
ZappoMan
62b7e6e58d implement local edits in ParticleScriptingInterface 2014-01-27 09:00:34 -08: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
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
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
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
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Stephen Birarda
d5b4e643c8 resolve conflicts on merge with upstream/master 2014-01-23 18:10:40 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations 
Zero length penetrations
 2014-01-23 18:09:41 -08:00
Andrew Meadows
c33a437393 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-23 16:44:41 -08:00
Andrew Meadows
93482d9d18 Fixing indentation. 2014-01-23 16:41:03 -08:00
Andrew Meadows
afa1134282 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-23 16:24:43 -08:00
Andrew Meadows
631c1d2c1b Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations 2014-01-23 16:07:16 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
Philip Rosedale
29f33a4e79 Balls rolling on voxels don’t make sound 2014-01-23 13:54:45 -08:00
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
ZappoMan
8aa7a915e7 ok, one more shot at fixing particle-server crash 2014-01-23 13:01:07 -08:00
ZappoMan
ccc30d95fb fix crashing particle server bug 2014-01-23 10:32:42 -08:00
Andrew Meadows
847503e437 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-22 17:00:55 -08:00
Andrew Meadows
556526316f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-22 16:21:49 -08:00
Stephen Birarda
f4f828ab72 Merge pull request #1629 from ZappoMan/juridiction_improvements 
Change JurisdictionListener and JurisdictionSender to not require virtual base class
 2014-01-22 16:16:24 -08:00
Andrew Meadows
e4e495889d added initial avatar-avatar collision stub 2014-01-22 16:06:49 -08:00
Brad Hefta-Gaub
9231c1d80a remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API 2014-01-22 15:21:58 -08:00
Brad Hefta-Gaub
b9ccd28428 removed some debug code 2014-01-22 14:35:38 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub
8be6fcbccc CR feedback 2014-01-22 14:11:11 -08:00
Brad Hefta-Gaub
34dc1a698e fixed types 2014-01-22 14:09:39 -08:00
Brad Hefta-Gaub
6e9e21051d first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes 2014-01-22 14:05:31 -08:00