ZappoMan
|
50309ef371
|
added other types, just stubs for now
|
2014-08-05 14:20:24 -07:00 |
|
ZappoMan
|
e9db4fd120
|
registration of multiple entity types: Model and Box
|
2014-08-05 12:10:17 -07:00 |
|
ZappoMan
|
273853ef24
|
more work on virtual entities
|
2014-08-04 16:18:24 -07:00 |
|
ZappoMan
|
3a8c5018ee
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
|
2014-08-04 12:01:23 -07:00 |
|
ZappoMan
|
23aa5a124e
|
fix up lastEdited behavior
|
2014-07-31 11:41:18 -07:00 |
|
ZappoMan
|
77e1867b11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
|
2014-07-31 10:34:23 -07:00 |
|
ZappoMan
|
dd3d4be73b
|
added notes on experimental new replacement for addOrUpdateEntity()
|
2014-07-30 07:19:59 -07:00 |
|
ZappoMan
|
76ae4c9721
|
quiet logs
|
2014-07-29 16:54:21 -07:00 |
|
ZappoMan
|
4655612cdb
|
handle moving of existing entities in case of inbound data from server causing entities to move to new elements
|
2014-07-29 15:50:17 -07:00 |
|
ZappoMan
|
3667eadff0
|
some various fixes
|
2014-07-29 13:34:08 -07:00 |
|
ZappoMan
|
230c2f2684
|
cleanup storage of entity ids on the server, added improved checks for server vs client
|
2014-07-29 12:52:46 -07:00 |
|
ZappoMan
|
30aee70346
|
latest work
|
2014-07-21 09:18:21 -07:00 |
|
ZappoMan
|
9409d07c46
|
make sure entities constructed from reading buffers are included in the entity hash map
|
2014-07-17 11:22:25 -07:00 |
|
ZappoMan
|
6b62c6b976
|
get virtual entities constructing from buffers
|
2014-07-17 11:16:03 -07:00 |
|
ZappoMan
|
0c7afc39ca
|
refactoring EntityItemID management and id assignment to be part of EntityItemID class instead of EntityItem class
|
2014-07-17 10:24:32 -07:00 |
|
ZappoMan
|
1125cb183e
|
splitting up a bunch of Entity classes into different files
|
2014-07-16 09:25:54 -07:00 |
|
ZappoMan
|
d4a8711ff6
|
more hacking on edit packets
|
2014-07-15 11:42:46 -07:00 |
|
ZappoMan
|
61d998d2ad
|
tweaks
|
2014-07-15 10:29:29 -07:00 |
|
ZappoMan
|
2baac96665
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
examples/sit.js
interface/src/Application.cpp
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelsScriptingInterface.cpp
|
2014-07-15 10:04:40 -07:00 |
|
ZappoMan
|
780532bfd8
|
more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe
|
2014-07-10 13:42:49 -07:00 |
|
ZappoMan
|
3c4f5f88d0
|
checkpoint on virtual entities
|
2014-07-09 18:24:31 -07:00 |
|
ZappoMan
|
a4b7673a2c
|
some more virtual entity work
|
2014-07-07 14:29:03 -07:00 |
|
ZappoMan
|
3145d150f3
|
more work on virtual entities, unit tests passing woot
|
2014-07-07 12:56:32 -07:00 |
|
ZappoMan
|
29e02f2681
|
more hacking on virtualizing entities
|
2014-07-07 09:36:31 -07:00 |
|
ZappoMan
|
c449ba27a9
|
more virtual entity work
|
2014-07-03 15:18:17 -07:00 |
|
ZappoMan
|
5e5af9ceea
|
hacking on more support for virtual entities
|
2014-07-03 10:44:34 -07:00 |
|
ZappoMan
|
2c5209d1e7
|
virtual entities checkpoint
|
2014-07-03 09:07:11 -07:00 |
|
ZappoMan
|
84101fce2c
|
naming cleanup and organizational tweaks
|
2014-07-02 11:22:56 -07:00 |
|
ZappoMan
|
fe30d3807c
|
more renaming to entity from model where we're really talking about an entity
|
2014-07-01 17:07:16 -07:00 |
|
ZappoMan
|
865566414c
|
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
|
2014-07-01 16:32:47 -07:00 |
|
ZappoMan
|
b113c2d55c
|
fix readEntityIDFromBuffer
|
2014-06-27 11:56:59 -07:00 |
|
ZappoMan
|
d618b4226b
|
entity type work, and byte coding for id and type
|
2014-06-27 10:53:55 -07:00 |
|
ZappoMan
|
ad7a768fff
|
more renaming work
|
2014-06-27 09:14:17 -07:00 |
|
ZappoMan
|
c4fe36b13d
|
more Models->Entities renaming
|
2014-06-26 17:01:07 -07:00 |
|