Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 08:05:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
80805 commits 71 branches 56 tags 1.2 GiB
Commit graph

398 commits

Author SHA1 Message Date
Sam Gateau
4959452c79 Dynamic creation of the propItem in the propGRoup! 2019-03-05 14:27:32 -08:00
Sam Gateau
e4518ba234 Fixing the bins and exploring the REpeater 2019-03-04 23:44:14 -08:00
Sam Gateau
fe23ef1485 Adding the prop library 2019-03-03 23:35:40 -08:00
Sam Gateau
dab0df1113 Trying to fix the damn gamma 2019-02-22 18:03:23 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -08:00
Sam Gateau
afb6c838eb REverting all the changes from the brown branch not used 2019-02-11 20:13:37 -08:00
Sam Gateau
35491bf5b0 Multisampling works in 4.1 2019-02-06 00:05:17 -08:00
Sam Gateau
4089f8c5b0 Adding Color filter to the tone mapper 2019-02-04 23:45:35 -08:00
sabrina-shanman
556a2ec3b6 Add material inspector to Luci.js 2019-01-18 18:15:44 -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
Sam Gateau
aa749b0980 adressing review comments 2018-11-28 21:46:13 -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
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
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
Olivier Prat
c27f3dcafe Some cleanup, still trying to solve the problem 2018-09-18 08:45:04 +02:00
Olivier Prat
ad5064b045 Removed falloff distance from shader 2018-09-17 14:33:48 +02:00
Olivier Prat
6b8f47c75a Added some tweaking parameters to try to limit silhouette AO 2018-09-13 18:39:02 +02:00
Olivier Prat
8006d7c052 Blur is now at occlusion resolution and added some bias to prevent AO on silhouettes 2018-09-13 15:33:44 +02:00
Olivier Prat
64a57047ac Merged with master 2018-09-06 12:01:10 +02:00
Sam Gateau
969d16262f Removing cruft and warnings 2018-08-30 22:20:30 -07:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Sam Gateau
6c502e79e3 Fine tuning a LOD regulator PV that works 2018-08-29 22:56:44 -07:00
Sam Gateau
ed4dbaa4c7 Refining the plot widget to be able to represent negative values 2018-08-29 16:07:30 -07:00
Sam Gateau
37b4cf6223 Picking pid values 2018-08-28 17:39:35 -07:00
Sam Gateau
0da22db837 Picking pid values 2018-08-28 16:05:57 -07:00
Sam Gateau
7dfdc79644 Picking pid values 2018-08-28 12:21:15 -07:00
Sam Gateau
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
Sam Gateau
8f8bcc1901 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-24 15:23:37 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Sam Gateau
57fd824005 working on the LOD behavior 2018-08-23 17:30:23 -07:00
Sam Gateau
cee9b90930 working on the LOD behavior 2018-08-23 16:48:42 -07:00
Sam Gateau
473f8d0ca5 Working on the LOD system 2018-08-23 11:39:47 -07:00
Sam Gateau
3aa47a6695 Merging with master after a bunch ofchanges 2018-08-22 08:46:40 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow 
Fixing PR13731 shader error on Mac
 2018-08-10 14:10:47 -07:00
SamGondelman
a0c3c09b05 Merge remote-tracking branch 'upstream/master' into bloom 2018-08-08 14:44:02 -07:00
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Sam Gateau
bff372a118 Merge with master 2018-07-13 13:00:00 +02:00
Sam Gateau
66199e9aab Cleaning up the isENabled interface andthe qml 2018-07-11 11:57:18 +02:00
Sam Gateau
07299291fc clarifying the engine inspector and engine profiler 2018-07-06 19:29:06 +02:00
Sam Gateau
2eec5b01fa debugging and fixing the problem to get Config for complex path 2018-07-06 10:53:09 +02:00
Sam Gateau
f34bdfa12c Merge 2018-06-24 11:51:24 -07:00
Sam Gateau
3a910489c8 Regfining 2018-06-20 16:56:35 -07:00
Sam Gateau
11a240e2db Exploring the performance profile of the render engine 2018-06-18 12:47:13 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
Sam Gateau
e1690a28e1 Merging with master 2018-05-20 23:04:11 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
samcake
adc8a07d3c Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn 2018-05-16 13:14:14 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
samcake
f08f77098d Adding a true ListView for the engine 2018-05-09 18:28:47 -07:00
samcake
859b187db6 Separate panel for inspecting the engine 2018-05-08 18:17:52 -07:00
samcake
6424b91e86 Templatizing the timeProfiler for the task 2018-05-04 17:58:21 -07:00
Sam Gateau
e1d063e908 Adding the scripts for Jet 2018-05-04 00:01:48 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
Olivier Prat
3497c93e9a Updated ambient occlusion debug script to be a tablet app 2018-04-19 18:02:31 +02:00
Olivier Prat
5978158358 Updated debugAmbientOcclussionPass script to tablet app 2018-04-11 17:21:44 +02:00
Olivier Prat
2974e05cf2 Tweaked bloom intensity mix 2018-04-10 11:13:37 +02:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate 
Workload: low hanging fruit optimization: don't unneccessarily update() entities
 2018-04-06 17:38:54 -07:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
samcake
ff5b418ddf Starting to buiuild on the jet component and adding the widget to luci and workload inspectors 2018-04-03 17:21:37 -07:00
Olivier Prat
0c2c09e77b Fixed layout in HMD 2018-03-30 15:22:48 -04:00
Olivier Prat
ef63651b2b Duration and timing controls are disabled when event is not time based 2018-03-29 12:07:56 -04:00