ZappoMan
|
6f6cf3b08d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
|
2014-12-18 14:52:00 -08:00 |
|
Andrew Meadows
|
b03e6c53e1
|
fixing derived classes to use new EntityItem API
remove 'forceCopy' argument in EntityItem::setProperties()
|
2014-12-18 11:41:20 -08:00 |
|
ZappoMan
|
11b4400099
|
move all glut-ness to geometry cache
|
2014-12-18 11:20:17 -08:00 |
|
Stephen Birarda
|
b202eb7dae
|
DRY up gpu library/header linking
|
2014-12-18 09:14:44 -08:00 |
|
ZappoMan
|
7db350eac2
|
remove calls to glut in entities
|
2014-12-17 14:07:26 -08:00 |
|
ZappoMan
|
1a9cf126e4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
Conflicts:
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
|
2014-12-17 13:16:11 -08:00 |
|
ZappoMan
|
9f9b8bcb68
|
move interface/entities to libraries/entities-renderer
|
2014-12-17 12:54:41 -08:00 |
|