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

129 commits

Author SHA1 Message Date
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Ryan Huffman
2c68d56059 Update Entity::sendEntities to return new entity ids 2015-03-05 12:34:05 -08:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
ZappoMan
e99ffb8307 fix bug in export 2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509 Octree::findCapsulePenetration() uses meters 2015-03-04 16:16:49 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Andrew Meadows
90b69b1ee0 replace some "InDomainUnits" calls with "InMeters" 2015-03-01 15:58:10 -08:00
Andrew Meadows
e1954d3e1d spherical queries into Octree use meters 2015-03-01 15:19:26 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters() 
progress toward conversion to meters
 2015-02-26 15:16:59 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
Andrew Meadows
2f749e3c51 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/entities/src/TextEntityItem.h
 2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits() 
and friends
 2015-02-25 14:35:04 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Ryan Huffman
2b00e3fadc Add force option to deleteEntity 2015-02-04 10:49:49 -08:00
Ryan Huffman
f65640a593 Update EntityTree.cpp to not delete entity when locked 2015-01-27 10:24:54 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -08:00
Andrew Meadows
c37c1515ba EntitySimulation is lockable 
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
 2015-01-08 10:22:25 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
213133c705 restoring EntityTreeElement::cleanupEntities() 2014-12-29 15:19:25 -08:00
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -08:00
Andrew Meadows
28381a3b70 cleanup of EntityItem::_created timestamp logic 
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
 2014-12-18 11:39:02 -08:00
ZappoMan
a465aa20ff more Application and Menu dependency removal 2014-12-17 11:41:42 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
Andrew Meadows
4c74c041c2 remove unused cruft 2014-12-10 16:59:49 -08:00
ZappoMan
426517b072 fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities 2014-12-09 17:11:01 -08:00
Andrew Meadows
bc22e5723c bundle the flags that EntitySimulation cares about 2014-12-09 12:55:58 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
Andrew Meadows
d4c72ab203 handle case where EntityItem's script has changed 2014-12-08 17:16:45 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
ZappoMan
497fbade9b fix crash in entity related AC scripts 2014-12-08 06:48:04 -08:00
Andrew Meadows
7d96ad5836 cleanup of EntitySimulation API 
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
 2014-12-05 18:08:53 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
Andrew Meadows
051b04402f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
 2014-11-26 17:21:11 -08:00
Andrew Meadows
0b56169c6e fix build after merge 2014-11-26 17:18:19 -08:00
Andrew Meadows
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
Andrew Meadows
1c636fe6b2 more correct entity list maintenance 2014-11-24 20:37:09 -08:00
Andrew Meadows
ec1f11c1a8 route more entity updates into physics engine 2014-11-24 11:21:40 -08:00
Andrew Meadows
51da678675 update entity MotionType when it changes 2014-11-19 17:05:31 -08:00
Andrew Meadows
961dc5a231 merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
 2014-11-19 15:41:53 -08:00
Andrew Meadows
48164c9399 cleanup and moving things around 2014-11-19 15:31:17 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay 
clear EntityItem updateFlags when processed
 2014-11-19 15:12:22 -08:00
Andrew Meadows
388830c2a2 Merge branch 'bispinor' into inertia 
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0 rename PhysicsWorld to PhysicsEngine 2014-11-18 09:55:25 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00