Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 13:18:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59796 commits 25 branches 0 tags 1.1 GiB
Commit graph

2824 commits

Author SHA1 Message Date
Olivier Prat
3fddac9f6e Fixed compilation errors with array initializations 2017-07-03 16:12:23 +02:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
af7957491b Working avater enter/leaves + manual threshold 2017-07-03 12:40:58 +02:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Olivier Prat
87833abd31 Sky working again. 2017-06-30 16:46:25 +02:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Olivier Prat
c5ca23f4ea Changing edited fade category properly updates widgets in edit window 2017-06-29 17:14:20 +02:00
Olivier Prat
fb33b8d1c1 Working edition and emissive edge on fade element enter/leave 2017-06-29 12:59:43 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +02:00
Olivier Prat
8a12d0c106 Fade effect working again for basic enter domain but with various Fade jobs 2017-06-29 08:54:23 +02:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Sam Gateau
76dae279cf Removing the default case from the renderer 2017-06-27 14:24:34 +02:00
Sam Gateau
7687bdc060 less comments & constant 2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980 less comments & constant 2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38 less comments & constant 2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29 less comments & constant 2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d One less constant 2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c CLeaning up comments 2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d Removing commented objects from deferredlighting effect 2017-06-26 14:34:09 +02:00
Olivier Prat
1bb0d51849 Merged with master 2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-26 10:05:04 +02:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Sam Cake
07e18eb3a8 Keep cleaning up the DeferredLightingEffect , removing stage s from there... 2017-06-22 01:12:32 -07:00
samcake
9ae2861ee6 Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements 2017-06-21 18:29:38 -07:00
Anthony J. Thibault
2dcca2125b Merge branch 'master' into feature/pole-vector 2017-06-21 15:50:03 -07:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Olivier Prat
2e3ffe7721 Disabled check on enabled physics when deciding is fade is adequate 2017-06-19 18:19:36 +02:00
Anthony J. Thibault
323dc62ef2 Merge branch 'master' into feature/pole-vector 2017-06-16 17:37:11 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
Olivier Prat
5eeff5aa28 Fixed unwanted red tint due to unreset color attrib in ModelMeshPartPayload 2017-06-14 10:23:12 +02:00
Olivier Prat
ef60f78d2b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-14 10:16:02 +02:00
Anthony J. Thibault
03a6f7082e Merge branch 'master' into feature/pole-vector 2017-06-13 15:37:59 -07:00
Anthony J. Thibault
f20c03fa6e Pole vectors can be controlled via anim vars. 2017-06-13 15:36:05 -07:00
Zach Fox
79b6dc3f78 Remove one more instance of FramebufferCache 2017-06-13 15:26:07 -07:00
Zach Fox
52ea7e7994 Rendering improvements based on spectator-camera changes 2017-06-13 15:19:29 -07:00
Olivier Prat
ace301945c Added scale and duration debug parameters in debugFade.qml 2017-06-13 15:31:04 +02:00
Olivier Prat
24d45e0f5b Updated from upstream master because of change of protocol 2017-06-13 10:43:25 +02:00
Olivier Prat
f3d252ee65 Switched fade curve to easeInOutQuad 2017-06-13 08:50:50 +02:00
Brad Davis
db8bdbc0a6 Merge pull request #10659 from samcake/orange 
simple Render Engine refactors coming from the Spectator Cam project
 2017-06-12 20:31:07 -07:00
Zach Fox
e96c55956f First pass at the fix 2017-06-12 09:53:14 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
samcake
bb38938534 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-09 14:34:25 -07:00
Liv
7785473ccb moving else 2017-06-09 12:59:08 -07:00
Liv
8c488d95d1 Stylish updates 2017-06-09 11:46:38 -07:00
Liv
1808505d8b Coding standard fixes 2017-06-09 10:54:57 -07:00
Liv
34bd2b8a2b style fix 2017-06-08 09:01:01 -07:00
Olivier Prat
7d58c9a741 Fixed fade for shadow job 2017-06-08 17:09:08 +02:00
Olivier Prat
cba70e6be0 Fade working on voxel objects 2017-06-08 14:57:09 +02:00
Olivier Prat
20d4fcbbc7 Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL 2017-06-08 09:24:12 +02:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Liv
c3bf915fd4 Changing loop to avoid unused warnings 2017-06-07 15:04:39 -07:00
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -07:00
Olivier Prat
de143d0ea2 Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class 2017-06-06 17:07:20 +02:00
Olivier Prat
a9ab9d2476 Renamed FadeManager to FadeEffect 2017-06-06 16:27:56 +02:00
Olivier Prat
8af2f75996 Added FadeManager to centralize some common fade effect data and functions 2017-06-06 16:11:12 +02:00
Olivier Prat
e7eca7728f Debug fade management moved out of the inner render loop 2017-06-06 14:57:52 +02:00
Liv
5579c409e7 Style fix 2017-06-05 18:03:10 -07:00
Liv
42cb2332d5 Remove unimplemented comment on circle 2017-06-05 17:46:13 -07:00
Liv
393aa84a55 Renaming conical to isConical 2017-06-05 17:45:52 -07:00
Liv
e4963e076a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 17:38:28 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
506f522802 use correct format for float literals 2017-06-05 08:54:05 -07:00
Olivier Prat
1936c209a5 Working fade debugging scripts for both opaque and transparents 2017-06-05 17:21:33 +02:00
Olivier Prat
cce99ef8c4 Added translucent shaders 2017-06-05 16:56:57 +02:00
Olivier Prat
74bb3213e4 Added shadow shader variants 2017-06-05 16:44:32 +02:00
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
Howard Stearns
3d62900daf When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works. 2017-06-03 16:49:16 -07:00
samcake
f70702beb7 Introducing debug flags 2017-06-02 17:54:41 -07:00
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
samcake
4a419f2d07 Merging with upstream 2017-06-01 18:25:24 -07:00
samcake
14f9a9848e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-01 18:05:47 -07:00
samcake
c5e9551bab more cleanup 2017-06-01 18:05:18 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
Sam Cake
ea6be93c9c adding another flavor of the prepare stencil 2017-06-01 01:24:57 -07:00
Sam Cake
e02115bcda clearing up the stencil jobs 2017-05-31 23:00:05 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
Sam Cake
b528c2fc60 Merged 2017-05-31 19:33:14 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Liv
8bcaacbe40 Removing incomplete torus function 2017-05-31 15:46:35 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Sam Cake
32c5dac66a Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil 2017-05-31 00:55:28 -07:00
samcake
8559ed6260 Starting to add the stencil mask for hmd 2017-05-30 16:37:10 -07:00
Liv
2808ab4865 Sort of making progress on torus vertex buffer 2017-05-26 10:45:29 -07:00
Liv
10408a0fe4 basic circle function to be used as base for torus 2017-05-25 15:32:49 -07:00
Liv
fee26c3976 Remove not yet implemented comment from Cone shape 2017-05-25 13:12:08 -07:00
Liv
ffbe39df0a Refactor to add optional conical parameter to existing extrude polygon function 2017-05-25 13:06:24 -07:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Liv
362e08a90d Add extrudePolygon for cylinder 2017-05-25 10:23:28 -07:00
samcake
c256893575 some clean up: 2017-05-23 18:00:22 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Thijs Wenker
712aff7ad6 base scale attachment on the natural dimensions 2017-05-23 17:53:08 +02:00
Chris Collins
207c13c3c3 Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer 
MeshPartPayload keeps weak pointer to Model
 2017-05-22 21:54:40 -07:00
Andrew Meadows
f7db877b7f payload keeps weak pointer to Model 2017-05-22 17:29:15 -07:00
Sam Gateau
589bcc19ce Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer 2017-05-19 17:50:19 -07:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Andrew Meadows
17b6cf29df check for valid resource pointer before use 2017-05-18 15:12:59 -07:00
Sam Gateau
b8a2b38fd5 Displaying the stack of zone components 2017-05-18 12:54:25 -07:00
Andrew Meadows
8d3285f733 verify _rig is valid in Model::deleteGeometry() 2017-05-18 11:11:50 -07:00
Sam Cake
5edcc38eba Polishing the scope shaders 2017-05-18 01:06:59 -07:00
Sam Gateau
966afa1e4a Adding the drawKeyLight shader 2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11 Adding the drawKeyLight shader 2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce Adding the drawKeyLight shader 2017-05-17 18:12:48 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations 
TriangleSet optimizations - ~80% improvement in Ray picking against models
 2017-05-16 20:47:50 -07:00
samcake
2cd2c95940 Adding more debugging tool 2017-05-16 16:12:31 -07:00
Ryan Huffman
8eacf0ad4b Remove unnecessary assert in Model.cpp 
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
 2017-05-16 10:56:33 -07:00
Sam Cake
4c3ddfbff9 Adding debuging of the ambient lighting 2017-05-16 01:01:19 -07:00
samcake
db4387e55d Trying to mess with the defautl texture for skybox 2017-05-15 17:31:29 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
samcake
75facdfa88 Testing the new behavior with the BackgroundStage, 2017-05-09 17:31:18 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
samcake
bbb513220b Moving forward 2017-05-08 17:33:24 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002 
fix render of debug collision shapes
 2017-05-08 20:35:59 +02:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations 
Fix sped up animations
 2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9 Using the items to pick the key light! 2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
samcake
b6c966ef39 Keep iterating on the zones 2017-05-05 18:07:21 -07:00
samcake
bc1e5101ac Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-05 16:13:51 -07:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression 
Feat/normal map compression
 2017-05-05 10:03:01 -07:00
samcake
64317f5fd0 Adding a light item per zone 2017-05-04 16:47:03 -07:00
Andrew Meadows
f11d6eff92 fix typos: RenderItemsMap not RenderItems 2017-05-04 15:43:44 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Atlante45
f728ae7955 Remove unecessary normalize 2017-05-04 12:38:27 -07:00
Atlante45
ea2b188b64 Recompute Y from X/Z for normal maps 2017-05-04 10:33:34 -07:00
samcake
4514da2a09 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-01 16:49:35 -07:00
Olivier Prat
111f0762ea Added debug scripts and fade position is now stable 2017-04-30 14:42:27 +02:00
Olivier Prat
6a39c25dc7 Merged from master because protocol has changed 2017-04-27 10:59:51 +02:00
Olivier Prat
8071c04e98 Added fade effect prototype version 2017-04-27 10:31:06 +02:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
Atlante45
70ece9f0fd Load skybox first and sounds later 2017-04-26 14:57:23 -07:00
Atlante45
a2f7a88433 Start drawing models before we get the textures 2017-04-26 10:49:23 -07:00
Atlante45
6fb074715e Fix alpha rendering bug 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
472c888529 Fix handling of failed ktx downloads 2017-04-26 10:48:24 -07:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
samcake
c36f8da4c0 Fixing build on mac 2017-04-24 10:46:29 -07:00
Sam Cake
33d770c24e removing the explicit SettingHandle path to REnder?engine 2017-04-24 00:52:09 -07:00
Sam Cake
fa62a1ba9d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-22 08:53:44 -07:00
samcake
8e73fa3eb4 Separating the task classes in their own folder, and easing the declaration 2017-04-21 18:16:07 -07:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
samcake
5af171f69f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-18 17:08:02 -07:00
samcake
63fe579022 simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead' 2017-04-18 17:05:40 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Sam Cake
29545f0918 FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend 2017-04-13 23:53:56 -07:00
Sam Cake
1dd98af1dd And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue) 2017-04-11 01:21:45 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Sam Cake
a458828590 MOving forward with the TaskConcept and TaskModel, all working 2017-04-10 02:30:13 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
samcake
e6844f4294 Cleaning up the basic jobs of render 2017-04-07 18:35:27 -07:00
samcake
58cec3fb96 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-07 11:55:08 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
samcake
cb94e1009d Adding a job... 2017-04-06 18:10:28 -07:00
samcake
6fc965072c Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer 2017-04-06 15:19:55 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
samcake
6385a702cd FIxing the bug for image3D overlay drawn in scene 2017-04-04 12:56:43 -07:00
samcake
b18d82bd19 adding different shaders for transparent for simpel 2017-04-04 11:50:38 -07:00
samcake
a882beb2fd Trying to fix the overlay Image3D shading pipeline used 2017-04-03 17:35:28 -07:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
samcake
25edb44b75 Fix the problem with the cursor and scattering, 2017-03-30 15:15:14 -07:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
samcake
9bc7e41642 Remove extra calls for binding default textures, not needed 2017-03-29 10:57:08 -07:00
samcake
a1bf1beab4 Merge pull request #10014 from samcake/blue 
Fixing the roughness/reflection quantization bug
 2017-03-28 14:50:24 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -07:00
Sam Cake
e87bc91d0e Fixing the roughness/reflection quantization bug 2017-03-26 11:48:02 -07:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215 
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Sam Cake
022e91b35d Clean comments and pixel format used 2017-03-24 00:26:14 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
samcake
e05abf2a2f Fixing the spherical harmonics gneration 2017-03-20 16:41:21 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
samcake
03e1c5e0f2 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-03-20 15:10:09 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232 
21232 - Remove Mini Mirror from View menu
 2017-03-20 09:55:37 -07:00
Sam Cake
a804bc723f Keep pushing and debugging ambient lighting 2017-03-20 00:32:06 -07:00