7902 commits

Author	SHA1	Message	Date
Dante Ruiz	0dc5e7743f	allow mouse pointer to pick against collidable entities	2019-01-04 17:49:38 -08:00
Shannon Romano	4e5d275768	Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager ... MS19925: Avatar Packager	2019-01-04 16:22:06 -08:00
Shannon Romano	9855e9bee8	Merge pull request #14650 from NissimHadar/20301-addPlatformInfo ... Case 20301 - add platform info	2019-01-04 14:37:17 -08:00
Thijs Wenker	8625037285	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 15:29:07 +01:00
Antonina Savinova	4414579a6e	Merge pull request #14591 from Atlante45/feat/stats ... Fix network stats to use low-level values	2019-01-03 16:54:03 -08:00
Ryan Huffman	93f53cf43d	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 14:18:40 -08:00
Ryan Huffman	7ca7e0f234	Revert unintended changes in avatar packager	2019-01-03 13:45:00 -08:00
Thijs Wenker	c95da0a595	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/src/Application.cpp	2019-01-03 22:17:54 +01:00
Clement	f163bbc0d5	Sample connections stats every seconds	2019-01-03 10:04:38 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
David Rowe	14d39d1747	Make mouselook yaw and pitch directly proportional to mouse movement	2019-01-03 15:53:37 +13:00
NissimHadar	65d975fe5b	Added detection of Rift and Vive controllers.	2019-01-02 16:53:38 -08:00
NissimHadar	4918f7d186	Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo	2019-01-02 16:24:52 -08:00
Thijs Wenker	cb91a4bc6d	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-03 00:10:22 +01:00
Antonina Savinova	4838a9107a	Merge pull request #14624 from davidkelly/dk/17207 ... ACs don't need to call into flagtimeForConnecitonStep	2019-01-02 13:41:30 -08:00
NissimHadar	1e8e633025	Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo	2019-01-02 11:47:34 -08:00
Jeff Clinton	032178673a	Merge pull request #14634 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities (#2)	2019-01-02 09:00:56 -08:00
Thijs Wenker	20c169bd39	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-02 14:03:13 +01:00
NissimHadar	4b4ef4412a	Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo	2018-12-30 20:24:16 -08:00
NissimHadar	76ce63da64	Can read graphics card type.	2018-12-30 20:24:00 -08:00
Adam Smith	833ad936c0	Merge pull request #14630 from jherico/fix/20284_master ... Fix for Oculus reset view issue	2018-12-28 16:24:40 -08:00
NissimHadar	246c4dab94	Created the PlatformInfo scripting object.	2018-12-28 14:41:55 -08:00
Thijs Wenker	a1ef1b4447	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-24 16:48:40 +01:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Thijs Wenker	ea901aa179	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-21 14:11:57 +01:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Brad Davis	c985eb3e80	Fix for Oculus reset view issue	2018-12-20 16:07:55 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
David Kelly	2c647462b1	ACs don't need to call into flagtimeForConnecitonStep	2018-12-20 10:15:44 -07:00
Wayne Chen	50d57e8b60	sending user to previous location on second launch	2018-12-19 12:37:08 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Wayne Chen	017eb9d1a3	adding fix for scripts not being saved	2018-12-18 16:32:44 -08:00
Ryan Huffman	720cd90dc7	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-18 13:17:28 -08:00
Ryan Huffman	ad471387f7	Integrate marketplace upload API	2018-12-18 13:08:55 -08:00
Wayne Chen	50902080ce	fixing typos	2018-12-17 16:48:02 -08:00
Wayne Chen	816733b55f	reverting to master	2018-12-17 16:47:11 -08:00
Wayne Chen	5d89ed2a81	matching master	2018-12-17 13:46:55 -08:00
Wayne Chen	28fd1380df	adding target scale and default avatar to login state	2018-12-17 13:37:28 -08:00
Wayne Chen	899918006f	fixing for autotester	2018-12-14 17:12:27 -08:00
Wayne Chen	befca68917	fixing keyboard position offset	2018-12-14 10:57:42 -08:00
Wayne Chen	e744f40d54	fixing url to login overlay	2018-12-13 16:43:12 -08:00
Wayne Chen	1d86f3816d	fixing build error	2018-12-13 15:43:42 -08:00
Wayne Chen	502de63d3f	fixing bug	2018-12-13 14:59:40 -08:00
Wayne Chen	3806914e76	fixing variable names to match coding standard	2018-12-13 14:34:25 -08:00
Wayne Chen	0daa909192	more dev feedback	2018-12-13 14:25:52 -08:00
Wayne Chen	1ce7d8a31c	dev feedback	2018-12-13 13:47:07 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Zach Fox	735be62271	Merge pull request #14562 from zfox23/portalPrototype ... Add a "Portal" mode to the Secondary Camera	2018-12-12 09:27:55 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Wayne Chen	dbebf1a67f	having stats mirror master	2018-12-11 19:29:17 -08:00
Wayne Chen	4b8200d5bb	forcing stats to be false until login determined	2018-12-11 17:27:54 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Thijs Wenker	3943fe2861	avatar packager initial	2018-12-10 21:29:03 +01:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Wayne Chen	7ab1d649f1	fixing limit for overlay too far/close	2018-12-09 07:49:48 -08:00
Wayne Chen	9fd1b7fb2d	cancel pitch and check if overlay too far/close	2018-12-07 17:25:55 -08:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
sabrina-shanman	7cbe3776f5	Simplify serializer registration process	2018-12-07 12:05:27 -08:00
Wayne Chen	a2572d5710	fix switch display mode crash/keyboard spawn problem	2018-12-07 11:17:06 -08:00
Wayne Chen	2f4805dc04	adding focus disable signal to fix focus	2018-12-06 16:38:10 -08:00
Wayne Chen	1ddba8e787	KB following updated login screen/keep login screen active	2018-12-06 14:58:06 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Wayne Chen	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -08:00
Jeff Clinton	e8c1c4a27b	Merge pull request #14536 from danteruiz/fix-audio-switching ... Respect changed audio settings when switch displays (Master)	2018-12-06 09:13:47 -08:00
Wayne Chen	037abd9b5e	don't allow PC keyboard in HMD login/fix sign up password	2018-12-05 18:14:59 -08:00
Wayne Chen	11c40666e4	removing trailing tests	2018-12-05 11:29:58 -08:00
Wayne Chen	27e4e1c245	pitch updates login pos/fix signup errors	2018-12-05 11:24:27 -08:00
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
Dante Ruiz	3123bb37e4	fix audio switching issue	2018-12-05 10:34:47 -08:00
Wayne Chen	37beab3ab3	fixing the desktop tablet problem again	2018-12-05 09:36:56 -08:00
Wayne Chen	40053ef13a	make sure android still functions as expected	2018-12-05 09:10:17 -08:00
Wayne Chen	328e1ebc27	autotester param fully functional	2018-12-05 08:51:13 -08:00
Wayne Chen	07599c02c8	true reversion of scrips param	2018-12-05 08:16:54 -08:00
Wayne Chen	4daa943510	fixing scripts param/reverting some qml	2018-12-04 17:17:58 -08:00
Wayne Chen	3951203b55	adding tablet bg/no movement in login state	2018-12-04 16:50:01 -08:00
Wayne Chen	2d8b638370	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 14:19:28 -08:00
Wayne Chen	a24cd41367	getting textfield into focus	2018-12-04 14:19:09 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Wayne Chen	dc3381d4a9	updating artwork	2018-12-03 17:28:10 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
sabrina-shanman	243a1d6598	Add ModelFormatRegistry for handling model loading on the application side	2018-11-30 16:50:53 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
Shannon Romano	1b24d051f7	Merge pull request #14432 from ctrlaltdavid/M17988 ... Fix memory accumulating while Interface is minimized	2018-11-30 09:39:14 -08:00
Wayne Chen	707339dd2a	allowing clicking any mousearea back to the textfield/disable movement ctrls	2018-11-29 17:18:40 -08:00
Wayne Chen	e033492472	enable mouse capture upon resume	2018-11-29 15:40:00 -08:00
Wayne Chen	62848700f3	disable mouse capture in login state	2018-11-29 15:37:35 -08:00
Sam Gateau	54fa4365b8	FIxing build issue doh...	2018-11-28 22:21:58 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Wayne Chen	34fb7159e2	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-28 19:24:20 -08:00
Wayne Chen	b0fb7778cf	fixing some text, turning off lasers until they intersect login overlay	2018-11-28 19:17:30 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Wayne Chen	527f8a2b59	UI feedback + new overlay position update	2018-11-28 15:38:37 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Sam Gondelman	4d621ba61c	Merge branch 'master' into splash	2018-11-27 16:01:07 -08:00
SamGondelman	1f354f813c	rework shader pre-compilation	2018-11-27 14:38:02 -08:00
Wayne Chen	d5e16ae920	removing login state sound	2018-11-27 13:31:41 -08:00