23285 commits

Author	SHA1	Message	Date
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Zach Fox	f366fdf695	Beginnings of nearby	2018-01-10 09:58:23 -08:00
Andrew Meadows	7060cd9a90	Merge pull request #12122 from druiz17/fix-double-set-tablet-root ... don't call setQmlTabletRoot twice	2018-01-10 09:53:09 -08:00
Sam Gateau	d4dc1e352f	Merge pull request #12124 from AndrewMeadows/no-misc-stats ... more context for update performance stats	2018-01-10 09:10:26 -08:00
Sam Gateau	8c80247925	Merge pull request #12123 from SamGondelman/meta ... Model meta render item is only withTypeShape if visual geometry request fails	2018-01-10 09:09:19 -08:00
Zach Fox	928e3d2ef7	Merge pull request #12108 from zfox23/commerce_pagination ... Commerce: Support pagination at History endpoint; improve Purchases scrolling	2018-01-09 15:57:34 -08:00
Zach Fox	5469025113	More more more	2018-01-09 15:53:25 -08:00
Zach Fox	530df5447d	Even more proress	2018-01-09 15:19:50 -08:00
Zach Fox	edf25c3e4e	Remove code duplication...	2018-01-09 14:14:54 -08:00
Zach Fox	40a3f8b31b	Progress	2018-01-09 14:13:36 -08:00
Melissa Brown	19802b33eb	Merge pull request #12109 from vladest/tablet_page_indicator ... Page indicator visible only when pages more than one	2018-01-09 14:05:32 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
Andrew Meadows	8c6edc749a	provide more context for update perf stats	2018-01-09 12:59:32 -08:00
SamGondelman	7c56a9ffb2	model meta is only withTypeShape if visual geometry request fails	2018-01-09 12:43:43 -08:00
Zach Fox	d31dec7acb	Fix unix build errors	2018-01-09 12:41:56 -08:00
Zach Fox	360a7cc4c6	CR feedback	2018-01-09 11:08:18 -08:00
Seth Alves	87dfe0efc3	Merge pull request #12097 from vladest/tablet_pagination_magnify ... Tablet pagination magnify	2018-01-09 08:08:02 -08:00
Sam Gondelman	02100a405d	Merge pull request #12100 from samcake/blue ... Restore packing of QRC qml and resources to interface.exe in DEV_BUILD	2018-01-08 17:41:34 -08:00
Dante Ruiz	4cf40554c0	don't call setQmlTabletRoot twice	2018-01-08 16:06:31 -08:00
vladest	891663bae9	Page indicator visible only when pages more than one	2018-01-08 23:07:09 +01:00
Zach Fox	611f25d542	Improve scrolling thru My Purchases	2018-01-08 13:17:04 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Zach Fox	dcfceab078	Remove all work done on paginating purchases	2018-01-08 12:03:56 -08:00
MiladNazeri	56d4429a8b	Merge pull request #12020 from ctrlaltdavid/21646 ... Window JSDoc	2018-01-08 11:53:34 -08:00
Zach Fox	2231bf2bdd	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination	2018-01-08 11:45:20 -08:00
Zach Fox	cdd62c7119	I don't think auto-refresh and pagination of inventory is possible	2018-01-08 11:29:41 -08:00
David Rowe	7a971b2d26	Fix typo	2018-01-09 08:17:15 +13:00
Zach Fox	99510f522d	Merge pull request #12095 from ElderOrb/FB10621 ... FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"	2018-01-08 10:05:53 -08:00
John Conklin II	d660bbf6e5	Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit ... Bug fix for sit script.	2018-01-08 09:59:17 -08:00
luiscuenca	50f89182d7	Add Utils.jsc	2018-01-07 18:29:13 -07:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser ... Consistent go to user	2018-01-07 11:07:39 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
David Rowe	673bc7de38	Update Window JSDoc	2018-01-06 16:05:55 +13:00
Anthony Thibault	1a97d1de0f	Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter ... Added exponential smoothing filter for vive pucks.	2018-01-05 16:50:55 -08:00
Anthony J. Thibault	243dcb88ee	Bug fix for sit script.	2018-01-05 16:20:44 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 ... Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00
samcake	5a5d475c6c	Reinstall the packing of the qrc in the executable in DEV_build	2018-01-05 14:03:52 -08:00
Brad Hefta-Gaub	aebd098e6e	Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting ... WL#21654: Make the Asset Browser Sort Case Insensitive	2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Sam Gateau	91eb718074	Merge pull request #12091 from SamGondelman/overlayFix ... Update model render items on texture load and fix no haze issue	2018-01-05 12:26:56 -08:00
David Back	b165eac6a0	Merge branch 'master' into mergeAccountGlobalServices	2018-01-05 10:54:59 -08:00
Melissa Brown	eb83c68d46	Merge pull request #12094 from ctrlaltdavid/resolution-removed ... Delete web3d overlay "resolution" property JSDoc	2018-01-05 10:38:07 -08:00
vladest	02972c92f0	Merge branch 'master' into tablet_pagination_magnify	2018-01-05 19:12:13 +01:00
Seth Alves	2071d42d25	Merge pull request #12088 from ElderOrb/FB11008 ... 11008 GoTo app does not focus on address bar when opened	2018-01-05 10:07:36 -08:00
Andrew Meadows	c33c637f07	Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs ... Adopt path to certain Tablet dialogs to new loading subsystem and pat…	2018-01-05 09:07:54 -08:00
Ryan Downe Karpf	a3245aec57	Merge pull request #12079 from RebeccaStankus/log-filtering ... Log filtering	2018-01-05 08:40:41 -08:00
Seth Alves	fd8b521c50	Merge pull request #12038 from ElderOrb/audio_name_conflict_fix ... Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)	2018-01-05 08:15:48 -08:00