458 commits

Author	SHA1	Message	Date
Dante Ruiz	e14f46101b	fix tablet rotation when switching into and out of create mode	2018-02-14 13:49:43 -08:00
John Conklin II	1d0e358246	Merge pull request #12234 from dback2/newEditGrab ... New Edit Selected Entity Manipulation Handles	2018-02-09 12:23:34 -08:00
David Back	51b55aedcf	CR changes, fix colors, add minimum overlay dimensions for HMD	2018-02-06 16:07:46 -08:00
Dante Ruiz	4f0ca6a904	fix lasers going to origin	2018-02-06 13:44:59 -08:00
David Back	ececd1c60f	fix loop index change	2018-02-02 17:14:48 -08:00
David Back	ed4cbe2679	fix fill ring rotation	2018-02-02 17:05:25 -08:00
David Back	900669d937	fix multi-selection rotation yay!	2018-02-02 16:44:59 -08:00
David Back	55f55cd78b	few more updates	2018-02-01 17:59:38 -08:00
David Back	db56246cd6	more fixes, clean up, updates	2018-02-01 17:30:56 -08:00
David Back	c01790bd3e	punch list updates and various fixes	2018-01-31 18:27:15 -08:00
David Back	e679b75e99	fix degree display position	2018-01-29 19:02:36 -08:00
David Back	2f0d92c3cd	ctrl 22.5 snapping	2018-01-29 18:15:01 -08:00
David Back	9ee7153641	fix scale speed, fix stretch panels, fix scale cube highlight	2018-01-29 16:53:02 -08:00
David Back	c4359de859	entity edit tools wip update	2018-01-19 18:20:36 -08:00
David Back	26bf78fb5d	first pass new entity selection edit tools wip	2018-01-17 18:30:31 -08:00
Dante Ruiz	125eb9ce44	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
David Rowe	4b2ed44322	Reduce incidence of tablet screen being rotated w.r.t. model	2018-01-05 16:16:42 +13:00
David Rowe	936b5f3571	Laser on tablet bezel as well as screen and "x" button	2018-01-05 16:15:59 +13:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Zach Fox	a99072622a	Fix Create mode :|	2017-12-08 15:41:47 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Seth Alves	86a1bc75c9	Merge pull request #11897 from Delanir/Gizmos ... IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools	2017-12-08 07:09:09 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Daniela	ef49aa0b71	Refactor to comply with code standard.	2017-11-29 18:54:08 +00:00
Daniela	8985acd8b6	YAW ROLL PITCH tool now represents angles in a usefull way. Refactoring.	2017-11-29 13:00:36 +00:00
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -08:00
Daniela	68d5d600b7	YAW ROLL PITCH tool gizmos + functionality	2017-11-28 23:16:34 +00:00
Daniela	eb0d925091	YAW ROLL PITCH tool gizmos + functionality	2017-11-28 22:55:09 +00:00
Daniela	123f898f80	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-11-28 15:38:30 +00:00
SamGondelman	d4a4c8902a	fix reticle depth at different scales and x button click on mouse press	2017-11-27 17:46:19 -08:00
SamGondelman	52039e022b	merge from master, get rid of resolution in RayPick	2017-11-27 13:11:35 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -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
SamGondelman	393ad0079c	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
SamGondelman	42d047c572	merge with master	2017-11-17 11:52:34 -08:00
SamGondelman	e38b0ab6b8	make web overlays match web entities more, remove resolution	2017-11-17 11:50:24 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
SamGondelman	b252c81d84	fix home button hover overlay dimensions	2017-11-16 15:34:42 -08:00
Dante Ruiz	f6a74cc80e	fixing merge conflicts	2017-11-16 10:04:36 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -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
Brad Davis	64592d66d7	Fix relative path for tablet login dialog	2017-11-15 11:46:56 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00