Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 23:55:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85500 commits 24 branches 28 tags 1.2 GiB
Commit graph

915 commits

Author SHA1 Message Date
Sam Gateau
e4518ba234 Fixing the bins and exploring the REpeater 2019-03-04 23:44:14 -08:00
Sam Gateau
3d2614498b ANd fuck 2019-03-04 18:07:02 -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
Dante Ruiz
20d933ce6e recenter log window when enter and exiting hmd mode 2019-01-28 13:58:29 -08:00
sabrina-shanman
556a2ec3b6 Add material inspector to Luci.js 2019-01-18 18:15:44 -08:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
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
770da220d7 cleanup entity properties more and start polyline work, remove lines 2018-12-12 16:47:35 -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
811b01816b CR round 3 2018-11-08 10:41:31 -08:00
Zach Fox
e0ca535853 CR round 2 2018-11-08 10:08:42 -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
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-11-06 14:21:14 +05:30
sam gateau
592c2b267d Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-30 15:07:20 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Ryan Huffman
5c5a5c9cd2 Add optional default scripts log suppression 2018-10-24 16:23:10 -07:00
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
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Anthony Thibault
3e68a1d5a5 Merge branch 'master' into feature/acceleration-limit-filter 2018-10-18 16:51:57 -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
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-10-18 21:05:20 +03:00
sam gateau
04383dae09 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-17 16:33:57 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07: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
Anthony Thibault
fede22499c Added app to control exponential filters on vive trackers, in real time 2018-10-15 11:58:13 -07:00
Anthony Thibault
717a5ed31b Added snap threshold to AccelerationLimiterFilter 2018-10-11 09:22:12 -07:00
Anthony Thibault
e5c2605ac2 Added filtered-puck-attach app to test filters on tracked objects. 2018-10-10 17:53:14 -07:00
Anthony Thibault
09c3b39f0d Update puck-attach.js with model that matches the orientation of the pucks 2018-10-10 14:00:16 -07:00
Anthony Thibault
8d56a313e8 renamed viveTrackedObjects.js to drawTrackedObjects.js 
Removed requirement of having a Vive hooked up.  Input recordings can have trackedObjects within them.
 2018-10-09 14:05:26 -07:00
Anthony Thibault
8c8b30c0f9 Removed deceleration updated app 2018-10-09 10:51:02 -07:00
Anthony Thibault
527c0d4195 Added accelerationFitlerApp. 
Attempts to make deceleration limit filter work better.
 2018-10-09 10:51:02 -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
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -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
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Thijs Wenker
eeda7400c9 check if id matches in filtered getMultipleEntityProperties 2018-10-01 19:36:53 +02:00
Olivier Prat
7f6c9a6cc1 Switched to sin based HBAO 2018-10-01 19:22:54 +02:00
Thijs Wenker
e266e2ebbf filter getEntity(Multiple)Properties entities unitTest 2018-09-29 02:44:11 +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
f12cd2e55a Merged with master 2018-09-11 10:19:40 +02:00
John Conklin II
b184ad1334
Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955 
MS13955: Audio Stats are blank
 2018-09-10 17:03:31 -07:00
John Conklin II
e578b047b0
Merge pull request #13838 from danteruiz/fix-hmd-debug-window 
fixing scripting window visiblity and size issues
 2018-09-07 11:47:44 -07: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
4844f06e5e brain freeze 2018-08-29 17:33:39 -07:00
Wayne Chen
796a18a48a Merge branch 'master' of https://github.com/highfidelity/hifi into fixAudioStats-RC71-13955 2018-08-29 16:13:54 -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
054f30b0de Merging with master 2018-08-22 13:30:44 -07:00
Sam Gateau
3aa47a6695 Merging with master after a bunch ofchanges 2018-08-22 08:46:40 -07:00
Wayne Chen
5cf6b57f7f removing description - hassle-free fix 2018-08-21 17:25:21 -07:00
Wayne Chen
9a0807ee0e Merge branch 'master' of https://github.com/highfidelity/hifi into fixAudioStats-RC71-13955 2018-08-21 16:16:07 -07:00
Sam Gateau
1914f1f103 Extending the default size of the regions to 16km 2018-08-21 10:10:39 -07:00
Dante Ruiz
9f289711ce fixing scripting window visiblity and size issues 2018-08-17 14:33:21 -07:00
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -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
Sam Gateau
16bf46ea34 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 14:22:52 -07:00
Sam Gateau
9295007d99 fixing the ui script and trying to get shadow 2018-08-08 09:22:31 -07:00
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
Sam Gateau
09d33177fc Adjust Workload and better representation of the workload debuging features 2018-08-06 15:36:25 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Wayne Chen
f19a553e27 adding fix for HMD mode 2018-07-31 10:49:30 -07:00
Wayne Chen
b020e17ee7 rectifying toggle graph behavior 2018-07-31 10:46:19 -07:00
Wayne Chen
78001a4e31 adding fix 2018-07-30 18:44:39 -07:00
Thijs Wenker
e2d7431456 move agent scripting interface to its own class to get rid of deprecated API 2018-07-24 16:54:24 +02:00
Sam Gateau
bff372a118 Merge with master 2018-07-13 13:00:00 +02:00
Sam Gateau
1b56653228 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-11 11:57:42 +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
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Sam Gateau
24c5525a90 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-06-27 15:31:00 +02:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID 
Include shapeID in RayPick results
 2018-06-26 10:25:39 -07:00
humbletim
b73a957935 changes per PR 2018-06-25 14:17:33 -04: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
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
Sam Gateau
6011ef5390 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-06-18 12:50:19 -07:00
Sam Gateau
11a240e2db Exploring the performance profile of the render engine 2018-06-18 12:47:13 -07:00
Andrew Meadows
222756371e set max region radiuses in workload UI 2018-06-18 10:31:41 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
John Conklin II
b43d5287e2
Merge pull request #13286 from ElderOrb/spinbox-bugs 
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
 2018-06-14 10:21:17 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
Alexander Ivash
8d213efa75 introduce test 'controls gallery' application for controls testing 2018-06-04 21:26:56 +03:00