60745 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	24d109cfe7	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 12:13:38 -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
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07: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
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
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
Zach Fox	952160874c	Stringmatch Domain ID instead of placename for DVV	2017-10-18 11:21:03 -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
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07: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
Thijs Wenker	7b2dbc34dc	Merge pull request #11622 from ctrlaltdavid/21572 ... Fix importing entities from URL	2017-10-18 14:25:42 +01: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
Cain Kilgore	16467128a2	WL 21571	2017-10-18 02:42:08 +01:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	52813d1abe	Merge pull request #11607 from jherico/fix/cmake_command_line ... CMake tweaks	2017-10-17 17:39:54 -07:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Seth Alves	e9d4da5a01	Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard ... Fix web3Doverlays and webEntities keyboard not showup	2017-10-17 17:32:04 -07:00
Bradley Austin Davis	9e46e288b1	Merge pull request #11604 from SamGondelman/endSphere ... Scale LaserPointer end overlay in C++	2017-10-17 16:37:35 -07:00
druiz17	9a881c5e57	fix keyboard	2017-10-17 15:43:23 -07:00
Nissim	5249e97fa0	Merge branch 'master' into hazeZone	2017-10-17 15:09:22 -07:00
Nissim	845f3e4bee	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone	2017-10-17 15:03:57 -07:00
Nissim	935180bf09	Fixed my bloody stupid mistake...	2017-10-17 15:02:05 -07:00
Andrew Meadows	5225ca3ca7	Merge pull request #11448 from jherico/future/clang_format ... Use clang format to enforce coding standards	2017-10-17 13:34:01 -07:00
Seth Alves	aaf3c24a44	handle camera-relative controller joints for other avatars	2017-10-17 12:36:15 -07:00
Nissim	d53aadc617	Merge branch 'master' into hazeZone	2017-10-17 12:13:40 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00