59331 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	27350bd7de	Don't add items to the scene graph until they have a valid parent chain	2017-09-20 16:52:23 -07:00
druiz17	2c55419c60	change tablet forward offset	2017-09-20 16:49:45 -07:00
Dante Ruiz	4f328524b1	Merge pull request #11182 from vladest/audio_devices_split ... Audio devices split	2017-09-20 16:43:30 -07:00
Seth Alves	90c97319ea	Merge pull request #11408 from druiz17/fix-tablet-input ... fixing/improving and cleanup tablet inputs	2017-09-20 16:36:07 -07:00
Clément Brisset	48bb36a249	Merge pull request #11423 from birarda/feat/auto-bake ... fix baking of skybox immediately upon query	2017-09-20 16:03:10 -07:00
Cain Kilgore	45f79b4341	Small fix	2017-09-21 00:00:24 +01:00
Stephen Birarda	f6d3960160	fix call to maybeBake when looking at skybox	2017-09-20 15:58:52 -07:00
Thijs Wenker	4d99430ef1	Merge pull request #11419 from highfidelity/feat/optional_makeUserConnection_debug ... Optionalize the debug spam of makeUserConnection.js	2017-09-20 15:49:17 -07:00
Cain Kilgore	322b7fc060	Cleanup from Merge	2017-09-20 23:37:33 +01:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
Cain Kilgore	a4655b9c73	Merge branch 'master' of https://github.com/highfidelity/hifi into 21542	2017-09-20 23:25:26 +01:00
Cain Kilgore	f06c04e1b0	Fixed things	2017-09-20 23:24:56 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
Thijs Wenker	7ea1968b33	Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)	2017-09-20 14:59:15 -07:00
Thijs Wenker	60a566768a	removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script	2017-09-20 14:39:13 -07:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
vladest	c48aba423a	Rename check box	2017-09-20 22:48:39 +02:00
vladest	7c049d2764	Merge branch 'master' into audio_devices_split	2017-09-20 22:38:42 +02:00
anshuman64	4a95023a2d	Merge pull request #11399 from cain-kilgore/21540 ... WL 21540 - Make Rotation using Vive Controller Work	2017-09-20 13:25:33 -07:00
Stephen Birarda	e75ece8fc4	Merge pull request #11415 from birarda/feat/auto-bake ... change include for QUrlQuery to be consistent	2017-09-20 12:56:52 -07:00
Stephen Birarda	29a9331f14	change include for QUrlQuery to be consistent	2017-09-20 12:55:50 -07:00
Seth Alves	a4082dc7e9	Merge pull request #11411 from ctrlaltdavid/21546 ... Fix Record app's toolbar button not highlighting when app dialog open	2017-09-20 12:31:33 -07:00
Seth Alves	1ca42cc632	Merge pull request #11414 from druiz17/fix-tablet-position ... Fix tablet up orientation for wiki planet	2017-09-20 12:30:00 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
Cain Kilgore	4d904bd5ce	Changed naming of avatarGrav	2017-09-20 18:43:16 +01:00
Cain Kilgore	506226ead0	Merge branch 'master' into 21542	2017-09-20 18:22:34 +01:00
druiz17	e78d8bc132	tablet on wiki planet	2017-09-20 09:11:06 -07:00
David Rowe	80f56e48ca	Fix Record app's toolbar button not highlighting when app dialog open	2017-09-20 16:50:19 +12:00
humbletim	708698f079	potential fix for the doppleganger "scrunching into a ball" issue	2017-09-19 23:21:46 -04:00
Clément Brisset	0f3834ded4	Merge pull request #11398 from birarda/bug/localhost-admin ... flag node as local by IP from UDP header, not IP from packet data	2017-09-19 17:43:21 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
Chris Collins	3209a49a7d	Merge pull request #11407 from Atlante45/new-master ... Update master from stable	2017-09-19 15:55:41 -07:00
Atlante45	23fa2707dd	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-09-19 15:45:15 -07:00
Stephen Birarda	fa839b8ee3	Merge pull request #11406 from birarda/feat/auto-bake ... add memory include for unique_ptr in BakeAssetTask	2017-09-19 15:36:10 -07:00
Stephen Birarda	d4e35edc84	add memory for unique_ptr in BakeAssetTask	2017-09-19 15:08:44 -07:00
Andrew Meadows	3b3a8c8f5e	Merge pull request #11403 from Atlante45/fix/openssl-build-instructions ... Fix OpenSSL build instructions	2017-09-19 14:29:48 -07:00
vladest	7a36894f76	Make sure audio device not gets unchecked	2017-09-19 23:25:41 +02:00
Chris Collins	0a213e24c4	Merge pull request #11389 from highfidelity/RC-55 ... Beta Release 55 - Includes up to Developer Release 7127	2017-09-19 14:23:58 -07:00
Ryan Huffman	20759b0c97	Merge pull request #11404 from birarda/feat/auto-bake ... add abort on shutdown to Baker/FBXBaker/TextureBaker	2017-09-19 14:20:56 -07:00
Stephen Birarda	a8ac015bc4	address code review comments	2017-09-19 13:56:42 -07:00
Clément Brisset	a6376fcc12	Merge pull request #11402 from huffman/fix/remove-fbxcpp ... Remove FBX.cpp and other cleanup	2017-09-19 13:54:50 -07:00
Stephen Birarda	e1d79ee8f4	add abort to Baker and subclasses	2017-09-19 13:18:23 -07:00
Stephen Birarda	0d166cc250	Merge pull request #11400 from Atlante45/feat/auto-bake ... Remove unused Algorithms.h	2017-09-19 12:44:15 -07:00
vladest	10f7f08171	Added peak model, missed during merging	2017-09-19 21:42:52 +02:00
Atlante45	1f485ac8f8	Fix OpenSSL build instructions	2017-09-19 12:07:24 -07:00
Ryan Huffman	5950006111	Remove extraneous logging	2017-09-19 11:18:25 -07:00
Ryan Huffman	641addf397	Remove FBX.cpp	2017-09-19 11:13:39 -07:00