1032 commits

Author	SHA1	Message	Date
milad nazeri	aeb78e69f6	Merge commit 'refs/pull/13061/head' of https://github.com/highfidelity/hifi into gravprep-redo	2018-05-01 06:12:00 -07:00
David Rowe	65f5915372	Add JSDoc for startFarTrigger etc. calls on entity scripts	2018-05-01 21:55:27 +12:00
milad nazeri	8845094afb	Added Lod fix	2018-04-30 16:55:42 -07:00
Zach Fox	aafcf056c4	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-04-30 12:36:00 -07:00
Zach Fox	a2b84c0fbb	It's working!!	2018-04-30 12:11:46 -07:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
Zach Fox	1b29946a48	I feel so close; why isn't this variable capturing?	2018-04-27 17:26:05 -07:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
David Rowe	b8063840e7	Miscellaneous fixes	2018-04-26 21:17:05 +12:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
John Conklin II	f04200a620	Merge pull request #12976 from ctrlaltdavid/21856 ... Docs to JSDoc	2018-04-25 11:36:34 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
SamGondelman	1deb38f06d	fix copy error	2018-04-23 12:05:30 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	497cb4dab6	Interim JSDoc for Selection	2018-04-23 13:53:35 +12:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
Seth Alves	512b1911eb	Merge pull request #12858 from ctrlaltdavid/21836 ... Update location.hostname JSDoc per serverless domains	2018-04-20 10:27:09 -07:00
SamGondelman	3b4b43cf66	try to fix audio crash on startup	2018-04-20 10:23:47 -07:00
Ken Cooke	a9c5edcb2f	Merge pull request #12942 from kencooke/audio-devices-crfix ... Minor changes to meet coding standard	2018-04-20 08:20:32 -07:00
David Rowe	08defea755	Merge branch 'master' into 21836	2018-04-20 09:20:56 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00
Ken Cooke	764aa00069	Coding standard fixes	2018-04-19 07:33:14 -07:00
milad	364d193499	audio added	2018-04-18 21:04:57 -07:00
milad	3f129bda13	More done on audio	2018-04-18 20:04:41 -07:00
David Rowe	c1ede6ef58	Merge branch 'master' into 21815 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2018-04-17 11:54:56 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
John Conklin II	5705bac87f	Merge pull request #12723 from ctrlaltdavid/21801 ... HMD API JSDoc	2018-04-16 11:12:26 -07:00
Sam Gateau	77a27b2be7	Merge pull request #12835 from NissimHadar/speedUp1 ... ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG	2018-04-12 11:48:09 -07:00
David Rowe	c2f0f7ef5f	Doc review	2018-04-12 10:54:35 +12:00
David Rowe	7a9e3388fa	Merge branch 'master' into 21801	2018-04-12 09:48:51 +12:00
David Rowe	c836014d21	Fix JSDoc typo noticed in passing	2018-04-12 09:24:10 +12:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
MiladNazeri	9f7a765ec3	Merge pull request #12729 from ctrlaltdavid/21814 ... Settings API JSDoc	2018-04-11 11:48:15 -07:00
Triplelexx	704499a76d	remove Limitless API	2018-04-09 18:22:48 +01:00
NissimHadar	7f70511d1a	Added a script command to clear caches.	2018-04-08 10:32:35 -07:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -07:00
John Conklin II	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -07:00
David Rowe	095c1b837c	Update JSDoc	2018-04-04 09:48:33 +12:00
David Rowe	6868ca971f	Make Window.x and Window.y report top left of drawable area of window	2018-04-04 09:43:39 +12:00
David Rowe	a3c8b2792d	Fix Window.geometryChanged() values for moving and resizing window	2018-04-04 09:42:05 +12:00
David Rowe	63603ff97c	Fix window height reported by Window.geometryChanged() signal	2018-04-03 14:21:15 +12:00
John Conklin II	9dcef996c5	Merge pull request #12684 from vladest/assetserver_wrong_dialog ... Fix invalid message if cancel adding asset to AssetServer	2018-04-02 15:28:46 -07:00
Olivier Prat	5c26b4030b	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-30 14:38:42 -04:00
Ken Cooke	ff6c9f3127	Merge pull request #12704 from ElderOrb/FB13057 ... Improve audio devices selection logic	2018-03-30 11:18:05 -07:00
Ken Cooke	a2be291363	Merge pull request #12715 from ctrlaltdavid/21677 ... Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-30 09:41:54 -07:00
Olivier Prat	3c8cd48dfb	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-29 07:21:01 -04:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
David Rowe	c3df741c62	Settings API JSDoc	2018-03-28 17:14:06 +13:00
David Rowe	f27e8868eb	Add HMD JSDoc	2018-03-28 12:25:12 +13:00
David Rowe	d1d58eceab	Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-27 13:04:50 +13:00
Alexander Ivash	06410ec342	temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged	2018-03-27 00:44:17 +03:00
Alexander Ivash	8e551f4dc0	re-select re-plugged device	2018-03-25 13:49:59 +03:00
Alexander Ivash	3c45f17d70	remove unused code	2018-03-25 13:44:16 +03:00
Alexander Ivash	f6bbdec902	remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged ... note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop	2018-03-25 13:43:51 +03:00
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -07:00
vladest	faf8328d6a	Fix invalid message if cancel adding asset to AssetServer	2018-03-20 15:47:30 +01:00
Dante Ruiz	2fb1fbe027	fix sorting	2018-03-14 09:17:22 -07:00
David Rowe	966d711e56	Fix Window.raiseMainWindow()	2018-03-14 13:38:48 +13:00
David Rowe	025d2807f4	Fix Window.setFocus() JSDoc	2018-03-14 12:59:27 +13:00
David Rowe	16aefea2e1	Merge branch 'master' into 21776	2018-03-13 14:46:07 +13:00
Seth Alves	621e6a62d6	merge from upstream	2018-03-09 12:07:24 -08:00
Seth Alves	58bc42990c	merge from upstream	2018-03-09 12:03:26 -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
David Rowe	b1bda281ee	Merge branch 'master' into 21776	2018-03-08 15:36:10 +13:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
vladest	126f05f8bd	Added space	2018-03-04 13:28:26 +01:00
vladest	2a9bbfa808	Wrap text in query dialogs. Add right margins for input field and buttons	2018-03-04 13:19:56 +01:00
Seth Alves	45157a16f2	merge from upstream	2018-03-02 09:57:27 -08:00
David Rowe	287ea8eff2	Fix Window.setFocus() unsetting focus if Interface has focus	2018-03-02 15:40:49 +13:00
David Rowe	b50044fb2b	Remove deprecated Window.openFileChanged() signal from API	2018-03-02 13:15:27 +13:00
Seth Alves	33065fb51c	more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port	2018-03-01 11:07:37 -08:00
Cristian Luis Duarte	9acb83632c	Android - Make joystick move up when showing the bottom bar	2018-02-28 18:52:13 -03:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
Seth Alves	666fa77be2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-26 13:53:20 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
NissimHadar	c0f20900a0	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix ... Corrected edge case of creating a snapshot with "" as the filename.	2018-02-26 09:39:16 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Seth Alves	99893d81e2	merge from upstream	2018-02-23 09:14:48 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Nissim Hadar	a843a53427	Improved JSDoc comments.	2018-02-22 10:17:20 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
Seth Alves	c83dcbc626	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-22 07:42:49 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Nissim Hadar	049beba157	Corrected edge case of creating a snapshot with "" as the filename.	2018-02-21 14:15:41 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Seth Alves	afa059d331	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-16 12:58:56 -08:00
Seth Alves	b2a4181bc0	working to integrate serverless domains into history, etc	2018-02-16 12:58:50 -08:00
MiladNazeri	331b253ba0	Merge pull request #12386 from cain-kilgore/21668 ... WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null	2018-02-16 06:57:03 -08:00
Zach Fox	ae8a8a48eb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-13 13:55:32 -08:00