Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 06:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25868 commits 25 branches 0 tags 1.1 GiB
Commit graph

89 commits

Author SHA1 Message Date
Seth Alves
d6549948d0 first pass at entity interface to actions 2015-06-02 16:06:27 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
Brad Hefta-Gaub
afb09e81a6 Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts 
Entity events in normal scripts
 2015-05-27 09:24:50 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
7e9e223b3e merge upstream/master into andrew/nova 2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9 bid for simulation ownership 2015-05-12 21:46:52 -07:00
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
Andrew Meadows
1879a67804 cleanup 2015-05-07 14:42:09 -07:00
Andrew Meadows
d5f4c5a0ef add/delete/cleanup of physical entities works 2015-05-05 10:10:08 -07:00
Andrew Meadows
3031d55c8e merge upstream/master into andrew/nova 2015-05-01 11:03:51 -07:00
Andrew Meadows
31ca5b9eef add EntityTree::_pendingDelete for delayed deletes 
for case where EntitySimuation needs time to remove pointers
 2015-05-01 10:43:58 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
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