ZappoMan
|
9988f2d1cd
|
EnitityItem smart pointers
|
2015-05-22 22:38:02 -07:00 |
|
Atlante45
|
d0cd18d6c0
|
Replace entities pos/rot/dim with transform
Removed _position, _rotation, _dimensions
Added Transform _transform
|
2015-05-15 17:35:24 +02:00 |
|
ZappoMan
|
045c0141e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
|
2015-05-13 17:09:21 -07:00 |
|
Brad Davis
|
e9b83e1c02
|
Working on web entities
|
2015-05-12 21:15:54 -07:00 |
|
Brad Davis
|
8c4f802dbf
|
Merge remote-tracking branch 'upstream/master' into web-entity
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
|
2015-05-12 15:56:02 -07:00 |
|
Brad Davis
|
745182a963
|
Working on web entities
|
2015-05-12 14:39:54 -07:00 |
|