67573 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Gabriel Calero	0f8c666647	Trying to fix virtualpad textures corruption	2018-05-11 19:50:00 -03:00
Gabriel Calero	9b5da09dc7	Fix connection issue syncing two AccountManagers	2018-05-11 18:08:56 -03:00
Gabriel Calero	db460e9856	Put back the worker thread for account manager in android	2018-05-11 16:09:40 -03:00
Gabriel Calero	e838a85a47	Merge remote-tracking branch 'upstream/master' into android_places_goto	2018-05-11 09:13:41 -03:00
John Conklin II	4129664368	Merge pull request #13145 from highfidelity/stable ... Merge RC67 stable into master	2018-05-10 17:07:20 -07:00
John Conklin II	bc9e403ab9	Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2 ... Use HMAC authentication for network packets - 2nd attempt	2018-05-10 14:38:18 -07:00
Gabriel Calero	a1a48d9b9e	Merge remote-tracking branch 'upstream/master' into android_places_goto	2018-05-10 18:24:26 -03:00
Gabriel Calero	b2bedc4099	Merge branch 'android_places_goto' of https://github.com/Cristo86/hifi into android_places_goto	2018-05-10 18:22:41 -03:00
Cristian Luis Duarte	f30908fb26	Android - Remove delay starting Home + Change default joystick flag	2018-05-10 18:21:33 -03:00
Gabriel Calero	c6f93a17eb	Fix freeze when quitting the app trough back button	2018-05-10 18:01:50 -03:00
John Conklin II	64d3219ee1	Merge pull request #12746 from gcalero/fix_radar_zoom_in ... Android: Fix zoom in unresponsive in radar mode	2018-05-10 13:14:52 -07:00
Sam Gateau	fd9669b42d	Merge pull request #13125 from jherico/feature/testing ... Working on improved unit testing, adding texture transfer testing	2018-05-10 12:29:43 -07:00
Brad Davis	cb336bdeab	Fix linux build problems	2018-05-10 10:55:50 -07:00
John Conklin II	befb411f6e	Merge pull request #13025 from highfidelity/RC67 ... Beta Release 67 - branched at developer release 8181	2018-05-10 10:11:23 -07:00
Seth Alves	4410402c7d	Merge pull request #13114 from sethalves/more-logging-suppression ... more suppression of logging	2018-05-09 17:36:12 -07:00
John Conklin II	75164201d1	Merge pull request #13117 from SamGondelman/android ... Test highp floats for Android	2018-05-09 14:36:51 -07:00
Simon Walton	9b6225db40	Bump default packet version 20 -> 21	2018-05-09 14:29:10 -07:00
Gabriel Calero	e0b57a2228	Code review in radar.js	2018-05-09 18:20:19 -03:00
MiladNazeri	bc03fb398f	Merge pull request #13102 from ctrlaltdavid/21856-h ... Fix JSDoc for Users.requestUsernameFromID	2018-05-09 13:35:06 -07:00
Brad Davis	57691d5d66	Cache downloaded assets	2018-05-09 13:20:48 -07:00
Brad Davis	7fbad47351	Working on texture test	2018-05-09 13:20:48 -07:00
Brad Davis	1d403b4d67	Add texture transfer testing	2018-05-09 13:20:47 -07:00
Brad Davis	12ae44c14f	Remove debugging pragma	2018-05-09 13:20:47 -07:00
Brad Davis	e9dc3c650b	Breakup building and testing	2018-05-09 13:20:47 -07:00
Brad Davis	f206456cdd	Restoring manual tests to solution, removing dead tests	2018-05-09 13:20:47 -07:00
Brad Davis	6e16109fa4	Fix unit test compile failures and crashes	2018-05-09 13:20:47 -07:00
Brad Davis	d5afb3a49b	Move non-automated tests into new folder	2018-05-09 13:20:47 -07:00
John Conklin II	59b9e08f58	Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix ... MS14937: Fix Replace button for content sets during Checkout	2018-05-09 13:04:10 -07:00
Seth Alves	16e832ac08	use setFilterRules rather than specifying each logging category to suppress	2018-05-09 13:01:49 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07:00
John Conklin II	4d224af7c7	Merge pull request #13137 from sethalves/fix-serverless-sim-ownership-rc67 ... when in serverless mode, short-circuit simulation ownership bids	2018-05-09 12:34:42 -07:00
John Conklin II	b9656e5c72	Merge pull request #13130 from samcake/blue ... Fix size calculation of compressed textures #13120	2018-05-09 11:45:10 -07:00
John Conklin II	e9ad50159c	Merge pull request #13136 from zfox23/RC67_MS14951 ... RC67: MS14951: Fix Snapshot hotkey sound playback	2018-05-09 11:11:33 -07:00
Howard Stearns	bf466344ee	Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound ... MS14951: Fix Snapshot hotkey sound playback	2018-05-09 11:07:46 -07:00
Seth Alves	db03265a6b	when in serverless mode, short-circuit simulation ownership bids	2018-05-09 10:53:46 -07:00
Sam Gateau	17350a79dd	Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester ... Command line parameters for autotester	2018-05-09 10:51:31 -07:00
Gabriel Calero	843282739e	Remove unused includes and white spaces	2018-05-09 14:16:51 -03:00
Thijs Wenker	a42491ded7	Merge pull request #13055 from misslivirose/remove-help-ftue ... Do not open help on first run	2018-05-09 18:48:05 +02:00
Zach Fox	542e707de8	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:40:51 -07:00
Zach Fox	06c6f55069	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:35:42 -07:00
John Conklin II	d8e6ecba35	Merge pull request #13129 from druiz17/fix-hmd-js ... Fix hmd js	2018-05-09 07:45:52 -07:00
Gabriel Calero	1cc0a52597	Fix the joystick texture corruption	2018-05-09 11:20:47 -03:00
Gabriel Calero	b0fee3fd8b	Improve code based on changes requested in the PR	2018-05-09 11:06:32 -03:00
John Conklin II	a811c6aba3	Merge pull request #13132 from zfox23/RC67_MS14937 ... MS14937: Fix Replace button for content sets during Checkout	2018-05-09 06:47:47 -07:00
Simon Walton	0349847857	Add comment re threading issues	2018-05-08 17:46:25 -07:00
Zach Fox	22c26c348d	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:37:11 -07:00
Zach Fox	540f200b99	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:34:28 -07:00
samcake	44e7541888	Fixing the size evaluation for compressed texture and gpu::Element Type enum	2018-05-08 15:57:27 -07:00
NissimHadar	175fa9108e	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-08 15:52:15 -07:00
NissimHadar	7f9f9d769a	Corrected bug causing Interface not to exit at end of test.	2018-05-08 15:51:52 -07:00