Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08: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
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
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
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
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Olivier Prat
76305c5285
Better debugging options for bloom
2017-10-10 14:49:04 +02:00
Nissim Hadar
71f567f15a
Merge branch 'master' into hazeZone
2017-10-09 17:28:10 -07:00
Olivier Prat
0261265330
Working bloom but still visually unstable with geometry aliasing
2017-10-09 19:17:51 +02:00
Olivier Prat
98d39ff9e0
Merged with master
2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3
Multiple gaussians as Unreal. First draft
2017-10-09 09:35:38 +02:00
David Rowe
596ce8e9c1
Add script that tests setting your listening position and orientation
2017-10-07 21:46:56 +13:00
SamGondelman
b4a3ab9204
fix debugDeferredLighting
2017-10-06 15:46:10 -07:00
Nissim Hadar
d1488ebfad
Added .qml and .js for debug
2017-10-02 10:10:29 -07:00
Cain Kilgore
796e9e7ab3
Fixed things
2017-09-20 23:23:30 +01:00
Anthony J. Thibault
3f6c88e77f
Avatar Attachments now render correctly
...
* moved Avatar::fixupModelsInScene off the newly created render thread back
to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
changes in avatar attachment scale, commit 712aff7ad
.
* updated initialization of anim graph to use Model::isLoaded() instead of
Model::initWhenReady() to know when the model was completely loaded.
2017-09-15 11:23:09 -07:00
Cain Kilgore
794f3ca69f
Indentation
2017-09-15 06:09:03 +01:00
Cain Kilgore
e86b37f949
Added script for testing
2017-09-15 06:07:50 +01:00
druiz17
5d1a5eea4c
added test file
2017-09-08 13:45:45 -07:00
Olivier Prat
fe357671e1
Removed qmlc files
2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
Olivier Prat
1763ecd4c6
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-11 09:38:00 +02:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Olivier Prat
392a99f038
Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio
2017-08-09 19:18:16 +02:00
Olivier Prat
0f2c41b009
Added outline intensity
2017-08-09 18:27:39 +02:00
Olivier Prat
01a028cbb6
First alpha working version of outline
2017-08-09 18:03:52 +02:00
Olivier Prat
44ee7c4bf1
Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete
2017-08-08 18:41:57 +02:00
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
seefo
67b5921079
Changed puck-attach to make tracked entities collisionless
2017-08-03 16:01:12 -07:00