57722 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	ab8bccf16b	Implement cloning action	2017-07-30 11:03:19 +12:00
David Rowe	48ee7a3b1a	Add icon for clone tool	2017-07-29 17:39:23 +12:00
David Rowe	18a9dad918	Add button for clone tool	2017-07-29 17:15:33 +12:00
David Rowe	676deb8a5c	Make grip naming consistent with trigger naming	2017-07-29 16:16:48 +12:00
David Rowe	1d500dd3aa	Use dominant hand setting and handle setting changes	2017-07-29 16:10:48 +12:00
David Rowe	19fc8b2ed0	Merge branch 'master' into vr-edit-a	2017-07-29 15:01:03 +12:00
David Rowe	30595c78a0	Fix button not unpressing when cursor moves off it	2017-07-29 14:51:58 +12:00
David Rowe	52a2538d73	Fix scale handles not displaying after delete entity	2017-07-29 14:41:58 +12:00
David Rowe	9f90960a12	Make grip press discard tool	2017-07-29 13:31:08 +12:00
David Rowe	f4b2e399ef	Fix multiple and malingering tool icons	2017-07-29 12:54:21 +12:00
David Rowe	c201e7b65a	Display placeholder for tool icon on dominant hand	2017-07-29 10:59:15 +12:00
Chris Collins	cfd9f8b64e	Merge pull request #11077 from jherico/overlay_event_crashes ... Fix overlay event handling thread issues	2017-07-28 15:56:09 -07:00
anshuman64	e11388f7f7	Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal ... Add a "dominant hand changed" signal	2017-07-28 15:17:50 -07:00
Brad Hefta-Gaub	dd310b8661	Merge pull request #11076 from birarda/bug/blank-create-tabs ... fix blank create tabs in HMD	2017-07-28 15:07:17 -07:00
Brad Davis	d42052a299	Fix overlay event handling thread issues	2017-07-28 14:56:21 -07:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
David Rowe	2a654b3657	Merge branch 'master' into vr-edit-a	2017-07-29 08:34:58 +12:00
Brad Hefta-Gaub	c200d40862	Merge pull request #11063 from nimisha20/patch-2 ... Updating with the latest dependency info	2017-07-28 13:30:28 -07:00
anshuman64	defc76c9cf	Merge pull request #11075 from jherico/tablet_scripting_crash ... Fix tablet button crash	2017-07-28 11:57:27 -07:00
Brad Davis	3d0c13915a	Fix tablet button crash	2017-07-28 11:20:57 -07:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi ... Midi support for Entities	2017-07-28 10:51:43 -07:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
Chris Collins	20513ccf83	Merge pull request #11069 from jherico/overlay_deadlocks ... Prevent deadlocks from Overlays update logic recursing into other Overlays calls	2017-07-28 09:25:26 -07:00
Brad Hefta-Gaub	3e1174a4ca	Merge pull request #11070 from kencooke/master ... Merge pull request #10987 from SamGondelman/hmd59Crash2	2017-07-28 08:27:28 -07:00
Chris Collins	4684b388c7	Merge pull request #10987 from SamGondelman/hmd59Crash2 ... Fix crash when putting on HMD for Qt 5.9	2017-07-28 07:41:07 -07:00
Brad Davis	bb57504498	Prevent deadlocks from Overlays update logic recursing into other Overlays calls	2017-07-27 19:39:22 -07:00
David Rowe	c1d179eba1	Add "dominant hand changed" signal	2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub	d572510770	Merge pull request #11009 from AndrewMeadows/fix-QueryAACube ... update EntityItem bounding cube when on changed dimensions	2017-07-27 18:21:06 -07:00
Andrew Meadows	6b386000db	initialize 'success' and use for return value	2017-07-27 17:11:13 -07:00
nimisha20	55e23a3106	Update BUILD.md	2017-07-27 16:57:08 -07:00
burtsloane	e557f759b5	Update Midi.cpp	2017-07-27 16:17:23 -07:00
utkarshgautamnyu	1beec26003	Update TabletAssetServer.qml	2017-07-27 15:55:55 -07:00
utkarshgautamnyu	a6a4bd5923	Update AssetServer.qml	2017-07-27 15:55:30 -07:00
David Rowe	64f5fe4009	Make Create palette a separate object	2017-07-28 10:36:54 +12:00
utkarshgautamnyu	07fc9a6dc3	Indentation fixes	2017-07-27 14:53:49 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
David Rowe	9fe3a823ee	Fix unexpectedly deleting multiple entities	2017-07-28 09:35:29 +12:00
David Rowe	21c15120ba	Raise Tool menu up a little to accommodate wooden mannequin's hand	2017-07-28 09:24:15 +12:00
David Rowe	01f37b53e9	Fix non-dominant hand ciursor dot showing when it shouldn't	2017-07-28 09:20:21 +12:00
nimisha20	f7add1f6c6	Updating with the latest dependency info	2017-07-27 13:17:42 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Brad Hefta-Gaub	3aca1e1d84	Merge pull request #11004 from highfidelity/express_custom_install ... Added a page in installer for express/custom installation	2017-07-27 13:14:56 -07:00
anshuman64	bcb819206b	Merge pull request #11037 from sethalves/bug-camera-mode-mods ... use Qt menu hotkeys to drive camera-mode changes	2017-07-27 09:44:53 -07:00
David Rowe	52bb4a0f77	Merge branch 'master' into vr-edit-a	2017-07-27 20:37:46 +12:00
Chris Collins	ef67029837	Merge pull request #10912 from amvmoody/21374 ... WL 21374: Allow lights/particles to be dragged by icon	2017-07-26 22:07:36 -07:00
Chris Collins	853101fcbc	Merge pull request #10928 from 1P-Cusack/21362 ... Add point and thumb up gestures to the Vive.	2017-07-26 22:07:14 -07:00
David Rowe	86f33727eb	Add prototype Create palette	2017-07-27 16:53:15 +12:00
David Rowe	e8c5e1c2d5	Make the button move down when pressed	2017-07-27 16:05:32 +12:00
David Rowe	3b111b85ef	Move UI to hand	2017-07-27 15:56:42 +12:00
David Rowe	573a49853a	Tidying	2017-07-27 15:09:22 +12:00