4009 commits

Author	SHA1	Message	Date
David Rowe	a4ecb69ea6	Merge branch 'master' into vr-edit-a	2017-09-14 12:26:20 +12:00
David Rowe	8e25ccac79	Tidying	2017-09-14 12:20:33 +12:00
David Rowe	6d42e82711	Condense create and clone to have one history entry	2017-09-14 11:52:36 +12:00
David Rowe	d501a8f7cc	Fix scaling and changing hands history	2017-09-14 11:32:58 +12:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
David Rowe	1e2a3a13da	Fix grip-delete entity history	2017-09-14 09:31:32 +12:00
David Rowe	18ce5ba30f	Add undo/redo for physics	2017-09-14 08:53:20 +12:00
David Rowe	709e7e7d90	Add undo/redo for clone	2017-09-13 15:25:40 +12:00
David Rowe	003c1c7bc5	Add undo/redo for group/ungroup	2017-09-13 15:16:16 +12:00
David Rowe	8c9026c892	Add undo/redo for scaling	2017-09-13 14:13:48 +12:00
David Rowe	97b2988005	Miscellaneous fixes	2017-09-13 14:13:23 +12:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
David Rowe	d718ea6928	Add undo/redo for move	2017-09-13 09:17:28 +12:00
Dante Ruiz	d90f6320a9	Merge pull request #8 from sethalves/controller-dispatcher-1 ... Controller dispatcher 1	2017-09-12 10:54:10 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
Seth Alves	e9918ca599	add profiling to controller-dispatcher	2017-09-12 10:52:52 -07:00
Seth Alves	a9aa6df93e	Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1	2017-09-12 10:44:29 -07:00
Seth Alves	315f874824	add profiling to controller-dispatcher	2017-09-12 10:44:09 -07:00
Seth Alves	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -07:00
David Rowe	922b712b35	Add undo/redo for coloring entities	2017-09-12 21:58:09 +12:00
David Rowe	93a5cae7d2	Add undo/redo for deleting entities	2017-09-12 21:39:30 +12:00
David Rowe	3bb3e57f71	Add undo/redo for creating entities	2017-09-12 20:59:03 +12:00
David Rowe	68c4a2f7f6	Add History object to handle history	2017-09-12 20:53:15 +12:00
David Rowe	afb47dcfb2	Add undo and redo buttons to Tools menu	2017-09-12 20:43:11 +12:00
druiz17	684aef23dc	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-11 15:08:37 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
David Rowe	be049009c8	Improve sizing of scale handles	2017-09-11 17:51:58 +12:00
David Rowe	ec6cae4105	Fix physics "grabbable" setting being applied without gravity	2017-09-11 17:04:50 +12:00
David Rowe	acf6a433a9	Don't scale z-axis of text and Web entities	2017-09-11 16:38:06 +12:00
David Rowe	18f4a3bf35	Fix hiding UI when hand is inside entity that camera isn't	2017-09-11 15:43:19 +12:00
David Rowe	ce15d0ecd0	Fix color picker circle and slider images clipping at oblique angles	2017-09-11 15:18:42 +12:00
David Rowe	bd95274a72	Merge branch 'master' into vr-edit-a	2017-09-09 20:16:09 +12:00
David Rowe	6f4f8e583b	Don't kick off physics for Text and Web entities	2017-09-09 20:15:15 +12:00
David Rowe	a7e04fcba6	Don't color particle effects	2017-09-09 20:14:09 +12:00
David Rowe	561c3e4653	Make polylines and polyvoxes able to be colored	2017-09-09 17:24:07 +12:00
Seth Alves	9c098f1a0c	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-08 17:10:02 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	42ef397b5e	fixed include path	2017-09-08 15:13:19 -07:00
druiz17	5d1a5eea4c	added test file	2017-09-08 13:45:45 -07:00
druiz17	b3e2c7ac56	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-08 13:30:48 -07:00
druiz17	e33012e522	laser on tablet update	2017-09-08 13:30:30 -07:00
Sam Gateau	ed8aa8b74d	Merge pull request #11160 from Zvork/outline ... Outline effect	2017-09-08 12:32:01 -07:00
druiz17	dbb91e5953	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-08 11:50:43 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50:19 -07:00
David Rowe	03ddf04140	Merge branch 'master' into vr-edit-a	2017-09-08 16:51:12 +12:00
David Rowe	70581ebbc1	Fix handle scaling's scaling and positioning of entities	2017-09-08 10:43:43 +12:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00