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

787 commits

Author SHA1 Message Date
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
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
samcake
e4048c8f23 remove extra comments 2018-05-23 15:12:21 -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
02be965271 more stuff fixed 2018-05-10 18:10:01 -07:00
Sam Gateau
bf85034f36 Tree view comming together for the engine! 2018-05-10 02:08:19 -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
17f8e789fc less warning maybe ? 2018-04-25 15:53:50 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Sam Gateau
f50b2fab2b Exposing timing and regulated radiuses 2018-04-23 22:38:50 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
samcake
9b1a887469 Starting to move dynamically yeah 2018-04-19 17:43:14 -07:00
samcake
9b3d546dad Exposing the on off to use the distance configs 2018-04-19 09:35:57 -07:00
Olivier Prat
3497c93e9a Updated ambient occlusion debug script to be a tablet app 2018-04-19 18:02:31 +02:00
Sam Gateau
fd752a07c1 Proposing a more flexible design for the engine 2018-04-17 02:05:35 -07:00
samcake
2008c61368 more ui test features 2018-04-16 17:58:13 -07:00
samcake
bfdde6513f Mergin with master 2018-04-12 15:45:27 -07:00
Sam Gateau
2ca24485e0 and again 2018-04-12 02:11:47 -07:00
Sam Gateau
d0ed5466be Better experimentation 2018-04-12 01:32:20 -07:00
Sam Gateau
9c4c1bf10f Better experimentation 2018-04-12 00:03:04 -07: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
6acda83f5c Bringing the test to the workload ui 2018-04-09 23:13:39 -07:00
samcake
87b3f9bd1f More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:55 -07:00
samcake
72649f5c06 More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:40 -07: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
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -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
samcake
54e2ad06b8 GOing over the jet lib ui and the nightmare that is the js/qml family 2018-04-02 17:59:28 -07:00
Sam Gateau
dada0b9024 Exploring better task job config api that work 2018-04-02 01:09:35 -07:00
Sam Gateau
9e2295525d merging with upstream workload after it s been updated with master 2018-03-31 13:31:20 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Olivier Prat
0c2c09e77b Fixed layout in HMD 2018-03-30 15:22:48 -04:00
Dante Ruiz
420672a769 fix-qml-confict 2018-03-29 11:24:08 -07:00
Olivier Prat
ef63651b2b Duration and timing controls are disabled when event is not time based 2018-03-29 12:07:56 -04:00
Olivier Prat
648e6a6c9b Added description for each event 2018-03-29 10:47:18 -04:00
Olivier Prat
07cb1c1f9e Moved gradient invert checkbox 2018-03-29 10:19:24 -04:00
Olivier Prat
9a7f88cd78 Moved save / load buttons to top 2018-03-28 19:23:09 -04:00
Olivier Prat
6639a245df Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden 2018-03-28 18:20:10 -04:00
Olivier Prat
e4416db06f Added save/file dialog for transition configurations in transition editor 2018-03-28 16:54:53 -04:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
samcake
025730a329 Just merging with master and trying to see the ui working again... 2018-03-26 18:24:01 -07:00
Olivier Prat
6b44d79f90 Proposal to improve fade editing with some extra visual cues 2018-03-20 17:48:41 -07:00
samcake
a678a38211 Merge with master 2018-03-20 17:35:57 -07:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash 
Fix invalid QML surface cache interaction
 2018-03-20 14:26:39 -07:00
samcake
816e7a21c2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-20 09:07:41 -07:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
Olivier Prat
bafd6340a2 Removed unused fonts in scripts 2018-03-12 14:21:48 -04:00
Sam Gateau
f087bb7623 Adjust the freeze view and start drawing the views better 2018-03-09 01:38:00 -08:00
samcake
4dc3685e35 Cosmetic change to the ui and adding more feature to the ConfigSlider 2018-03-08 14:50:07 -08:00
samcake
87b159e491 merge with upstream, fixed a smal typo bug and clean up the ui 2018-03-07 17:30:11 -08:00
samcake
4a91ac11c9 Adding controls of the regions 2018-03-06 18:19:02 -08:00
samcake
b6b7cb3394 Adressing warnings issue and implementing the independent intersection test per region spheres 2018-03-06 12:39:28 -08:00
samcake
660c4c30e9 Representing the view spheres 2018-03-02 18:22:51 -08:00
samcake
5b8e18f15d Adding the pipeline to render the view spheres 2018-03-01 17:57:44 -08:00
samcake
3a9a93f502 Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item 2018-03-01 13:40:58 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Olivier Prat
d288ebe79e Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased 2018-02-26 18:07:44 +01:00
Olivier Prat
ee253143ff Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-23 14:53:14 +01:00
Olivier Prat
c9a6d6bf14 Added adjustable post sharpen filter 2018-02-23 11:53:05 +01:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Olivier Prat
f53c2f41a5 Merge branch 'master' of http://github.com/highfidelity/hifi into prev 2018-02-21 09:46:38 +01:00
Olivier Prat
9cfe53be3e Merged from orgin taa 2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Sam Gateau
040710807d
Merge pull request #12346 from Zvork/scripts 
Fix transition (ex-fade) debugging scripts
 2018-02-13 09:08:35 -08:00
Olivier Prat
733d36df47 Fixed save / load of fade effect configurations 2018-02-06 17:57:04 +01:00
Olivier Prat
fc1d9319bd Finished correcting transition.qml layouts 2018-02-06 16:31:53 +01:00
Olivier Prat
8c12ab9b76 Used color selectors in transition.qml 2018-02-06 16:19:15 +01:00
Olivier Prat
51ea89ffea Renamed fade scripts to transition scripts and still working on layout 2018-02-06 15:16:50 +01:00
Olivier Prat
2896c32bda Switched debug fade script to app but still working on broken layout 2018-02-05 17:49:31 +01:00
David Rowe
0c0734a255 Remove unused Overlays property, borderSize, and associated code 2018-02-04 14:54:14 +13:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511 
FB11511 - position of log windows should be persistent between invocations of interface
 2018-02-01 12:11:30 -08:00
Alexander Ivash
1ed7d164c4 FB11511 - position of log windows should be persistent between invocations of interface 2018-02-01 01:15:03 +03:00
Olivier Prat
3fa2babec2 Moved cascade frustum pre-computation to single ShadowSetup job 2018-01-31 11:55:46 +01:00
Olivier Prat
f344e44d26 Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time 2018-01-31 10:19:17 +01:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Olivier Prat
6b0b17ff63 Working on better adaptive bias algorithm for shadow 2018-01-26 17:57:20 +01:00
Olivier Prat
9cb5c95fe3 Added velocity buffer to deferredLighting.qml 2018-01-26 15:05:46 +01:00
Olivier Prat
5af4337b0e Merged with master 2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5 Merged with samcake/black 2018-01-25 09:27:48 +01:00
humbletim
51d8b9aea6 update and expand on js unit tests 2018-01-23 03:12:50 -05:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI 
Updated UI to fit Toolkit Standards
 2018-01-22 10:30:48 -08:00
RebeccaStankus
5db5f24043 Updated UI to fit Toolkit Standards 2018-01-19 14:52:44 -08:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
Andrew Meadows
82cab5e4a1 add scripted/qml debug UI for render LOD 2018-01-18 08:53:45 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695 
Remove old ToolWindow code
 2018-01-17 13:43:59 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI 
Fix and improve currentAPI.js
 2018-01-10 17:55:08 -08:00
Nissim Hadar
8e03ecedb9 Added user data for lat/lon. 2018-01-08 11:50:49 -08:00
nissim.hadar
b6bbf1abe1 Added sun intensity modulation as a function of altitude. 2017-12-29 23:47:42 -08:00
Nissim Hadar
9b9295aaec Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight. 2017-12-27 14:17:05 -08:00
luiscuenca
38bfddf786 Added filter for QT autogenerated functions and integrated it to Developers menu 2017-12-21 16:26:06 -07:00
luiscuenca
d93828f2f0 Fix an improve currentAPI.js 2017-12-21 11:50:02 -07:00
samcake
403e77b023 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-21 09:17:23 -08:00
humbletim
8c7a8f0df3 expanded Assets scripting interface 2017-12-21 12:04:47 -05:00
samcake
df3b4421f4 Merging 2017-12-18 12:20:56 -08:00
Olivier Prat
0fc496d44c Fixed merge conflicts with master 2017-12-18 15:23:11 +01:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00