57853 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -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
rabelaiis	119b10886f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21479	2017-07-28 06:29:10 +07:00
rabelaiis	8b7a29c3f3	remove putils reference	2017-07-28 06:22:29 +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
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
rick@ghostpunch.com	3e2dbe58ec	Style guide corrections	2017-07-27 16:39:49 -04: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
Anthony J. Thibault	bcb4cc32d2	another clang error fix	2017-07-27 10:26:10 -07:00
Anthony J. Thibault	778c8bf9a7	clang build error fix	2017-07-27 10:08:35 -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
Anthony J. Thibault	8f5c41af2d	changed _controllerPoseMap from unordered_map to map	2017-07-27 09:44:37 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
rabelaiis	dd76c30de5	Make Xylophone mallets equipable, make the mallets provide haptic feedback, fix a closing bracket bug stopping the xylophone from working and clean up code according to coding standards	2017-07-27 17:31:30 +07: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
anshuman64	2e7f62cbb3	Merge pull request #11058 from nimisha20/patch-1 ... Update BUILD_WIN.md	2017-07-26 17:50:33 -07:00
anshuman64	560cccb0df	Remove nmake troubleshooting step	2017-07-26 17:01:45 -07:00
anshuman64	081d8fbec4	More changes	2017-07-26 17:00:48 -07:00
Anthony J. Thibault	2a45c6d3dc	Removed eigen dependency, fixed Debug Draw IK Chains ... Also, clarified for special case for secondary shoulder joint look-at constraint.	2017-07-26 16:55:12 -07:00
nimisha20	c57660c82d	Update BUILD_WIN.md	2017-07-26 16:52:00 -07:00
Stephen Birarda	c6e640eba8	Merge pull request #11052 from highfidelity/bug/2157 ... added additional collision types to asset browser and new model dialog	2017-07-26 16:51:52 -07:00
Zach Fox	8a7561d61b	IT'S WORKING SOB SOB SOB	2017-07-26 16:35:55 -07:00
Zach Fox	39cb0bc357	WHYYYY DOESN'T THIS WORK	2017-07-26 16:14:35 -07:00
Seth Alves	9c9cfad4c4	use ctrl rather than alt to activate camera-mode shortcuts	2017-07-26 15:56:08 -07:00
Seth Alves	71023bcb1b	Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods	2017-07-26 15:54:57 -07:00
Zach Fox	1336a59b6c	Stupid bracket	2017-07-26 15:14:58 -07:00
Melissa Brown	e50422d5b9	Merge pull request #11034 from MrRoboman/21342-dart ... added dart scripts	2017-07-26 15:10:58 -07:00
Zach Fox	17c7e38fce	Bugfixes?	2017-07-26 15:02:52 -07:00
Zach Fox	bd5f7b85d8	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde	2017-07-26 14:11:28 -07:00
Zach Fox	1e80736718	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-26 14:11:03 -07:00
Zach Fox	3a05219c59	Closer still	2017-07-26 14:10:41 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	a960ea5ccb	Linux build	2017-07-26 13:32:23 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Liv	256853f79b	syntax and clarification on magic number 2 as half height	2017-07-26 13:28:52 -07:00
Liv	5bd6dac66c	wrap text if longer than 1m text entity	2017-07-26 13:24:56 -07:00
Zach Fox	65c28ca821	Bugfixes	2017-07-26 13:17:51 -07:00