22016 commits

Author	SHA1	Message	Date
samcake	badb45c921	fixing the web surface now getting scaled when the table t is grabbed is fixed	2017-09-26 15:20:45 -07:00
samcake	510b446409	mergine with master, resolving conflict	2017-09-26 13:13:46 -07:00
Seth Alves	7397a123c5	Merge pull request #11345 from SamGondelman/textAA ... Text3D Overlays and Entities fixes and no-AA	2017-09-26 12:26:08 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Dante Ruiz	74f9e07f1a	Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu ... Move Tablet becomes toolbar menu from General to Developer menu	2017-09-26 11:26:42 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
samcake	b5c942f7f6	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-26 10:47:59 -07:00
Andrew Meadows	ec80846281	Merge pull request #11443 from SamGondelman/sharks ... Laser Pointer fixes and updates	2017-09-26 10:22:55 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
SamGondelman	0e3f1c5149	add setLaserLength, setLockEndUUID doesn't use defaultRenderStates	2017-09-22 16:11:24 -07:00
Zach Fox	702a4e9ade	More tweaking to overlay position	2017-09-22 15:32:38 -07:00
SamGondelman	cbe621f2b7	add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate	2017-09-22 15:15:15 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
Zach Fox	e3f2e70bca	No magic numbers	2017-09-22 11:43:56 -07:00
Zach Fox	430d1b22bb	Update angular size and i behavior	2017-09-22 11:41:28 -07:00
samcake	452a8f7175	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-22 11:31:33 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
samcake	b424505f65	FIxing the case of the Circle3D	2017-09-22 10:48:56 -07:00
samcake	219d63784b	REmoving the extra variables in Linear3D and just use the _renderTRansform	2017-09-22 10:39:51 -07:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
samcake	2d369a4586	fixing the image3D updating its renderTransform from it s update() call	2017-09-21 16:20:13 -07:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
samcake	454e167d93	notifying a render transform / bound change when the dimension property change	2017-09-21 12:58:56 -07:00
samcake	7103864b37	Also rendering the line3D overlay with start and end captured in game loop	2017-09-21 12:23:53 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Zach Fox	81be62b6f7	Check if ContextOverlayInterface is enabled before highlighting	2017-09-21 09:34:15 -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
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
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
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
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
Cain Kilgore	a4655b9c73	Merge branch 'master' of https://github.com/highfidelity/hifi into 21542	2017-09-20 23:25:26 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
vladest	c48aba423a	Rename check box	2017-09-20 22:48:39 +02:00
vladest	6e3cfe81ab	Fix crash on second bookmark saving	2017-09-20 21:01:16 +02:00
Anthony J. Thibault	a8a5138c18	remove USE_N_SCALE preprocessor check	2017-09-20 09:23:13 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
vladest	7a36894f76	Make sure audio device not gets unchecked	2017-09-19 23:25:41 +02:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00