Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 13:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75111 commits 71 branches 56 tags 1.2 GiB
Commit graph

456 commits

Author SHA1 Message Date
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
sam gateau
d8e7305f4a Removing hili for now 2018-12-18 09:16:40 -08:00
Sam Gateau
76f204b5aa Exploring the hologram 2018-12-18 00:45:12 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Sam Gateau
a295c6ffc8 scripts\developer\utilities\lib\jet\qml\TaskListView.qml 2018-12-04 22:41:36 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
Sam Gateau
aa749b0980 adressing review comments 2018-11-28 21:46:13 -08:00
Sam Gateau
ba4aec2aff Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf 2018-11-28 01:01:18 -08:00
sam gateau
f348cc35c4 separting debug in its own task 2018-11-26 15:20:45 -08:00
Sam Gateau
6b1c7bf96e restoring the engine render views and cleaning up the task / config section of the pr 2018-11-20 23:15:09 -08:00
sam gateau
44b9b92450 Getting ready for merge 2018-11-20 17:32:04 -08:00
Sam Gateau
0166d7748a Merging with master around rc76 cut time 2018-11-15 22:52:37 -08:00
Olivier Prat
85a3938cbe Switch to app for ambient occlusion debug script 2018-11-14 11:55:11 +01:00
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police 
Case 19409, Case 19468: Fading fixes and shader cleanup
 2018-11-13 15:00:23 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
sam gateau
9ada9a7ad3 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-07 12:07:15 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Alexander Ivash
82313f9464 update imports for utilities / all other qml files found 2018-11-06 14:21:14 +05:30
Wayne Chen
2296848fcb Adding potential fix for showing audio stats - depends on PR#13401 2018-11-06 14:21:14 +05:30
sam gateau
4565422876 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-23 14:02:15 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Sam Gateau
7007abf6f9 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-22 20:02:25 -07:00
SamGondelman
6572400d06 fix highlight debug script 2018-10-22 15:03:09 -07:00
Alexander Ivash
64f67d5eb7 update imports for utilities / all other qml files found 2018-10-18 22:03:50 +03:00
Wayne Chen
aa8da5ade8 Adding potential fix for showing audio stats - depends on PR#13401 2018-10-18 21:05:20 +03:00
sam gateau
5f22928006 consolidating the tools under luci 2018-10-17 12:12:13 -07:00
sam gateau
4837fd86de Desperataly trying to be efficient in js 2018-10-16 17:29:46 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Olivier Prat
dfe9deb154 Two group of config settings for SSAO and HBAO 2018-10-02 17:47:33 +02:00
Olivier Prat
454531e3c3 Switched back to cos HBAO 2018-10-02 10:26:55 +02:00
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -07:00
Olivier Prat
7f6c9a6cc1 Switched to sin based HBAO 2018-10-01 19:22:54 +02:00
Olivier Prat
349a8b39ad Added config parameter to switch between HBAO / SSAO 2018-09-27 16:39:42 +02:00
sam gateau
d8984dafa0 ui allows to enable/disable the deformer componenets 2018-09-21 16:45:21 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
sam gateau
cae2c60e7f Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:29:31 -07:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
Olivier Prat
cf739db3a5 Added AO normal to Luci 2018-09-20 18:01:02 +02:00
Olivier Prat
8a11d18f0d Quarter resolution with split rendering 2018-09-19 17:24:31 +02:00
Olivier Prat
a2abf33669 Removed falloff distance as we're directly using the radius 2018-09-18 11:45:58 +02:00