5753 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Phillip Thelen	c21c0a5e04	update stable section titles. #878	2017-11-13 19:47:59 +01:00
Phillip Thelen	c1121aa882	correctly remove purchased equipment. Fixes #859	2017-11-13 19:23:43 +01:00
Phillip Thelen	1a49b09860	fix title for rare pets category. Fixes #878	2017-11-13 18:17:13 +01:00
Phillip Thelen	c4796df94c	rename equipment category. fixes #856	2017-11-13 17:40:04 +01:00
Phillip Thelen	9b7b71021f	Fix copying PM to clipboard and update inbox name. Fixes #877	2017-11-13 17:39:56 +01:00
Phillip Thelen	7fbf6f28dd	Fix #875. Fix #876	2017-11-13 09:57:33 +01:00
Phillip Thelen	9f25f10eed	fix class change wording. Fixes #870	2017-11-13 09:40:36 +01:00
Phillip Thelen	0c0e4aee6b	bump build number	2017-11-13 09:40:20 +01:00
Phillip Thelen	024d3b1fc4	show number of available stat points in menu. Fixes #869	2017-11-08 20:43:49 +01:00
Phillip Thelen	a56291bd59	disable stat allocation if under level 10	2017-11-08 19:28:01 +01:00
Phillip Thelen	f8fa1ed413	fix owned count in shops. Fixes #874	2017-11-08 19:05:42 +01:00
Phillip Thelen	8bef22686b	fix weird edittext issues with stats allocation	2017-11-08 18:56:31 +01:00
Phillip Thelen	272af7773e	move background up from behind navbar. Fixes #867	2017-11-08 18:56:06 +01:00
Phillip Thelen	57e9beb3b1	improve unlock condition display	2017-11-08 18:29:11 +01:00
Phillip Thelen	d40d714203	fix class selection showing in wrong categories. Fixes #873	2017-11-08 18:00:01 +01:00
Phillip Thelen	d1fca880d4	change class dropdown design.	2017-11-08 16:53:52 +01:00
Phillip Thelen	3fe6faf4ef	update change class description Fixes #870	2017-11-08 16:52:35 +01:00
Phillip Thelen	c1331a7ed5	ignore amazon builds	2017-11-07 17:40:20 +01:00
Phillip Thelen	213f968633	add information for purchasing class gear. Fixes #855	2017-11-07 17:40:11 +01:00
Phillip Thelen	6fa2e25f93	convert purchase dialog	2017-11-07 12:10:09 +01:00
Phillip Thelen	9a9f0c5a28	Sort equipment by locked or not. Fixes #853	2017-11-06 13:59:20 +01:00
Phillip Thelen	448b62afb2	fix check for purchasing hourglass items. Fixes #860	2017-11-06 13:59:01 +01:00
Phillip Thelen	5180b20bb9	fix insufficient hourglasses icon. Fixes #861	2017-11-06 13:51:21 +01:00
Phillip Thelen	6565a7abba	fix shop equipment header. Fixes #856. Fixes #857. Fixes #858	2017-11-06 12:49:28 +01:00
Phillip Thelen	5c22353d2e	don’t allow locked items to be purchased. Fixes #854	2017-11-06 11:21:26 +01:00
Phillip Thelen	674e3c94a5	Fix crash on about screen. Fixes #851	2017-11-02 19:32:14 +01:00
Phillip Thelen	d205a537e3	Fix various crashes. Fixes #850	2017-11-02 19:15:48 +01:00
Phillip Thelen	2a202e5ad4	add stats tutorial step. Fixes #824	2017-11-02 18:46:04 +01:00
Phillip Thelen	021a6f45c7	resize streak icon. Fixes #849	2017-11-02 18:30:57 +01:00
Phillip Thelen	fefb315864	Improve auto allocation handling. Fixes #840	2017-11-02 18:18:07 +01:00
Phillip Thelen	3519704561	Fix crash in shops. Fixes #847	2017-11-02 18:02:25 +01:00
Phillip Thelen	fb69b84035	update stats after using bulk allocation. Fixes #845	2017-11-02 17:49:44 +01:00
Phillip Thelen	25857e608f	fix shop grid. fixes #844	2017-11-02 17:03:50 +01:00
Phillip Thelen	2256f10013	tweak bulk allocation visuals. Fixes #842	2017-11-02 16:20:52 +01:00
Phillip Thelen	a31596b756	improve gold display. Fixes #843	2017-11-02 13:41:23 +01:00
Phillip Thelen	bb607a8547	improve stats allocation slider tap area. Fixes #841	2017-11-02 13:31:44 +01:00
Phillip Thelen	329812878a	update stats icon. Fixes #839	2017-11-02 13:14:39 +01:00
Phillip Thelen	10d7d2e732	fix avatar customization page. Fixes #848	2017-11-02 11:56:49 +01:00
Phillip Thelen	7098a8e280	fix task reminders. Fixes #810	2017-11-02 11:56:14 +01:00
Phillip Thelen	1f8879d666	fix equipment screen. Fixes #846	2017-11-02 11:52:16 +01:00
Phillip Thelen	788d9045f7	Merge branch 'LunarGem-develop' into develop	2017-11-01 14:46:21 +01:00
Phillip Thelen	2c6ea19e20	Merge branch 'develop' of https://github.com/LunarGem/habitica-android into LunarGem-develop ... # Conflicts: # Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java	2017-11-01 14:46:10 +01:00
Phillip Thelen	0f717f8858	More Kotlin!	2017-11-01 14:43:20 +01:00
Phillip Thelen	b73f42bd9c	update translations	2017-11-01 14:43:19 +01:00
Phillip Thelen	aab9ee273e	Merge pull request #830 from LulaV14/feature/begin-quest-confirmation ... Add confirmation step to "begin" button for quests. Fixes #804	2017-11-01 14:38:48 +01:00
Phillip Thelen	640ca69007	Merge pull request #838 from aleien/fix-messages-like ... Don't show like button in messages	2017-11-01 14:31:38 +01:00
Phillip Thelen	cdf9500fa0	Merge pull request #837 from aleien/fix-tasks-backstack ... Fixed showing empty screen on back press	2017-11-01 14:28:37 +01:00
aleien	1e3cbfdad3	Not showing like button in messages	2017-11-01 00:24:05 +03:00
aleien	2a3edfeb3f	Fixed showing empty screen on back press	2017-10-31 23:55:34 +03:00
Phillip Thelen	fdbda662f9	begin converting repositories to kotlin	2017-10-31 19:51:23 +01:00