Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:03:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25125 commits 76 branches 59 tags 1.2 GiB
Commit graph

488 commits

Author SHA1 Message Date
Sam Gateau
45e70c98f8 Fixed the cube map loading issue 2015-05-11 13:43:15 -07:00
Sam Gateau
72c3270ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0 refactoring th ecube texure loading to support 2 different layouts 2015-05-11 10:47:45 -07:00
Atlante45
e51040db53 CR 2015-05-11 14:31:22 +02:00
Atlante45
f941ca9601 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe 2015-05-11 14:20:16 +02:00
Sam Gateau
d51904b7b3 fixing file 2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Atlante45
52397bf87a Fix wireframe render for meshes with special properties 2015-05-08 15:59:39 +02:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Sam Gateau
54c47fe3f9 merging 2015-05-07 11:35:58 -07:00
Sam Gateau
653d2e72b1 Skybox kind of working 2015-05-07 11:23:11 -07:00
Atlante45
591548dc38 Missing comma 2015-05-07 20:15:40 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
Bradley Austin Davis
3b8108e887 Fix inverted icons 2015-05-06 16:09:17 -07:00
Brad Hefta-Gaub
5551997cdc Merge pull request #4780 from samcake/blue 
Add support for Skybox and rendering path of background according to Zones
 2015-05-06 14:41:06 -07:00
Seth Alves
719747ee2d Merge pull request #4725 from howard-stearns/objReader 
Textures for .obj reader:
 2015-05-06 14:30:29 -07:00
Sam Gateau
1b5185abeb fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome 2015-05-06 12:19:19 -07:00
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
Atlante45
8b2442ce6e clear list after loop 2015-05-05 22:56:37 +02:00
Atlante45
863280300e Fix pickMeshList incorrect arguments 2015-05-05 22:37:00 +02:00
Atlante45
73b7530ec6 Add wireframe pipelines 2015-05-05 21:50:06 +02:00
Atlante45
429c1e1231 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 21:33:55 +02:00
Sam Gateau
13482575d2 merge 2015-05-05 12:03:45 -07:00
Atlante45
e0f3a8212f Add wireframe arg to render fct 2015-05-05 17:23:10 +02:00
Atlante45
bc04685dbf Add isWireframe to RenderKey 2015-05-05 15:15:18 +02:00
Atlante45
0e3061f052 Add isWireframe to model class 2015-05-05 15:14:29 +02:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Sam Gateau
73177cd81d Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-04 14:07:59 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Sam Gateau
ade404a74d getting rid of QSHaredPointer in favor of std::shared_ptr 2015-05-04 13:43:30 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Brad Davis
e72756ab99 Merge remote-tracking branch 'upstream/master' into plugins_pt1 
Conflicts:
	libraries/render-utils/src/TextureCache.cpp
 2015-05-02 00:51:50 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Howard Stearns
e1d47413cc Material library handling. 
This is now functionally complete, but it needs testing, and the some tidying up.
 2015-05-01 20:54:25 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Sam Gateau
f9802a1072 IMprove the message 2015-05-01 16:39:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Sam Gateau
2382183075 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
Sam Gateau
1b558e7390 investigating the semi transparent textured bug 2015-05-01 13:37:04 -07:00
Howard Stearns
e0a4909b22 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-01 13:32:05 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
samcake
2b631efb5d shader not compiling properly have been fixed 2015-05-01 00:21:58 -07:00
samcake
e560687371 fixing the shader not compiling 2015-05-01 00:14:23 -07:00
Howard Stearns
2da8e1ab30 Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch. 2015-04-30 08:53:19 -07:00
Howard Stearns
1255d46140 coding standard: type formatting and variable names 2015-04-29 15:19:40 -07:00