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 |
|
Olivier Prat
|
92e1fe8e5c
|
Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug
|
2017-12-08 18:02:27 +01:00 |
|
samcake
|
9a4f667059
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-08 08:50:33 -08:00 |
|
Sam Gateau
|
013d2e808d
|
Adding the hovering from the mouse from the debugHighlight.js
|
2017-12-08 03:53:56 -08:00 |
|
samcake
|
1c3b4b0c9b
|
Merging and adding Olivier's fixes to taa
|
2017-12-07 17:54:58 -08:00 |
|
samcake
|
4c1dea2b30
|
Remove uneeded files
|
2017-12-07 17:54:14 -08:00 |
|
samcake
|
ace8e153c2
|
making sure the ID of an object in the Selection list is unique and more refined debugging
|
2017-12-07 17:45:40 -08:00 |
|
samcake
|
298b9be0c2
|
Reinstall highlight debug tool
|
2017-12-07 16:13:32 -08:00 |
|
samcake
|
65f22f498a
|
remove previous version of debug highlight
|
2017-12-07 16:09:06 -08:00 |
|
samcake
|
6148458aeb
|
Workable state, need final clean up and testing
|
2017-12-07 16:04:08 -08:00 |
|
samcake
|
e0110ff7e6
|
Merging with upstream
|
2017-12-07 09:23:38 -08:00 |
|
Olivier Prat
|
e0f398dcab
|
Fixed TAA debug script
|
2017-12-07 10:35:53 +01:00 |
|
Olivier Prat
|
1ce1aca79f
|
Merged with samcake's 'black' branch
|
2017-12-07 08:59:38 +01:00 |
|
samcake
|
5500a6d11c
|
More to come
|
2017-12-06 18:02:30 -08:00 |
|
samcake
|
1483195285
|
almost complete setup working, yeah
|
2017-12-05 18:27:53 -08:00 |
|
Sam Gateau
|
1c5548b77b
|
Color picker in qml
|
2017-12-05 01:25:30 -08:00 |
|
Olivier Prat
|
0b6dcb2717
|
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
|
2017-12-05 09:18:26 +01:00 |
|
samcake
|
de410b6833
|
I need a color editor
|
2017-12-04 17:29:01 -08:00 |
|
luiscuenca
|
390c59b45c
|
Change menu and minor fixes
|
2017-12-04 15:29:01 -08:00 |
|
luiscuenca
|
5bf8367126
|
add resources
|
2017-11-22 18:17:50 -07:00 |
|
samcake
|
1514cdfb2f
|
extend the set of interface for multi highlight
|
2017-11-21 17:59:45 -08:00 |
|
Zach Fox
|
7d34b3fe67
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-11-17 15:45:03 -08:00 |
|
Olivier Prat
|
d98dfff0a8
|
Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)
|
2017-11-17 19:25:21 +01:00 |
|
Olivier Prat
|
f8c241c429
|
Merged disappearing shadow bug fix from pcf branch
|
2017-11-16 12:19:19 +01:00 |
|
Sam Gateau
|
3f5b21ec22
|
Merge pull request #11559 from Zvork/bloom
Bloom
|
2017-11-15 15:11:31 -08:00 |
|
Brad Davis
|
bb2e061d77
|
Fixing global declarations in JS
|
2017-11-15 12:00:52 -08:00 |
|
Brad Davis
|
26a745be6f
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-15 11:59:06 -08:00 |
|
Brad Davis
|
1167be4102
|
Reverting tablet API rename, cleaning up duplicated code
|
2017-11-15 11:52:55 -08:00 |
|
Sam Gateau
|
2c51e516eb
|
Merge pull request #11744 from Zvork/shadow
Shadow caster culling fix
|
2017-11-15 09:49:39 -08:00 |
|
John Conklin II
|
8592f3fd4d
|
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
|
2017-11-15 09:31:45 -08:00 |
|
Olivier Prat
|
f47a3e7d2c
|
Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake
|
2017-11-15 09:42:57 +01:00 |
|
Olivier Prat
|
5102c8e1b1
|
Merged with master
|
2017-11-14 21:56:00 +01:00 |
|
Brad Davis
|
5cf9c1bb33
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-13 10:48:21 -08:00 |
|
Olivier Prat
|
ac0e816f8c
|
Cascade selection working on shadow but not in Luci debug mode
|
2017-11-13 18:42:34 +01:00 |
|
Olivier Prat
|
7515c341ad
|
Merged with PCF fix with dithered filtering
|
2017-11-13 14:47:35 +01:00 |
|
Olivier Prat
|
dd6b7b04c2
|
Merged with master
|
2017-11-13 14:33:59 +01:00 |
|
Olivier Prat
|
fa58cf2e60
|
Merged with master
|
2017-11-13 14:07:48 +01:00 |
|
Sam Gateau
|
ecf67cc331
|
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
|
2017-11-10 15:45:03 -08:00 |
|
Brad Davis
|
7bf1b176d7
|
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
|
2017-11-10 14:21:24 -08:00 |
|
Brad Davis
|
92a3c209aa
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-10 11:44:29 -08:00 |
|
Olivier Prat
|
103e036b70
|
Shadow maps rendered in cascades
|
2017-11-10 18:30:37 +01:00 |
|
luiscuenca
|
7dfdc8da59
|
Redesign and clean of unused lineWidths
|
2017-11-09 17:50:38 -07:00 |
|
vladest
|
02625a6e28
|
Remove script from engine
|
2017-11-08 21:53:42 +01:00 |
|
vladest
|
5e32298183
|
Rework as script=only solution
|
2017-11-08 18:43:59 +01:00 |
|
Olivier Prat
|
9817cb4c44
|
Added highlight configuration in HighlightStageSetup job
|
2017-11-07 15:35:43 +01:00 |
|
Olivier Prat
|
3cc445ff02
|
Renamed outline to highlight
|
2017-11-07 11:07:25 +01:00 |
|
Brad Davis
|
d162e1cff6
|
Whitelist functionality for tablet apps
|
2017-11-04 15:14:06 -07:00 |
|
Olivier Prat
|
fcf1c301b6
|
Merge branch 'master' of git://github.com/highfidelity/hifi into bloom
|
2017-11-03 18:12:15 +01:00 |
|
Olivier Prat
|
fbcb2924e8
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-03 15:08:15 +01:00 |
|
Olivier Prat
|
4b598a6e24
|
Working stencil mask with object bounding boxes
|
2017-11-03 14:26:36 +01:00 |
|
Olivier Prat
|
f2444f9a30
|
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
|
2017-11-02 09:25:07 +01:00 |
|
Nissim Hadar
|
1357877618
|
Replaced separate RGB components of colours with vec3's.
|
2017-10-30 12:41:09 -07:00 |
|
samcake
|
7e149fe30d
|
Remove unecessary comments
|
2017-10-27 15:18:50 -07:00 |
|
samcake
|
715cf301d5
|
cleaning the layout finally
|
2017-10-27 12:00:10 -07:00 |
|
Sam Gateau
|
a2765cffbd
|
adjusting the qml again ? i just hate the layout / anchor system
|
2017-10-26 23:22:06 -07:00 |
|
samcake
|
1dbeac7b88
|
Adding the idons for Luci and cleaning up the scripts
|
2017-10-26 19:55:59 -07:00 |
|
samcake
|
79338f4316
|
removing the the unecessary files and trying using qrc:///qml
|
2017-10-26 17:12:49 -07:00 |
|
Olivier Prat
|
ae8a9e68c8
|
Added debug tool to view shadow & view frustums
|
2017-10-25 11:58:16 +02:00 |
|
Olivier Prat
|
7011fd3731
|
Removed Mac and Ubuntu warnings
|
2017-10-23 15:46:11 +02:00 |
|
Olivier Prat
|
43f9db5b70
|
Fixed small bug due to half texel offset in outline shader
|
2017-10-23 11:08:13 +02:00 |
|
Olivier Prat
|
2d49cc1a75
|
Fixed bug in debugOutline script
|
2017-10-20 12:04:20 +02:00 |
|
Olivier Prat
|
732fe3b8db
|
Improved outline debugging script for easier test plan
|
2017-10-20 11:32:43 +02:00 |
|
samcake
|
902334e1ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-10-19 12:04:01 -07:00 |
|
Olivier Prat
|
32df0209f3
|
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
|
2017-10-19 17:38:05 +02:00 |
|
Olivier Prat
|
410b1904cd
|
Fixed bug in outline.qml that associated outline tab to wrong outline job config
|
2017-10-19 17:36:16 +02:00 |
|
Olivier Prat
|
fc66dcfdea
|
Added outline to statsGPU script
|
2017-10-19 16:52:29 +02:00 |
|
Melissa Brown
|
1a3821e984
|
Merge pull request #11591 from ctrlaltdavid/21568
Add some Quat and Uuid JavaScript helper properties
|
2017-10-18 22:07:06 -07:00 |
|
samcake
|
b29f276db3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-10-18 16:42:30 -07:00 |
|
Olivier Prat
|
f63b4a64b0
|
Working debugging script with tabs
|
2017-10-18 16:02:38 +02:00 |
|
Olivier Prat
|
25b3549e04
|
Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled
|
2017-10-18 15:00:53 +02:00 |
|
Nissim
|
afa93f46e5
|
Merge branch 'master' into hazeZone
|
2017-10-17 09:28:07 -07:00 |
|
Olivier Prat
|
76589316df
|
Working debug script with multiple selection
|
2017-10-17 10:24:05 +02:00 |
|
Olivier Prat
|
9ed5185a3e
|
Multiple outline group config working
|
2017-10-17 10:01:06 +02:00 |
|
Sam Gateau
|
74b02a3e9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-10-16 20:58:11 -07:00 |
|
David Rowe
|
8d4e979dc8
|
Replace usages of AVATAR_SELF_ID previously missed
|
2017-10-17 16:38:05 +13:00 |
|
milad
|
97c255c59e
|
Fix for fogbugz:8382 to shutdown debug window on reload scripts
|
2017-10-16 16:12:54 -04:00 |
|
Sam Gateau
|
ec934335dc
|
CLeaning up the pr regarding the scripts with my branch blue
|
2017-10-15 22:34:58 -07:00 |
|
Olivier Prat
|
2658d65814
|
Preparing for outline color mask
|
2017-10-13 12:02:21 +02:00 |
|
Sam Gateau
|
18287ed45b
|
Banging my head against qml...
|
2017-10-13 01:06:40 -07:00 |
|
samcake
|
8994200d01
|
Trying to integrate the tool scripts as an app
|
2017-10-12 17:57:30 -07:00 |
|
Nissim Hadar
|
7eb9dade6a
|
Added hazeTestInitialPose.js
|
2017-10-12 17:03:33 -07:00 |
|