59507 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	a2d8152a3a	Coding standard	2017-09-22 07:13:32 +12:00
Seth Alves	fc3e259f6f	remove debug prints	2017-09-21 11:42:30 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
Zach Fox	81be62b6f7	Check if ContextOverlayInterface is enabled before highlighting	2017-09-21 09:34:15 -07:00
druiz17	65e0c99618	small change	2017-09-21 09:07:49 -07:00
samcake	c74385dc8b	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue-bis	2017-09-21 09:06:41 -07:00
samcake	9a9d13e519	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-21 09:05:46 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
Sam Gateau	11dd4d2945	Merge pull request #11353 from jherico/clean_runtime ... Remove old versions of the VC Runtime from the installation directory	2017-09-21 09:02:57 -07:00
samcake	5dc4e89e4c	Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis	2017-09-21 08:56:02 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Andrew Meadows	fcff198b61	Merge pull request #11410 from humbletim/21545 ... WL 21545: Fix up the doppleganger mirror script	2017-09-21 08:47:24 -07:00
Andrew Meadows	b803344f0c	Merge pull request #11421 from jherico/fix/transform_log_spam ... Don't add items to the scene graph until they have a valid parent chain	2017-09-21 08:42:56 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
Bradley Austin Davis	cf1e13dfeb	Merge pull request #11426 from samcake/game_render_interface ... Game render interface	2017-09-21 08:29:40 -07:00
beholder	8085d0292d	7723 Tablet Should Rotate Faster when using Create app	2017-09-21 16:26:54 +03:00
Atlante45	dd050e103f	Don't redirect to the same hash.	2017-09-20 18:45:45 -07:00
samcake	ad1cab71f3	Merge branch 'master' of https://github.com/highfidelity/hifi into game_render_interface	2017-09-20 18:10:37 -07:00
samcake	cdf66887ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis	2017-09-20 18:09:28 -07:00
samcake	d112ffd8d6	Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d	2017-09-20 18:06:49 -07:00
Sam Gateau	daf18156f9	Merge pull request #11418 from SamGondelman/laserLaser ... Don't let scripts control visibility of laser pointer overlays	2017-09-20 17:54:00 -07:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
David Rowe	4ce5e4ac46	Fix recording just made not playing back if reload it	2017-09-21 12:19:32 +12:00
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
Anthony J. Thibault	5e93c13856	warning fix	2017-09-20 16:36:33 -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
Anthony J. Thibault	09c61deda8	Fixes for Vive puck calibration	2017-09-20 15:41:49 -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