habitica-android/Habitica/res
Phillip Thelen 1469e6fe54 Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/layout/activity_task_form.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
2016-02-26 14:02:15 +01:00
..
anim Added a slide in and out animation to FAB when scrolling 2015-12-18 21:21:05 +11:00
drawable Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
drawable-hdpi Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
drawable-mdpi Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
drawable-v21 optical feedback on habit button +/- touch 2015-12-16 14:39:32 +01:00
drawable-xhdpi Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
drawable-xxhdpi Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
drawable-xxxhdpi Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
layout Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
menu Move activities to /ui/activities package 2015-12-21 20:19:51 +01:00
mipmap-hdpi update app icon 2015-12-09 00:26:28 +01:00
mipmap-mdpi update app icon 2015-12-09 00:26:28 +01:00
mipmap-xhdpi update app icon 2015-12-09 00:26:28 +01:00
mipmap-xxhdpi update app icon 2015-12-09 00:26:28 +01:00
mipmap-xxxhdpi update app icon 2015-12-09 00:26:28 +01:00
values display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
values-land First implementation of avatar rendering 2015-07-20 19:00:03 +02:00
values-lt add translations 2016-02-17 22:16:11 +01:00
values-pl add translations 2016-02-17 22:16:11 +01:00
values-pt-rBR add translations 2016-02-17 22:16:11 +01:00
values-sw320dp Redesign login screen 2015-11-09 18:48:01 +01:00
values-sw600dp Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
values-sw720dp-land Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
values-w820dp add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +02:00
xml fix 132 2016-01-17 18:38:26 -05:00