6914 commits

Author	SHA1	Message	Date
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
John Conklin II	40d6e51da8	Merge pull request #12597 from ElderOrb/FB12956 ... Fix for broken 'toggle audio meter' button	2018-03-20 11:03:32 -07:00
Stephen Birarda	cd887b5faf	Merge pull request #12654 from huffman/feat/content-zip-upload ... Add support for .content.zip content uploads	2018-03-20 10:07:53 -07:00
Atlante45	d96f7553d9	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -07:00
Ryan Huffman	03c8c14f61	Fix content replacement being allowed from all URLs	2018-03-15 12:49:22 -07:00
Ryan Huffman	bee8899c46	Add support for uploading .content.zip files	2018-03-15 12:17:21 -07:00
Dante Ruiz	f9413dfe1b	fixing mirror mode	2018-03-13 15:59:10 -07:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
Dante Ruiz	f521a129b6	fixing issues	2018-03-13 10:07:34 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
Dante Ruiz	e289d37210	min diff	2018-03-12 12:59:30 -07:00
Dante Ruiz	1079cfb264	fixing some issues	2018-03-12 12:57:56 -07:00
Dante Ruiz	272f71b940	making changes	2018-03-12 11:48:17 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
John Conklin II	25b93d9fd7	Merge pull request #12606 from ElderOrb/FB12956_RC65 ... Fix for broken 'toggle audio meter' button	2018-03-09 11:20:27 -08:00
Zach Fox	2b137f94a6	Merge pull request #12596 from zfox23/fixFontsAgain ... Fix font loading for MacOS via completely different font loading method	2018-03-09 09:49:56 -08:00
Dante Ruiz	cfa85b5137	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-09 09:37:08 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
John Conklin II	cad53a0203	Merge pull request #12585 from druiz17/small-tablet-changes ... tablet scale and position changes	2018-03-08 15:36:06 -08:00
Alexander Ivash	b427d6c326	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Zach Fox	ec6f66ee52	Try this	2018-03-08 14:31:56 -08:00
Zach Fox	747a6b07ce	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
Alexander Ivash	1fb68ec5ca	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 00:55:49 +03:00
Zach Fox	409f5293bf	Try this	2018-03-08 13:51:34 -08:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Elisa Lupin-Jimenez	2987c90f96	fixed syntax for ubuntu	2018-03-07 13:48:35 -08:00
Elisa Lupin-Jimenez	9ae2da7e4b	fixed logic for texture files/non-models	2018-03-07 13:18:36 -08:00
Elisa Lupin-Jimenez	28589094c2	hopefully fixed mac/ubuntu builds	2018-03-07 10:18:40 -08:00
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
Dante Ruiz	a70509233e	making small changes	2018-03-07 08:25:27 -08:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Elisa Lupin-Jimenez	251e4a3127	Fixed blocks importer textures being interpreted as image entities	2018-03-06 16:44:23 -08:00
Dante Ruiz	6fefd1355a	minimize diff	2018-03-06 14:19:26 -08:00
Dante Ruiz	fe363e7f2a	changing keybaord mapping	2018-03-06 14:16:25 -08:00
Brad Davis	6cc36136bd	Fix assert on interaction with stats and avatarinputs during UI setup	2018-03-06 12:34:21 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Stephen Birarda	9cc348ef27	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
John Conklin II	25144f0fec	Merge pull request #12456 from Atlante45/fix/min-spec-crash ... Fix crash when passing --checkMinSpec flag	2018-02-26 17:35:46 -08:00
Stephen Birarda	aa7bd2066a	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-26 17:02:00 -08:00