Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 10:32:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87427 commits 67 branches 56 tags 1.2 GiB
Commit graph

4654 commits

Author SHA1 Message Date
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent 
Fix/move user agent
 2020-07-23 17:13:18 -04:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
kasenvr
c5fdacf975
Merge pull request #301 from HifiExperiments/modelBackface 
Models support flipped normals on double sided geometry
 2020-05-13 16:06:26 -04:00
HifiExperiments
8f9c180243 Merge remote-tracking branch 'origin/parenting' into modelShader 2020-05-07 13:43:20 -07:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
ebc9dae78d
Merge branch 'master' into parenting 2020-05-07 13:35:32 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
91e177f68b add spaces after fors 2020-05-07 13:23:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
HifiExperiments
b6cb1fcfe7 fix procedural applying to other things 2020-04-22 16:36:51 -07:00
HifiExperiments
420af95131 models support flipped normals on double sided geometry 2020-04-16 16:18:39 -07:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
HifiExperiments
eb26d9b4e3 working on parenting fixes 2020-04-06 13:41:01 -07:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
Brad Hefta-Gaub
fb70569fc2
Merge pull request #16548 from HifiExperiments/visible 
Case 17368: Fix wearables not disappearing with avatar
 2019-12-13 13:20:15 -08:00
Brad Hefta-Gaub
1609e59c42
Merge pull request #16546 from HifiExperiments/cullFace 
Material Entities can specify face culling method, support GLTF doubleSided property
 2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh 
Procedural vertex shaders
 2019-12-13 13:00:01 -08:00
Kasen IO
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 22:49:48 -05:00
Marcus Llewellyn
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders. 
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
 2019-12-10 16:52:19 -06:00
HifiExperiments
400b771a1a fix shadows!! 2019-12-05 01:41:56 -08:00
HifiExperiments
413bf10f79 stupid, shadows still broken 2019-11-26 22:28:06 -08:00
HifiExperiments
3dfd63d46b merge with master 2019-11-26 20:42:44 -08:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
HifiExperiments
b4c9a3e73d Merge remote-tracking branch 'origin/alphaModes' into cullFace 2019-11-25 14:23:50 -08:00
HifiExperiments
f55c4b8b12 put back stepping in translucent case 2019-11-24 12:44:42 -08:00
HifiExperiments
5371fd613a properly implement alphaModes 2019-11-22 00:41:32 -08:00
sabrina-shanman
79d470c70e Call updateGeometry before Model::createRenderItemSet to ensure well-defined state 2019-11-21 16:12:49 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master 
Merge master into instancing
 2019-11-18 13:54:33 -08:00
HifiExperiments
b73a608094 procedural vertex shaders 2019-11-15 00:22:40 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
b7da5d0d72 Update Model::calculateTriangleSets to use hfm::Shapes 2019-11-08 13:56:49 -08:00
Sam Gateau
8175b9486f Fix crash when highlighting custom pipeline shapes 2019-11-08 11:18:02 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master 
Merge master into instancing
 2019-11-08 10:10:50 -08:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
Sam Gateau
86b62f921d Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it 2019-11-07 14:01:50 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
sabrina-shanman
67e05a70d4 Fix build error with _drawTransform 2019-11-05 10:56:29 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
sabrina-shanman
4e0db5d641 Fix build warnings 2019-10-24 15:49:03 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
Sam Gateau
0a9c389641 last issue 2019-10-16 08:06:35 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00
Sam Gateau
8a1f3648f9 fooling around to get the cluster working 2019-10-11 18:06:44 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
Sam Gateau
3e8d6671f7 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:22 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master 
Merge master into instancing
 2019-10-09 16:59:54 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Sam Gateau
4d94cbe0d8 Pass 3rd of the hope to clean it up... 2019-09-27 00:29:10 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Seth Alves
73e6be9c37 allow drawing DebugDraw spheres with a specific size 2019-09-17 09:43:19 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
Sam Gateau
68b754fc0c Changes driven by the alpha mode 2019-09-12 17:01:16 -07:00
sabrina-shanman
c4db6c78d8 std::vector-ize meshes/mesh parts in hfm::Model 2019-09-11 16:50:50 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Sam Gateau
df0eb901a2 REverting the change in the jittering sequence length 2019-09-03 17:01:03 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -07:00
Andrew Meadows
8957cc5b2b render opaque PolyLines with opaque pipepline 2019-08-22 08:13:11 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
Sam Gateau
aeb407698d bloom ui 2019-08-18 22:15:20 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
Sam Gateau
9139edc8b1 Maybe fixed the problem, cannot render the gl41 version properly 2019-08-12 00:44:14 -07:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text 
Supporting text effects + fonts on Text Entities
 2019-08-02 14:25:28 -07:00
HifiExperiments
029a494beb try to fix android shader build error 2019-08-01 21:29:01 -07:00
Anna
4e4f8866cd fix android/mac build error 2019-07-30 13:15:26 -07:00
Anna
f58400950a made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility 2019-07-30 11:57:01 -07:00
Anna
0cd532a47b cleaning up 2019-07-30 10:08:38 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
Anna
458b3f18df changes from cr 2019-07-29 18:25:36 -07:00
Anna
379a262b07 bug fix in deferred, finish merging android & windows forward 2019-07-29 18:15:54 -07:00
Anna
d3107efb82 added optional output buffer to ToneMapAndResampleTask 2019-07-29 16:27:54 -07:00
Anna
3a437cf190 fix on android, merge android and windows forward pipelines 2019-07-29 14:59:15 -07:00
Anna
2fca77867b broken on android again somehow 2019-07-29 13:45:08 -07:00
Anna
db49a0b9d6 fixed some typos from merge 2019-07-29 11:55:12 -07:00
Anna
0cc8c1f434 making my changes work on android 2019-07-29 10:43:20 -07:00
Anna
8aef9db4b9 works on android! 2019-07-26 20:09:18 -07:00
Anna
6a6b2f6d27 added tone mapping back 2019-07-26 18:55:08 -07:00
Anna
0d2b2a2aef added tone mapping config 2019-07-26 12:53:18 -07:00
Anna
16595d9412 created tonemapandresample 2019-07-26 11:56:25 -07:00
Anna
1b0d8ee603 removed typo 2019-07-24 13:37:33 -07:00
Anna
27586727db make tonemapandresampletask run on android 2019-07-24 11:38:47 -07:00
Shannon Romano
2942bfaad0
Merge pull request #15939 from SamGondelman/shader 
Condense directional light shaders using slp defines
 2019-07-24 09:01:49 -07:00
Anna
1df43fc83a Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample 2019-07-23 15:41:01 -07:00
Brad Davis
449f3d00f9 BUGZ-987: fix depth testing of HUD layer 3D objects 2019-07-23 12:09:12 -07:00
Anna
45d1672edd remove testing variables 2019-07-16 15:44:29 -07:00
Anna
58a04c1ccf fix jenkins errors for real this time 2019-07-16 15:44:29 -07:00
Anna
2cd2e35736 fixing jenkins build errors 2019-07-16 15:44:29 -07:00
Anna
8d9760ae0c typo fix 2019-07-16 15:44:29 -07:00
Anna
e129f88723 deleted tone mapping mirrored slf and slp since they auto generate 2019-07-16 15:44:29 -07:00
Anna
b59d967b6c fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes 2019-07-16 15:44:28 -07:00
Anna
0b51e3c129 progress 2019-07-16 15:43:47 -07:00
Anna
24f022ec3b init commit for this pr, still buggy 2019-07-16 15:41:01 -07:00
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias 
DEV-202: Expose shadow bias and max distance to Zone Entity
 2019-07-16 15:22:37 -07:00
SamGondelman
965feb6f7a condense direction light shaders using slp defines 2019-07-16 11:24:19 -07:00
SamGondelman
1789e16cc4 possible fix for shader compilation error 2019-07-12 16:22:01 -07:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
SamGondelman
046b25ab67 fix haze on web entities, deferred and forward 2019-07-11 14:56:17 -07:00
SamGondelman
22a7a97a9a fix forward web + parabola blending 2019-07-11 12:23:04 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
SamGondelman
8fd2251612 mostly working equation? 2019-07-09 13:34:33 -07:00
SamGondelman
68b2c8c2fb wip adding haze to forward rendering 2019-07-09 00:46:24 -07:00
Sam Gondelman
732a7b0a89
fix build error 2019-07-03 22:43:35 -07:00
SamGondelman
8b9fcd43b1 merge with master 2019-07-03 17:58:23 -07:00
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit 
BUGZ-661: Add unlit property to text entities
 2019-07-03 18:43:26 +02:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Anna
f44bc52d58 implemented requested changes, fixed math error in filmic curve 2019-07-01 17:05:13 -07:00
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Anna
9b85c7f1ac Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification 2019-06-28 09:47:17 -07:00
raveenajain
3a60bc6a13 clang braces fix 2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f arrays for bias calcs 2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-27 09:42:03 -07:00
raveenajain
04afbde188 cascade loop, fine tune calc 2019-06-27 09:41:39 -07:00
Anna
6b79b275a9 fixed reinhard and filmic curves 2019-06-26 18:00:49 -07:00
Anna
24b6d64e34 removed extraneous code for hmd 2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87 removed extraneous conversion to SRGB and back during deferred rendering 2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff move bias init from config to run 2019-06-26 15:42:11 -07:00
Sam Gondelman
7573c1207b
remove extra alpha check in deferred sdf_text3D.slf 2019-06-26 11:21:52 -07:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow 
BUGZ-664: Introduce scaling of rendering for forward renderer
 2019-06-25 14:27:17 -07:00
Ken Cooke
4c5c61231d Only use QVector resize when actually needed 2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9 Use QVector resize() instead of reserve() to silence Debug builds about size not being set. 
Causes unneeded default initialization, but no obvious way to avoid.
 2019-06-25 12:53:07 -07:00
Sam Gateau
9470467c31 Ad the check for nsight to avoid the COmpositeHUD pass 2019-06-25 11:28:01 -07:00
Sam Gateau
4dcfa59997 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-25 11:14:09 -07:00
raveenajain
bb5896c174 const fix 2019-06-24 17:24:37 -07:00
Sam Gateau
cb1bf57bd1 Address pr review comments 2019-06-24 16:54:06 -07:00
raveenajain
f68bb957ff clamp and initialize values 2019-06-24 16:42:38 -07:00
Ken Cooke
541d45012a Move BlendshapePacking_avx2.cpp to shared 2019-06-24 12:54:58 -07:00
Ken Cooke
75aea88f20 CR feedback 2019-06-24 11:51:03 -07:00
raveenajain
f0660ba381 modify shadow config via single bias 2019-06-24 11:03:10 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
Ken Cooke
87e0f5b2bb Runtime dispatch for AVX2 2019-06-23 10:40:15 -07:00
Ken Cooke
8653118b6c Full SIMD implementation of packBlendshapeOffsets() using AVX2. 
6x speedup over the existing (partial SIMD) version.
60x speedup over the original (pure GLM) version.
 2019-06-23 10:32:57 -07:00
Ken Cooke
cceff21cd0 Pull packBlendshapeOffsets() into separate function 2019-06-23 08:57:56 -07:00
Ken Cooke
87c680382f Strip-mining optimization to improve cache utilization. 
For each mesh: init, accumulate, and pack using a recycled offset buffer.
 2019-06-23 08:42:38 -07:00
Ken Cooke
9e309b095d Fix bug that was packing zero offsets that were never used 2019-06-23 08:00:13 -07:00
Sam Gateau
a278e6c52c REmoving unecessary job introduced dureing development 2019-06-21 17:24:21 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
SamGondelman
f2e3218ec0 possible fix for do_setPipeline crash and other mac fixes 2019-06-19 16:34:38 -07:00
Sam Gateau
fdf06ea819 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 09:41:45 -07:00
SamGondelman
3ff81607ab fix deferred rendering on macbook air 2019-06-18 17:17:21 -07:00
Sam Gateau
251faf2171 Trying to clean up the solution... 2019-06-18 17:08:08 -07:00
raveenajain
44caf67527 init change, bias triggered via script 2019-06-18 10:02:22 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b getting rescaling to work for forward yop 2019-06-14 00:48:07 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Seth Alves
67995a8677 don't divide by zero if a grid entity-item has a zero dimension 2019-06-10 14:25:44 -07:00
Sam Gondelman
53e6e00773
Merge branch 'master' into uber 2019-06-10 10:36:54 -07:00
SamGondelman
37feb7f027 merge with master 2019-06-10 10:29:39 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
Seth Alves
8018a84e8b avoid div by zero 2019-06-04 13:00:26 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
SamGondelman
476f0ed012 cleanup and fixing some issues 2019-06-03 20:45:46 -07:00
SamGondelman
6111c8a108 initial work on combining shader variants 2019-06-03 19:36:01 -07:00
SamGondelman
3f42d083f5 fix some transparency issues on amd 2019-06-03 16:14:09 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
SamGondelman
43874fbfb3 fix AA toggle 2019-05-20 17:21:10 -07:00
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -07:00
SamGondelman
0039fb2f54 attempt to fix material crash 2019-05-17 14:51:42 -07:00