Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 14:56:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24480 commits 74 branches 59 tags 1.2 GiB
Commit graph

73 commits

Author SHA1 Message Date
Seth Alves
3cf31ff701 fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates 2015-04-14 13:32:02 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
Seth Alves
96bfc53391 prototype has no code and isn't used 2015-03-28 17:11:56 -07:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Clément Brisset
9acc4a1a8f Merge pull request #4457 from ZappoMan/quietLogs 
dont report deleteEntity warnings in client for delete messages coming back from server
 2015-03-17 15:42:20 +01:00
Seth Alves
c90ca4b425 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-16 12:13:26 -07:00
ZappoMan
7ddd54b782 dont report deleteEntity warnings in client for delete messages coming back from server 2015-03-16 11:11:07 -07:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Atlante45
7911974946 Added findEntities for AAbox 2015-03-13 13:55:26 +01:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Seth Alves
d0bbac2eb6 json writer sort of works. started on reader 2015-03-09 17:55:58 -07:00
Seth Alves
81dc7cb8cf started on code to persist entities to file as json rather than in the wire protocol 2015-03-09 13:38:18 -07:00
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
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Andrew Meadows
c2e78931c6 revert namechange: use compiler find all instances 2015-03-01 15:21:01 -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
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Seth Alves
9539292c22 clarify settings explaination, coding standard 2015-02-06 10:44:35 -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
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -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
ZappoMan
a465aa20ff more Application and Menu dependency removal 2014-12-17 11:41:42 -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
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
ZappoMan
13e358549d add periodic pruning of the octree on load and save 2014-11-05 14:56:38 -08:00
ZappoMan
2cfa14d5ad changed to only collide with moving entities 2014-09-24 18:06:08 -07:00
ZappoMan
44230a315b add naturalDimensions and moved sitting points to exclusively be in properties 2014-09-09 17:45:50 -07:00
ZappoMan
e1064d8da7 correctly implement data types who assume all child data must be included (e.g. voxels) 2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350 more work on fixing voxels 2014-09-05 11:51:17 -07:00
ZappoMan
a189f077b8 fix huge-mega-voxels and voxel file corruption 2014-09-05 01:13:22 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00