Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 00:27:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
77807 commits 69 branches 56 tags 1.2 GiB
Commit graph

814 commits

Author SHA1 Message Date
Wayne Chen
390ce9bb26 wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -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