Commit graph

60854 commits

Author SHA1 Message Date
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
Olivier Prat
8229c41622 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-20 09:59:07 +02:00
Olivier Prat
3227b9d64a Fixed potential bug when item doesn't have a payload 2017-10-20 09:50:37 +02:00
Stephen Birarda
23563cca47 Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx
ignore unbakeable textures in FBXBaker
2017-10-19 15:51:41 -05:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master
Fingerpaint  PR
2017-10-19 13:13:59 -07:00
Zach Fox
24512e0cf1 Merge pull request #11631 from zfox23/commerce_OctoberFixes2
2017-10-18: Commerce frontend updates
2017-10-19 12:11:52 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Olivier Prat
6acff216d9 Reduced blur tap for slightly better performance 2017-10-19 19:00:09 +02:00
Seth Alves
a467f30993 Merge pull request #11624 from highfidelity/AlanZimmerman-patch-1
Change tablet model's screen
2017-10-19 09:40:30 -07:00
Brad Hefta-Gaub
f951a23356 Merge pull request #11627 from druiz17/reload-script
fixed toolbar disapearing after reloading default scripts
2017-10-19 09:32:36 -07:00
Brad Hefta-Gaub
e2ccfb84f9 Merge pull request #11626 from Delanir/BubbleScaleMaster
7429 IPD Secondary Task List: bubble.js Scale
2017-10-19 09:31:15 -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
Seth Alves
89ce9e6367 Merge pull request #11614 from sethalves/fix-others-adjusting-hats
handle camera-relative controller joints for other avatars
2017-10-19 08:10:04 -07:00
Olivier Prat
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02:00
Olivier Prat
382262da3d Working scissor with correct projected bounding box rect 2017-10-19 16:23:13 +02:00
Olivier Prat
111966b987 Fixed potential bug with outline frame buffer allocations. Still problems with avatar outline rect 2017-10-19 12:39:34 +02:00
Olivier Prat
cc30c0b841 Expanded scissor rect with outline blur width 2017-10-19 11:35:26 +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
Seth Alves
28d0da51b9 Merge pull request #11628 from luiscuenca/case8269
8269  controllerDispatcher is creating log spam with web entities
2017-10-18 18:11:13 -07:00
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -07:00
Sam Gateau
4d7accabdf Merge pull request #11439 from NissimHadar/hazeZone
Adding haze component to the zone entity.
2017-10-18 16:14:28 -07:00
druiz17
36912f1cd4 fixed toolbar disapearing after reloading default scripts 2017-10-18 16:03:32 -07:00
Zach Fox
77f967c7e1 Merge pull request #11623 from zfox23/mergeRC57IntoMaster_20171018
2017-10-18: Merge RC57 into Master
2017-10-18 15:52:51 -07:00
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -07:00
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Zach Fox
91ac2ab58c LowerKeyboard button changes 2017-10-18 15:31:12 -07:00
Bradley Austin Davis
aa6c841357 Merge pull request #11588 from jherico/future/qrc
Package all UI resources into a QRC built into the application.
2017-10-18 15:29:34 -07:00
Zach Fox
a993386613 Change color of 'Instructions Opened on Desktop' to disabled gray 2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b Update help text 2017-10-18 14:55:45 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Zach Fox
e829bd2919 Fix 'Recent Activity' indentation 2017-10-18 14:47:14 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
Zach Fox
6f5fafb62f Add 'showDebugButtons' switch on Help ta 2017-10-18 14:12:43 -07:00
Alan Z
6a2ee8c632 Change tablet model's screen
Changed the texture for the model's screen to say: "Loading... If nothing happens shortly, re-open tablet"
2017-10-18 10:54:18 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
John Conklin II
08cfa32858 Merge pull request #11610 from ElderOrb/case8217_RC57
8217 Search in tablet doesn't update (RC-57)
2017-10-18 10:41:33 -07:00
Olivier Prat
f890c5bb8c Added project rect and scissor test. Need to increase bounds to take into account blur width 2017-10-18 19:40:03 +02:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
Melissa Brown
8965f2aac3 Merge pull request #11620 from cain-kilgore/21571
WL 21571 - Remove "common questions" button
2017-10-18 08:38:20 -07:00
Olivier Prat
f63b4a64b0 Working debugging script with tabs 2017-10-18 16:02:38 +02:00
Thijs Wenker
7b2dbc34dc Merge pull request #11622 from ctrlaltdavid/21572
Fix importing entities from URL
2017-10-18 14:25:42 +01:00
Olivier Prat
8cabd1c953 Fixed graphics bug with filled 2017-10-18 15:06:54 +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
David Rowe
fcc7a3e440 Code review 2017-10-18 21:08:10 +13:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00