532 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	0ac9601ea7	Merge pull request #7690 from ZappoMan/improveHMD ... Introduce "recommended overlay rectangle" to display plugins	2016-04-18 18:04:21 -07:00
Anthony J. Thibault	efb6a5c3f6	hifi-boot.js: Coding convention update	2016-04-18 09:49:09 -07:00
Brad Hefta-Gaub	8f3d48190a	switch to QRect instead of vec4	2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub	6b5fd1e807	code review feedback	2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub	d5a46d3390	handle repositioning of qml windows	2016-04-15 20:01:14 -07:00
Anthony J. Thibault	d02836a0cb	Add jasmine 2.4.1 unit test library ... Along with a customized hifi-boot.js file that configures jasmine reporting to run within hifi.	2016-04-15 10:58:45 -07:00
Brad Hefta-Gaub	c7f58dc17c	first cut at exposing recommend overlay rectangle	2016-04-14 20:47:31 -07:00
David Rowe	1cb08952ae	Merge branch 'master' into 20855 ... Conflicts: interface/resources/qml/ToolWindow.qml	2016-03-30 12:01:45 +13:00
Brad Davis	ae82298e1b	Working on the App JS <-> HTML JS communication	2016-03-28 10:09:22 -07:00
James B. Pollack	e261519b11	Update utils.js ... remove extra letter that would be crashing things	2016-03-25 19:29:18 -07:00
ericrius1	e5364fd186	update	2016-03-22 17:33:18 -07:00
ericrius1	a0e8e00357	removed cache defeating code and fixed whitespace	2016-03-22 15:02:00 -07:00
ericrius1	918c61c166	removed extra code from virtualBaton	2016-03-22 10:34:10 -07:00
ericrius1	1c876fe110	update	2016-03-22 10:16:49 -07:00
ericrius1	f043b27a56	hardcoded num avatars	2016-03-22 10:12:44 -07:00
ericrius1	130eb6b619	working for one;	2016-03-22 10:07:59 -07:00
ericrius1	2dce75bfb0	baton sound	2016-03-21 17:22:18 -07:00
ericrius1	51508b467c	uupdate	2016-03-21 15:59:03 -07:00
ericrius1	b4509e428b	bugs	2016-03-21 15:37:20 -07:00
David Rowe	01685b2d44	Change entity editor tab name	2016-03-19 14:58:12 +13:00
David Rowe	62b24e6626	Explicitly enable button-down behavior in scripts	2016-03-17 11:49:49 +13:00
David Rowe	004a694741	Make toolbar buttons "click"	2016-03-17 11:25:37 +13:00
David Rowe	46a953885f	Increase size of frame around and between buttons ... Makes easier to click and drag toolbar to new position.	2016-03-16 11:43:11 +13:00
David Rowe	3a28772729	Regularize toolbar margins and make draggable from all four sides	2016-03-16 10:29:26 +13:00
PhilipRosedale	c11487735f	Adjust grab handle sizes	2016-03-09 17:46:38 -08:00
PhilipRosedale	6017db0f31	Adjust grab handle sizes	2016-03-09 17:43:44 -08:00
PhilipRosedale	42f6ede43c	azimuth = elevation, duh	2016-02-29 10:22:24 -08:00
PhilipRosedale	d1bc31afb6	azimuth function is really just a ratio	2016-02-29 10:16:34 -08:00
PhilipRosedale	cee79c8274	Fixed bug in rayPlane test	2016-02-28 15:44:23 -08:00
PhilipRosedale	e9aed83920	suppress debug messages	2016-02-28 12:41:40 -08:00
PhilipRosedale	1d681a2461	Add angular size and azimuth limits to object XZ translation	2016-02-28 12:00:13 -08:00
PhilipRosedale	47504a068e	remove unused code	2016-02-26 16:58:38 -08:00
PhilipRosedale	7fd88793dc	drag relative to plane where pointer collided selection box	2016-02-26 16:58:17 -08:00
ericrius1	0a6a35ddd8	need multiple explosions at once	2016-02-24 16:30:29 -08:00
Ryan Huffman	e6ccf501fa	Merge pull request #7135 from zzmp/fix/grid ... Update renderGrid to use a shader, and fix grid edit tools	2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub	2810be8787	fix scripts to use new API	2016-02-19 17:57:49 -08:00
Zach Pomerantz	c9362a4073	Set grid major div min to 1	2016-02-19 15:58:08 -08:00
Zach Pomerantz	5d78867197	Set grid height via global y-coord	2016-02-19 15:41:38 -08:00
Zach Pomerantz	fd6aa9a78b	Add layering to renderGrid, draw edit grid not layered	2016-02-19 13:57:32 -08:00
Zach Pomerantz	b68213f9bf	Reintroduce grid to edit.js	2016-02-18 15:48:25 -08:00
James B. Pollack	f2445e81e0	Merge pull request #7110 from ericrius1/particlesInEdit2 ... Particles in edit	2016-02-16 18:33:01 -08:00
Zach Pomerantz	8c01d5f82b	Remove camera tool's 3d hud overlays	2016-02-15 14:03:57 -08:00
ericrius1	b92c5555fe	Merge branch 'master' into particlesInEdit2	2016-02-15 09:14:37 -08:00
Howard Stearns	989192e9fd	Make randomize clearer.	2016-02-10 12:53:05 -08:00
Howard Stearns	31d72ffb8d	2 is magic.	2016-02-10 12:17:58 -08:00
Howard Stearns	4241f4b305	Convert all simple one-liners containing ') { ' to instead take up three lines.	2016-02-10 12:03:07 -08:00
Howard Stearns	4a50d7c456	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton	2016-02-07 18:41:04 -08:00
Howard Stearns	b08f364447	yes!	2016-02-07 18:29:10 -08:00
Howard Stearns	e52b910e53	connectionTest	2016-02-07 16:39:29 -08:00
Howard Stearns	b6472217c4	Clear accepted/bestPromise .winner when disconnected.	2016-02-07 16:08:40 -08:00