Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-11 14:07:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63388 commits 25 branches 0 tags 1.1 GiB
Commit graph

3130 commits

Author SHA1 Message Date
Brad Davis
3d69ceea71 Re-enable HUD compositing 2018-01-13 11:34:56 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
samcake
4dd925f025 Fixing forward render task to draw entities and avatars shapes 2018-01-10 17:51:03 -08:00
SamGondelman
e9d751fd23 try to avoid reusing uniform buffer locations 2018-01-10 17:01:01 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Brad Davis
105dffebaf Fixing UI 2018-01-09 18:36:42 -08:00
Nissim Hadar
5b1f8e83d4 Removed gcc warning. 2018-01-09 15:46:15 -08:00
Nissim Hadar
b53e411184 Corrected pushing of default lights. 2018-01-09 15:24:46 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix 
Fix avatar texture loading
 2018-01-08 14:01:15 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes 
Poly obj import fixes
 2018-01-05 13:33:29 -08:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Gabriel Calero
597114afea Prepare forward pipeline for android 2018-01-03 16:42:19 -03:00
Gabriel Calero
468fc89c3e Use forward pipeline for android 2018-01-03 16:38:23 -03:00
Gabriel Calero
dad526d22b Make Fade.slh compatible with Open GLES SL 2018-01-03 16:36:11 -03:00
Sam Gondelman
2898fa557e
typo 2017-12-23 00:53:11 -08:00
David Back
01fcd453b8 Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes 2017-12-22 16:41:17 -08:00
Nissim Hadar
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-12-22 15:41:59 -08:00
SamGondelman
c38ef77b26 fix model overlays visibility change 2017-12-22 15:04:06 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3 
Remove _model from ModelMeshPartPayload
 2017-12-22 13:50:06 -08:00
Nissim Hadar
e974cac177 Keylight inheritance mode works. 2017-12-21 19:19:55 -08:00
David Back
f800a6d6fc scale change 2017-12-21 17:00:27 -08:00
SamGondelman
69c1c65eb8 get rid of _model completely 2017-12-21 14:08:21 -08:00
David Back
fd297f1c03 convert negative relative indices to absolute indices 2017-12-21 10:36:41 -08:00
Olivier Prat
0d34569b1a Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-21 08:22:35 +01:00
SamGondelman
2ba3e337db cleanup 2017-12-20 14:18:01 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Nissim Hadar
2c6868b03e Pass keylight direction as parameter to the shader. 2017-12-19 11:12:27 -08:00
Olivier Prat
bd666406f4 Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends 2017-12-19 14:17:17 +01:00
Olivier Prat
116756c976 Parallel optimizations of setBlendedVertices 2017-12-18 11:22:43 +01:00
Nissim Hadar
d69297c02e Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders. 2017-12-16 00:22:26 -08:00
Olivier Prat
264f41472d Added tangents to blendshape for possible break of bump mapping when doing blend shape animations 2017-12-15 12:06:07 +01:00
Nissim Hadar
82b94eaacd Reduced size of parameters in (shader) function call. 2017-12-14 18:50:41 -08:00
Nissim Hadar
76af59e331 Merge branch 'master' into hazeOnTransparent 2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23 Passed light direction instead of light object into computeHazeColorKeyLightAttenuation. 2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770 Set 4th position component from 0.0 to 1.0 2017-12-14 16:17:50 -08:00