Brad Davis
|
a94b6667b1
|
Moving most of GLCanvas to gl library
|
2015-11-30 17:19:42 -08:00 |
|
Brad Davis
|
cb26fc67fc
|
Move recording interface back to float/seconds
|
2015-11-16 14:44:22 -08:00 |
|
Seth Alves
|
c381da24a7
|
get interface building on my linux box
|
2015-11-02 10:42:06 -08:00 |
|
Brad Davis
|
49e7d42c2c
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-30 10:07:40 -07:00 |
|
Brad Hefta-Gaub
|
a149a2dd60
|
fix some warnings
|
2015-10-30 00:19:14 -07:00 |
|
Brad Davis
|
3c1a0930da
|
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
|
2015-10-28 13:38:22 -07:00 |
|
Brad Davis
|
5cbb2562cd
|
Move GL utilities out to their own library
|
2015-10-27 15:53:42 -07:00 |
|