24259 commits

Author	SHA1	Message	Date
samcake	7f8948fcce	Merge branch 'workload-master' of github.com:samcake/hifi into workload	2018-03-13 10:49:31 -07:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Sam Gateau	a2993c7cdb	First version wof space working with Transaction & Collection	2018-03-13 01:45:21 -07:00
Gabriel Calero	3117ec9015	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03:00
Sam Gondelman	c59d29f4ee	Merge pull request #12623 from SamGondelman/android ... Android: Fix corruption on startup	2018-03-12 15:03:07 -07:00
John Conklin II	7f7d20738a	Merge pull request #12553 from vladest/mac_combobox_misplaced ... Fix CheckBox on Mac	2018-03-12 14:47:39 -07:00
samcake	74be67edb1	fixing the default state plus upstream master merged again	2018-03-12 14:40:09 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
Gabriel Calero	7778ddfdcb	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 18:33:05 -03:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
samcake	b922331b05	Address comments from review	2018-03-12 13:40:00 -07:00
samcake	3efa92b48e	removing comment	2018-03-12 13:07:57 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
samcake	7116d82dc5	Merge branch 'workload-master' of github.com:samcake/hifi into workload-bis	2018-03-12 12:04:20 -07:00
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Sam Gateau	9e7260839c	Better rendering of the view circles	2018-03-12 01:05:07 -07:00
Sam Gateau	e3c8b9c62d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-09 22:24:58 -08:00
samcake	e8b5a875d6	REndering the view rings better	2018-03-09 17:40:58 -08:00
samcake	10016756b7	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-03-09 16:32:37 -08:00
samcake	c78df4d967	Setting the correct Job config for ssao check box and fixing typo	2018-03-09 15:41:56 -08:00
samcake	fec30b8363	Fixing the menu for Shadow and AO to do the correct path to engine config	2018-03-09 15:04:14 -08:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Sam Gateau	d0de5b2d96	Merge pull request #12496 from AndrewMeadows/faster-raypick ... faster per-entity raypick culling and time-boxed picks	2018-03-09 13:01:52 -08:00
Dante Ruiz	e21c4988fb	stereo checkbox text change	2018-03-09 10:11:25 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -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	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub	5437ffb2c8	Merge pull request #12536 from ctrlaltdavid/21700 ... Remove deprecated Window.openFileChanged() signal from API	2018-03-09 08:47:57 -08:00
Dante Ruiz	8703e9e002	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-09 08:42:50 -08:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
Sam Gateau	f087bb7623	Adjust the freeze view and start drawing the views better	2018-03-09 01:38:00 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
Sam Gateau	8089d77c78	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-08 19:40:20 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13: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
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
John Conklin II	fe0d354d26	Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys ... RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 15:30:19 -08:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08:00
Zach Fox	409f5293bf	Try this	2018-03-08 13:51:34 -08:00
Zach Fox	086431d0e7	Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain	2018-03-08 13:50:19 -08:00
John Conklin II	260715d616	Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug ... Fixed blocks importer textures being interpreted as image entities	2018-03-08 13:33:41 -08:00
Zach Fox	22f18dbf56	Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 13:12:13 -08:00
Dante Ruiz	9f246ea314	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-08 13:04:02 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	d1b87b3116	Added missing avatar shadows.	2018-03-08 12:14:42 -08:00