Commit graph

21 commits

Author SHA1 Message Date
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
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
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
ZappoMan
cd4ea4b34f more animation work 2014-08-07 13:13:37 -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
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
76ae4c9721 quiet logs 2014-07-29 16:54:21 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -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
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
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
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
Renamed from interface/src/models/ModelTreeRenderer.cpp (Browse further)