Brad Davis
|
7f6a49688a
|
Merge branch 'master' into plugins
Conflicts:
interface/resources/qml/AddressBarDialog.qml
interface/src/Application.cpp
interface/src/Application.h
interface/src/Environment.cpp
interface/src/Environment.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/ApplicationOverlay.h
interface/src/ui/overlays/LocalModelsOverlay.cpp
|
2015-06-10 14:21:48 -07:00 |
|
ZappoMan
|
8c9cf480f3
|
more hacking
|
2015-05-27 13:23:59 -07:00 |
|
Brad Davis
|
b5e6b737c4
|
Working on display plugins
|
2015-05-26 17:32:41 -07:00 |
|
Brad Davis
|
3b7e8a69b5
|
Attempting to fix threading issues with web entities
|
2015-05-13 14:00:41 -07:00 |
|
Bradley Austin Davis
|
a0097bcff8
|
Fixing offscreen rendering on retina display, even without a proxy window
|
2015-05-13 12:26:46 -07:00 |
|
Brad Davis
|
a8d343bbf1
|
Working on web entities
|
2015-05-13 00:27:57 -07:00 |
|
Bradley Austin Davis
|
fc73676b4d
|
Merge branch 'master' into plugins_pt1
|
2015-05-06 11:43:25 -07:00 |
|
ZappoMan
|
4561c59203
|
wire up zone to environment atmosphere rendering
|
2015-05-04 13:49:43 -07:00 |
|
Brad Davis
|
302aa9db47
|
Removing access to the gl widget and display managers
|
2015-05-02 00:49:52 -07:00 |
|
Sam Gateau
|
ffaea07130
|
trying to ge the shadow to render correctly
|
2015-02-23 07:04:14 -08:00 |
|
ZappoMan
|
5d636e21c6
|
more Application dependency cleanup
|
2014-12-17 11:10:45 -08:00 |
|
ZappoMan
|
d3bf28e879
|
more Application dependency cleanup
|
2014-12-17 11:10:24 -08:00 |
|