53773 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	8ba56a96df	Merge pull request #10240 from zzmp/fix/hmd-tutorial ... Condition tutorial on active HMD	2017-04-26 14:00:02 -07:00
Chris Collins	11c21cc871	Merge pull request #10291 from jherico/hotfix_back_merge ... Stable - Master hotfix merge back	2017-04-26 13:25:16 -07:00
Brad Hefta-Gaub	f1bd371fbe	Merge pull request #10175 from PhilipRosedale/springHold ... New Tutorial and entity scripts	2017-04-26 13:16:17 -07:00
Andrew Meadows	ac6d4969d6	Merge pull request #10270 from Atlante45/fix/unload ... Fix entity script unloads	2017-04-26 11:42:14 -07:00
Brad Davis	0a1f8ead25	Merge remote-tracking branch 'upstream/stable' into hotfix_back_merge ... Conflicts: libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp	2017-04-26 11:06:33 -07:00
Zach Fox	6e6fd608dd	Merge pull request #10288 from zfox23/fixConnectionLogs ... Fix incorrect logging in makeUserConnection	2017-04-26 09:13:27 -07:00
Zach Fox	3e24296996	Swap the two lines	2017-04-26 09:10:05 -07:00
Philip Rosedale	8826dbef78	removed old gravity example	2017-04-25 22:37:20 -07:00
Philip Rosedale	c69d064cc3	code review fixes	2017-04-25 22:14:03 -07:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
Seth Alves	8becca3b98	Merge pull request #10283 from ZappoMan/AddUsersToAgent ... add support for ignore radius from agent scripts	2017-04-25 17:38:55 -07:00
Seth Alves	dc70e96b0f	Merge pull request #10284 from birarda/bug/input-received-signal ... fix emission of inputReceived in AudioClient	2017-04-25 17:38:04 -07:00
Clément Brisset	c20a4da96d	Merge pull request #10215 from Atlante45/nvtt ... Add textures BC compression	2017-04-25 17:34:26 -07:00
Thijs Wenker	5457b8d214	Merge pull request #10260 from PhilipRosedale/halfDuplex ... Half Duplex script	2017-04-26 01:47:16 +02:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	9dbae4b54e	CR	2017-04-25 15:56:23 -07:00
Atlante45	56f656f92a	Disable compression during runtime	2017-04-25 15:56:23 -07:00
Stephen Birarda	e3ab2615c1	allow NVTT to be built as external on android	2017-04-25 15:56:23 -07:00
Atlante45	1cc86b7203	Fix build error	2017-04-25 15:56:23 -07:00
Atlante45	1820207259	Fix processTextureAlpha	2017-04-25 15:56:23 -07:00
Atlante45	d6ab35ba1a	Logging cleanup	2017-04-25 15:56:23 -07:00
Atlante45	b98cd7355e	Code cleanup	2017-04-25 15:56:23 -07:00
Atlante45	77d8bf20a7	Fix warnings	2017-04-25 15:56:23 -07:00
Atlante45	fae49668b4	Disable CubeMap and NormalMap compression	2017-04-25 15:56:23 -07:00
Atlante45	145af2b911	Fix ImageReader for images with a wrong extension	2017-04-25 15:56:23 -07:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Atlante45	fc1b920341	Add ability to disable texture compression	2017-04-25 15:56:23 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	63e564c178	Add source hash to KTX metadata	2017-04-25 15:56:23 -07:00
Atlante45	d9a7615cc8	Add compression support for skyboxes	2017-04-25 15:56:23 -07:00
Stephen Birarda	7968045626	update md5 for patched external nvtt	2017-04-25 15:56:23 -07:00
Stephen Birarda	11fa2797b7	force the release DLL path for NVTT on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	202e933d8b	don't build, install, or configure nvtt on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	06b3b3d5f4	ad missing include dir for NVTT on win	2017-04-25 15:56:23 -07:00
Stephen Birarda	d72e5e5b24	add handling for install_name_tool calls on OS X	2017-04-25 15:56:23 -07:00
Stephen Birarda	3a217f75f4	force release for NVTT on Win32	2017-04-25 15:56:23 -07:00
Stephen Birarda	5c12180b58	use pre-built NVTT on windows	2017-04-25 15:56:23 -07:00
Atlante45	ae73cf4038	Add support for Grayscale and NormalMap textures	2017-04-25 15:56:23 -07:00
Stephen Birarda	27c6011e6e	change nvtt external to ignore release type	2017-04-25 15:56:23 -07:00
Stephen Birarda	ee62e7dcb8	update nvtt external to build from source	2017-04-25 15:56:22 -07:00
Atlante45	94e1cbbc95	Upload nvtt archive to S3	2017-04-25 15:56:22 -07:00
Atlante45	69a27d516f	Fix roughness	2017-04-25 15:56:22 -07:00
Atlante45	5ceb30b69c	Make sure mips are copied to memory	2017-04-25 15:56:22 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Atlante45	2e1355618f	Use NVTT to mipmap color textures	2017-04-25 15:56:22 -07:00
Atlante45	0428b22b63	Add nvtt external	2017-04-25 15:56:22 -07:00
Stephen Birarda	da1d93b86c	fix emission of inputReceived in AudioClient	2017-04-25 15:41:37 -07:00
Philip Rosedale	16dd6a2ce1	Code review / lint	2017-04-25 15:37:39 -07:00
ZappoMan	8dc41ca8b9	add support for ignore radius from agent scripts	2017-04-25 15:28:26 -07:00
Dante Ruiz	851eece0e4	removed comments	2017-04-25 23:26:16 +01:00