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

175 commits

Author SHA1 Message Date
ZappoMan
49cf6dff3a more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
ZappoMan
f8f0da189f more work on more entities in a cell 2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4 work on reseved bytes in octree packet data 2014-08-15 11:26:55 -07:00
ZappoMan
abe892ddc3 quiet some debugging 2014-08-14 11:36:53 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
ZappoMan
b7e258519b fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet 2014-08-13 17:12:03 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
ZappoMan
4bdb8765f5 implement improved pruning on updates/moves/delete passes of the tree added some debug support 2014-08-13 10:29:25 -07:00
ZappoMan
6ce6d8ae47 dont try to create child elements that are smaller than the entities 2014-08-12 14:29:55 -07:00
ZappoMan
8339f1059e clean up more debugging noise 2014-08-12 13:29:14 -07:00
ZappoMan
3551bd676f quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds 2014-08-12 13:14:28 -07:00
ZappoMan
76308738e0 added pruning support, some cleanup 2014-08-12 07:16:32 -07:00
ZappoMan
466b4c5e40 add some basic support for coming to a rest on the ground plane in case of downward gravity 2014-08-11 14:52:19 -07:00
ZappoMan
779d846f1e add gravity to the editModels property 2014-08-11 13:27:19 -07:00
ZappoMan
b89c740e17 improved velocity behavior, handling lastUpdated better, changing state when velocity reaches zero 2014-08-11 11:56:05 -07:00
ZappoMan
7c8163c475 first cut at getting velocity to work in entity base class 2014-08-11 10:36:03 -07:00
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
ZappoMan
55e12baf78 more base class properties work 2014-08-08 18:06:16 -07:00
ZappoMan
eda5614a75 implement readEntitySubclassDataFromBuffer() for BoxEntityItem 2014-08-08 17:59:32 -07:00
ZappoMan
2892c37210 implement readEntitySubclassDataFromBuffer() for EntityItem 2014-08-08 17:55:56 -07:00
ZappoMan
90c7989765 implement appendSubclassData() for EntityItem 2014-08-08 17:38:26 -07:00
ZappoMan
ebc3013904 more work on more properties 2014-08-08 16:42:31 -07:00
ZappoMan
b509eed59a more property work 2014-08-08 16:20:03 -07:00
ZappoMan
914b20a862 more entity item base class properties 2014-08-08 15:57:43 -07:00
ZappoMan
f899dc1f79 moving entity edit packet encode/decode to the EntityItemProperties class 2014-08-08 15:41:55 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
ZappoMan
d50a607bc7 started support for new entity base class properties like velocity, gravity, damping, and lifetime 2014-08-08 11:38:03 -07:00
ZappoMan
a8188b39d7 improve performance of handleAddEntityResponse() to use map and not recurse tree 2014-08-08 09:44:12 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
ZappoMan
2a65de8026 todo 2014-08-07 14:48:17 -07:00
ZappoMan
37a6064cec todo 2014-08-07 14:39:17 -07:00
ZappoMan
cd4ea4b34f more animation work 2014-08-07 13:13:37 -07:00
ZappoMan
f1d2017a9e getting animation working again 2014-08-07 12:50:02 -07:00
ZappoMan
d1589e0d8e removed addOrUpdateEntity() replaced with more efficient approach 2014-08-07 10:10:44 -07:00
ZappoMan
99d44ce945 make factories an array instead of map 2014-08-07 09:24:43 -07:00
ZappoMan
720f60b99e fixed bad ids from constructing entities from buffers 2014-08-06 12:52:40 -07:00
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
ZappoMan
ebe7182ab6 get models actually rendering again 2014-08-06 10:25:44 -07:00
ZappoMan
e540bef672 more hacking on rendering of virtual entities 2014-08-06 09:12:14 -07:00
ZappoMan
a194db837f first cut at registered EntityType renderers 2014-08-05 16:06:21 -07:00
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