Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 03:00:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78274 commits 25 branches 0 tags 1.1 GiB
Commit graph

4292 commits

Author SHA1 Message Date
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch 
Case 22379: Run-time switch for deferred/forward rendering
 2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
Shannon Romano
5c58cec5af
Merge pull request #15522 from SaracenOne/forward_lightmapping 
Case 22494, BUGZ-127: Render lightmaps in the forward renderer
 2019-05-13 09:13:34 -07:00
SamGondelman
59e7db2d6b Merge remote-tracking branch 'upstream/master' into switch 2019-05-09 11:42:05 -07:00
Shannon Romano
4bd41a1aa3
Merge pull request #15523 from SamGondelman/zone 
Case 22466, BUGZ-102: Fix zone rendering issues
 2019-05-08 14:52:33 -07:00
SamGondelman
04198c6bfc use weak ptrs, add comment about SelectSortItems performance 2019-05-08 13:13:05 -07:00
SamGondelman
da092cc5f0 fix zone issues 2019-05-08 11:04:54 -07:00
Saracen
410679b9b7 Render lightmaps in the forward renderer 2019-05-08 00:56:34 +01:00
Brad Davis
17632e3c50 PR feedback 2019-05-07 10:36:14 -07:00
Brad Davis
2b1267ffeb Disable the use of tbb::parallel_for in Blender 2019-05-06 16:53:37 -07:00
Shannon Romano
29e415a104
Merge pull request #15498 from SamGondelman/crash 
Case 22444: Try to fix materialMapping crash
 2019-05-02 16:29:39 -07:00
SamGondelman
50e538a73c try to fix materialMapping crash 2019-05-01 17:23:19 -07:00
SamGondelman
5a184bd584 fix model bounds 2019-04-30 13:38:11 -07:00
SamGondelman
4a02ab4fe2 move switch logic around 2019-04-29 14:07:49 -07:00
SamGondelman
ca5c7e3904 runtime switch for deferred/forward rendering 2019-04-26 14:37:27 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow 
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
 2019-04-23 09:32:53 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
Olivier Prat
7d412f9109 Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias. 2019-04-19 11:03:43 +02:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2 
Case 22244: Fix oven crash (RC83)
 2019-04-18 20:22:36 -07:00
Olivier Prat
39d03ce87a Removed magic number 2019-04-18 19:19:38 +02:00
Olivier Prat
9d0706ec8b Merge branch 'master' of https://github.com/highfidelity/hifi into shadow 2019-04-18 11:06:35 +02:00
Olivier Prat
3cb9c518ea Exposed max shadow distance and a shadow bias scale parameter in graphics::Light 2019-04-18 11:06:12 +02:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
Olivier Prat
3fc711dba2 Added opacity mask to shadow casters 2019-04-17 12:35:24 +02:00
Olivier Prat
5d7b149a9e Switched to clamped tangent for shadow slope bias 2019-04-17 11:12:59 +02:00
Olivier Prat
ae20a5d439 Fixed crash in debugShadow.js 2019-04-17 09:47:33 +02:00
SamGondelman
2d5cfbf4f5 fix oven crash 2019-04-16 15:16:26 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
38e21dcaa2 Doc review 2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker 
Case 21764: Oven bakes model materials directly to separate material description
 2019-04-05 17:08:22 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Olivier Prat
361371b2a9 Added flag to enable / disable ambient fresnel LUT 2019-04-05 08:58:06 +02:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale 
Case 22054: flat models can introduce nan into geometry
 2019-04-04 14:51:19 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Andrew Meadows
72ac35c6f7 avoid nan in Model::_scale 2019-04-04 08:28:03 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins" 
This reverts commit cb311408c6.
 2019-04-03 13:43:39 -07:00
Olivier Prat
e3355cd6a4 Trying to work uniformly with Image 2019-04-03 10:26:39 +02:00
SamGondelman
770b863604 fixing embedded textures and materialMapping priority 2019-04-02 19:04:23 -07:00
SamGondelman
7b0854c121 support selecting material in json by name with ? 2019-04-02 14:13:00 -07:00