Commit graph

207 commits

Author SHA1 Message Date
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
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
3c4f5f88d0 checkpoint on virtual entities 2014-07-09 18:24:31 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -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
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
Renamed from libraries/models/src/EntityScriptingInterface.cpp (Browse further)