Brad Davis ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp		2015-07-16 16:37:55 -07:00
..
AbstractViewStateInterface.cpp	Attempting to fix threading issues with web entities	2015-05-13 14:00:41 -07:00
AbstractViewStateInterface.h	Merge branch 'master' into plugins	2015-06-10 14:21:48 -07:00
AmbientOcclusionEffect.cpp	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-16 16:37:55 -07:00
AmbientOcclusionEffect.h
AnimationHandle.cpp	Conditionnal fixes.	2015-07-10 15:36:17 -07:00
AnimationHandle.h	Made Animations safe for resource reload	2015-07-10 12:01:51 -07:00
deferred_light.slv
deferred_light_limited.slv	Dead code and disable debug info	2015-07-09 09:37:35 -07:00
deferred_light_spot.slv	FInally getting a nice spot light volume working for all angles	2015-07-09 03:45:19 -07:00
DeferredBuffer.slh
DeferredBufferWrite.slh
DeferredGlobalLight.slh	Generating the SH from the cube map!	2015-05-13 11:08:18 -07:00
DeferredLighting.slh
DeferredLightingEffect.cpp	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-16 16:37:55 -07:00
DeferredLightingEffect.h	Removing dead code	2015-07-09 09:25:07 -07:00
directional_ambient_light.slf
directional_ambient_light_cascaded_shadow_map.slf
directional_ambient_light_shadow_map.slf
directional_light.slf
directional_light_cascaded_shadow_map.slf
directional_light_shadow_map.slf
directional_skybox_light.slf	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
directional_skybox_light_cascaded_shadow_map.slf	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
directional_skybox_light_shadow_map.slf	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
Environment.cpp	Merge branch 'master' into plugins	2015-06-22 13:35:40 -07:00
Environment.h	Merge branch 'master' into plugins	2015-06-22 13:35:40 -07:00
FboCache.cpp	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
FboCache.h	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
GeometryCache.cpp	remove some dead code	2015-07-15 15:33:28 -07:00
GeometryCache.h	remove naked gl calls	2015-07-14 16:49:43 -07:00
GlWindow.cpp	Working on mac functionality	2015-07-02 18:14:12 -07:00
GlWindow.h	Working on mac functionality	2015-07-02 18:14:12 -07:00
JointState.cpp
JointState.h	Render a different model when in first person view.	2015-06-24 16:10:47 -07:00
Model.cpp	Clearing Model.cpp from naked gl call references	2015-07-15 16:09:53 -07:00
Model.h	Clearing Model.cpp from naked gl call references	2015-07-15 16:09:53 -07:00
model.slf	FIxed the bug about the tga not loading by recognizing the file format type from the filename extension and passing the info to the QImage::fromData()	2015-05-01 16:09:41 -07:00
model.slv	fixing the wrong matrix used	2015-06-08 03:07:17 -07:00
model_lightmap.slf
model_lightmap.slv
model_lightmap_normal_map.slf
model_lightmap_normal_map.slv
model_lightmap_normal_specular_map.slf
model_lightmap_specular_map.slf
model_normal_map.slf
model_normal_map.slv	Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though	2015-06-08 17:05:28 +02:00
model_normal_specular_map.slf
model_shadow.slf
model_shadow.slv
model_specular_map.slf
model_translucent.slf	FIxing the transparent rendering on Mac	2015-06-08 18:36:12 +02:00
OffscreenGlCanvas.cpp	Working on mac functionality	2015-07-02 18:14:12 -07:00
OffscreenGlCanvas.h	Working on mac functionality	2015-07-02 18:14:12 -07:00
OffscreenQmlSurface.cpp	Attempting to protect against infinite recursion	2015-07-03 07:09:57 -07:00
OffscreenQmlSurface.h	Make web entities interactive (via the mouse) if they're not locked.	2015-05-14 01:15:20 -07:00
OglplusHelpers.cpp	Working on mac functionality	2015-07-02 18:14:12 -07:00
OglplusHelpers.h	Working on mac functionality	2015-07-02 18:14:12 -07:00
overlay3D.slf	polish before PR	2015-06-17 17:09:33 +02:00
overlay3D.slv	Solving the rendering of textured overlay3d	2015-06-17 16:50:35 +02:00
PhysicsEntity.cpp
PhysicsEntity.h
point_light.slf
ProgramObject.cpp
ProgramObject.h	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
RenderDeferredTask.cpp	Remove naked gl call	2015-07-14 22:59:55 -07:00
RenderDeferredTask.h	First take oon the query for the gpu	2015-07-08 10:00:58 -07:00
RenderUtil.cpp
RenderUtil.h	removed dead code	2015-07-14 18:09:58 -07:00
RenderUtilsLogging.cpp
RenderUtilsLogging.h
sdf_text.slf	Restore TextRenderer and sdf_text	2015-05-28 15:20:40 +02:00
sdf_text.slv	Restore TextRenderer and sdf_text	2015-05-28 15:20:40 +02:00
sdf_text3D.slf	Improve batched font rendering smoothing	2015-07-09 14:34:33 -07:00
sdf_text3D.slv	Transmit normal to text rendering shader	2015-06-18 15:23:52 +02:00
Shadow.slh
simple.slf	Cleanup simple fragmen shaders	2015-05-29 16:53:53 +02:00
simple.slv	Add simple textured pipeline	2015-05-29 16:49:31 +02:00
simple_textured.slf	Cleanup simple fragmen shaders	2015-05-29 16:53:53 +02:00
simple_textured_emisive.slf	Introduce new emissive simple program	2015-06-26 16:17:41 -07:00
skin_model.slv	Fixing the skinning issue	2015-06-08 11:22:16 -07:00
skin_model_normal_map.slv	shuffling the rendering steps to get to render transparent and light it correctly	2015-06-06 09:50:56 -07:00
skin_model_shadow.slv
SkyFromAtmosphere.slf	CR feedback	2015-06-17 09:59:38 -07:00
SkyFromAtmosphere.slv	cleanup	2015-06-17 09:23:12 -07:00
SkyFromSpace.slf	CR feedback	2015-06-17 09:59:38 -07:00
SkyFromSpace.slv	cleanup	2015-06-17 09:23:12 -07:00
spot_light.slf	Dead code and disable debug info	2015-07-09 09:37:35 -07:00
standardDrawTexture.slf	Revert "Revert "Merge pull request #5106 from jherico/render_cursor""	2015-06-13 10:02:54 -07:00
standardTransformPNTC.slv	Prep work for procedural stars & stuff	2015-06-22 09:43:12 -07:00
stars.slf	Prep work for procedural stars & stuff	2015-06-22 09:43:12 -07:00
TextRenderer.cpp	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
TextRenderer.h	Restore TextRenderer and sdf_text	2015-05-28 15:20:40 +02:00
TextRenderer3D.cpp	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
TextRenderer3D.h	Cleanup TextRenderer3D methods args	2015-06-18 15:23:49 +02:00
TextureCache.cpp	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
TextureCache.h	If an external texture isn't found, still display the model	2015-07-10 16:03:27 -07:00