529 commits

Author	SHA1	Message	Date
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
David Back	47e8e26255	CR indent fixes	2018-03-06 14:05:24 -08:00
David Back	b74be92fd8	redo scale handles to fix scaling into avatar collision causing chaos	2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez	15c1f5ba30	fixed log spam undefined error	2018-03-06 11:01:50 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
Elisa Lupin-Jimenez	b8fd640ddf	fixed log spam undefined error	2018-02-27 16:44:45 -08:00
Seth Alves	c534e3a6e4	Merge pull request #12356 from ctrlaltdavid/21742 ... Handle tablet entities and overlays not being available	2018-02-22 08:48:13 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
John Conklin II	6148c407a5	Merge pull request #12422 from misslivirose/fix-overlay-lines ... Show outline for zones when rotating	2018-02-20 09:30:22 -08:00
Liv Erickson	175532c444	show outline for zones when rotating	2018-02-15 15:51:54 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
Dante Ruiz	e14f46101b	fix tablet rotation when switching into and out of create mode	2018-02-14 13:49:43 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
David Rowe	b1f49be790	Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 10:04:32 +13:00
David Rowe	033b85a3a8	Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 09:42:40 +13:00
SamGondelman	5337377ef5	Merge remote-tracking branch 'upstream/master' into decals	2018-02-09 14:40:20 -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 Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13: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 Rowe	0c0734a255	Remove unused Overlays property, borderSize, and associated code	2018-02-04 14:54:14 +13:00
David Rowe	8e2a3e8c99	Remove Overlays.getOverlayObject() from JavaScript API	2018-02-04 14:15:48 +13: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
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -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
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Dante Ruiz	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08:00
Seth Alves	0edf056b78	Merge pull request #11755 from MidnightRift/patch-1 ... Fix controllerDispatcherUtils file path	2017-11-07 13:22:18 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Midnight	e2ca3c6de0	Fix lib file path ... Changed the include to what should be the correct file path. it does not exist in the controllers folder.	2017-11-05 13:39:26 -07:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
Daniela	2ceba76ba2	yaw tool	2017-10-27 11:28:44 +01:00
Daniela	a1110bf28d	Rotations now happen using the correct axis taking into account the avatar referential	2017-10-26 16:52:58 +01:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
Daniela	f15038c54f	Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool.	2017-10-23 19:11:32 +01:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Daniela	b28a99c2af	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-10-19 18:06:23 +01:00
Daniela	a02ee5b7d5	Grabber Tool Move up, remove billboard on grabbermoveupoverlay	2017-10-19 18:05:51 +01:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
Dante Ruiz	d14e6b6e5a	Merge pull request #11450 from ElderOrb/case7722 ... 7722 Add onHover Outline to Tablet "X" Button	2017-10-13 11:38:38 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities ... Import av entities	2017-10-12 13:30:53 -07:00
beholder	8c7462f012	fine-tuning based on discussion with Anshuman	2017-10-12 22:21:40 +03:00
beholder	9c15af9fbe	raise highlight above button overlay to reduce flickering	2017-10-12 14:46:01 +03:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Melissa Brown	662bb6c103	Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 ... [Case 6491] Remainder of entitySelectionTool clean up (details below).	2017-10-10 10:36:14 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" ... This reverts commit 28a8b18060.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00