1003 commits

Author	SHA1	Message	Date
Liv	40ff3f966f	Merge pull request #13165 from ctrlaltdavid/21872-b ... JSDoc stubs for various APIs	2018-05-18 09:11:55 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
David Rowe	d20cd6ad44	Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot()	2018-05-17 20:25:25 +12:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
David Rowe	f571e90ef5	Merge branch 'master' into 21872-b	2018-05-16 10:20:53 +12:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
David Rowe	d0596f8205	Fix Wallet JSDoc stubs	2018-05-14 10:43:55 +12:00
David Rowe	176dbb5557	Wallet API JSDoc stubs	2018-05-13 11:02:09 +12:00
David Rowe	fb175d7110	AudioEffectOptions API JSDoc stubs	2018-05-11 20:36:10 +12:00
NissimHadar	1364f4391d	Can store JSON object.	2018-05-10 18:02:44 -07:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
David Rowe	e95c38d939	Merge branch 'master' into 21856-g ... # Conflicts: # libraries/model-networking/src/model-networking/TextureCache.h	2018-05-03 21:03:14 +12:00
Zach Fox	ecae3ceb9d	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-02 10:05:15 -07:00
David Rowe	3febdcb141	Miscellaneous JSDoc tidying	2018-05-02 16:15:35 +12:00
Zach Fox	249e2a2bac	Tons of stability and clarity improvements	2018-05-01 13:00:04 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
David Rowe	65f5915372	Add JSDoc for startFarTrigger etc. calls on entity scripts	2018-05-01 21:55:27 +12: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