Seth Alves
|
b30b9a0a30
|
don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership
|
2015-04-16 12:03:34 -07:00 |
|
Seth Alves
|
df37b853f7
|
setup test of lockout-period oafter simulator-owner-id change
|
2015-04-16 08:57:57 -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 |
|
Seth Alves
|
d4461f1ecb
|
put avatars and embedded-webserver and entities logging into their own QLoggingCategory
|
2015-04-06 16:22:54 -07:00 |
|
ZappoMan
|
45ab438339
|
add logging for delete operations in the server
|
2015-04-02 16:44:04 -07:00 |
|
ZappoMan
|
84940d8e43
|
fix SVO import
|
2015-04-02 14:13:19 -07:00 |
|
Seth Alves
|
4e83301c65
|
add a bool value to Node which indicates if it is allowed to rez new entities
|
2015-03-31 18:27:46 -07:00 |
|
ZappoMan
|
df99c314aa
|
fix issue with preload not being called on import
|
2015-03-31 12:44:44 -07:00 |
|
ZappoMan
|
a765b4c8a5
|
fix to preload getting called when you change a script
|
2015-03-27 18:56:55 -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
|
bed37ef49a
|
incorporate code review feedback
|
2015-03-16 13:57:22 -07: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 |
|
Seth Alves
|
2d4a95c634
|
move to-map recurse operator class to its own file
|
2015-03-16 11:54:50 -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 |
|
Seth Alves
|
32c79f6172
|
bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code
|
2015-03-16 09:17:32 -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 |
|
Seth Alves
|
c9eacd2197
|
remove unneeded debug print
|
2015-03-12 11:37:53 -07:00 |
|
Seth Alves
|
e66ac7f982
|
formatting
|
2015-03-12 11:29:47 -07:00 |
|
Seth Alves
|
4aa7b0eb0f
|
provide defaults for anything entity properties read from a map
|
2015-03-12 11:19:47 -07:00 |
|
Ryan Huffman
|
5c9ec6bdcc
|
Add add/delete/rename/clear events to EntitiesScriptingInterface
|
2015-03-12 11:17:07 -07:00 |
|
Seth Alves
|
ac882f86e2
|
backup code is now aware of possible file extension differences
|
2015-03-12 09:13:53 -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
|
291f239727
|
if we read an entity with no id, create a random one for it
|
2015-03-10 11:55:20 -07:00 |
|
Seth Alves
|
088e23ad54
|
saving and loading largely works. still some rough edges
|
2015-03-10 11:31:48 -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
|
2076de9153
|
started on reading entities from json file
|
2015-03-10 10:12:29 -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
|
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 |
|