Brad Davis
|
b8109af196
|
Ignite the atmosphere
|
2016-01-21 15:15:15 -08:00 |
|
Brad Hefta-Gaub
|
d10e1cc39d
|
CR feedback, dead code cleanup
|
2016-01-18 12:09:21 -08:00 |
|
Seth Alves
|
5c327edd5a
|
keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts
|
2015-11-30 14:08:07 -08:00 |
|
Seth Alves
|
cf39cac7fc
|
attempt to make SpatiallyNestable data access thread-safe
|
2015-11-29 12:50:33 -08:00 |
|
Atlante45
|
9c7a480fda
|
Remove shadowMatrices/Distances
|
2015-10-06 13:56:23 -07:00 |
|
Atlante45
|
765608d0ff
|
More unused
|
2015-10-06 13:56:21 -07:00 |
|
Brad Davis
|
caf93d1aff
|
Merge branch 'master' into plugins
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
|
2015-08-08 13:18:13 -07:00 |
|
ZappoMan
|
87f609b9af
|
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
|
2015-08-07 11:26:07 -07:00 |
|
Bradley Austin Davis
|
114ab9e47f
|
Merge branch 'master' into plugins
|
2015-07-22 11:47:56 -04:00 |
|
Sam Gateau
|
59666f664a
|
merging my changes to remove cruff from application to AUstin;s latest
|
2015-07-20 15:37:17 -07:00 |
|
Brad Davis
|
359abd6474
|
Merge branch 'master' into plugins
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
|
2015-07-20 13:33:24 -07:00 |
|
Sam Gateau
|
1a9f6e12a5
|
something not compiling but just before merge with upstream
|
2015-07-20 12:20:04 -07:00 |
|
Bradley Austin Davis
|
5e0a0409bf
|
Removing setupWorldLight from viewstateinterface
|
2015-07-18 12:16:51 -07:00 |
|
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 |
|