58558 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	072f3dfb03	removed commented out code, removed blocks from default scripts	2017-08-15 10:25:14 -07:00
David Kelly	a6390edf46	ugh	2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
Sam Gateau	2a75cde48a	Merge pull request #11185 from samcake/blue ... Fixing the graphics setting for Ambient Occlusion	2017-08-15 09:26:45 -07:00
Sam Gateau	d624413c14	Merge pull request #11189 from SamGondelman/line3DFix ... Fix drawInFront overlays only rendering in left eye	2017-08-15 09:26:18 -07:00
Seth Alves	774cb33303	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-15 09:17:52 -07:00
David Kelly	c08fce967f	forgot a warning	2017-08-15 08:58:16 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
David Kelly	ef5863d169	warnings squashed	2017-08-14 16:24:50 -07:00
SamGondelman	194b7d6655	warning	2017-08-14 16:08:07 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Zach Fox	ee4a07b10d	Merge pull request #11187 from zfox23/context_removeWhenDeleting ... Remove context overlay (if present) when removing entity	2017-08-14 15:06:20 -07:00
SamGondelman	8163430282	fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds	2017-08-14 15:03:14 -07:00
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
Anthony Thibault	9af6f2683a	Merge pull request #11083 from Menithal/experimental-face-expressions ... Opened up setForceFaceTrackerConnected	2017-08-14 14:19:08 -07:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
David Kelly	170d2b186b	url encode the base64 signature/key	2017-08-14 13:48:09 -07:00
Olivier Prat	c88082301e	Small changes to respect coding rules	2017-08-14 22:43:39 +02:00
Zach Fox	c1d771842d	Remove context overlay (if present) when removing entity	2017-08-14 13:37:50 -07:00
David Kelly	803a5c6690	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-14 13:15:04 -07:00
rick@ghostpunch.com	8d248f5ccd	Remove the attempt to determine the maximum width of a PolyLineEntity's strokes ... using the _strokeWidths[] array, as the values don't seem to correspond with reality. Use a flat 0.075M value for the maxium half of a stroke width instead.	2017-08-14 15:59:21 -04:00
David Kelly	b4b592cc00	one key file with (for now) both public and private keys in there	2017-08-14 12:53:10 -07:00
Zach Fox	a5fc47fc4d	Merge pull request #11186 from zfox23/commerce_jsonInventory ... Commerce: Use new JSON inventory format	2017-08-14 11:59:01 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
samcake	f86f22309b	fix render.json	2017-08-14 11:31:40 -07:00
samcake	465e390f7b	Redisable spectator cam from desktop	2017-08-14 10:49:08 -07:00
samcake	db1536c521	Reactivate watch dog exit	2017-08-14 10:47:58 -07:00
samcake	05b78b0df0	Just fixing the ao combo box field	2017-08-14 10:46:33 -07:00
Zach Fox	b3b118c5f7	Merge pull request #11180 from zfox23/commerce_useAsynchronous ... Commerce frontend now uses asynchronous API	2017-08-14 09:58:51 -07:00
Seth Alves	7e5999913f	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-14 09:15:52 -07:00
druiz17	d5644885fa	Merge pull request #11177 from anshuman64/icon-rename ... Correct desktop icon name	2017-08-14 08:55:17 -07:00
Olivier Prat	358373aeac	Base gradient size edition works again on Elements enter domain event	2017-08-14 11:41:01 +02:00
Olivier Prat	92d5a0c552	Fixed non working fade invert parameter	2017-08-14 11:21:47 +02:00
Cain Kilgore	619da8c415	Merge branch 'skybox-changer' of https://github.com/CainFoool/hifi into skybox-changer	2017-08-14 05:12:26 +01:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
Seth Alves	13424eb792	kinematic-grab defaults to true	2017-08-13 17:42:08 -07:00
Seth Alves	9015d69c71	fix pop at start of far-grab	2017-08-13 17:21:55 -07:00
Seth Alves	f10dc7cbd5	allow far to near-grab transition	2017-08-13 16:54:37 -07:00
Seth Alves	58b199e9f9	far-grab sort-of works	2017-08-13 15:54:03 -07:00
Seth Alves	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	e7437d66ef	if a raypick hits something that's very close, put it into the nearby-entities list	2017-08-12 17:49:02 -07:00
Seth Alves	ec93172676	far-search rays work, but nothing else about far-grab.	2017-08-12 17:27:48 -07:00
Seth Alves	505b564c62	sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase	2017-08-12 13:14:00 -07:00
Seth Alves	92cb1c9bf2	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-12 12:40:18 -07:00
Seth Alves	06780b638d	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1	2017-08-12 12:39:43 -07:00