Commit Graph

675 Commits

Author SHA1 Message Date
Tyler Renelle ab3c238d11 fix(avatar): put missing ng-click=buy-set back in 2014-09-30 22:06:05 -06:00
Tyler Renelle 3605b51748 feat(halloween): refactoring skin & hair to use the same mixins, add new
halloween seasonal set
2014-09-30 21:25:06 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets
feat(pets): release pets
2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Negue b3c8acef10 fix guild list 2014-09-18 19:47:30 +02:00
Matteo Pagliazzi 7e53eaf1ae Revert "Revert "ngRepeat with track by""
This reverts commit c90c8f9a5f.
2014-09-18 18:37:02 +02:00
Tyler Renelle 94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Alice Harris 6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
2014-09-16 14:15:01 +10:00
Alice Harris e6a29f80fa Merge pull request #4002 from Alys/questAbortFix
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
2014-09-12 14:01:09 +10:00
Alice Harris 5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00
Alice Harris d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Alice Harris 9dcc2576c3 remove dev comment 2014-09-09 06:00:23 +10:00
Alice Harris b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris 0e163034cf semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-09 06:00:23 +10:00
Matteo Pagliazzi c90c8f9a5f Revert "ngRepeat with track by"
This reverts commit 397ef5e72c.
2014-09-08 12:30:30 +02:00
Negue 397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Tyler Renelle 5cc4bf8aca Merge pull request #3966 from Alys/questLeaderAndNotifications
mark Quest Owner in quest participants box on party page
2014-09-02 15:50:58 -06:00
Alice Harris fa96717175 mark quest owner in quest participants box on party page (in invitation stage and after quest started) 2014-09-02 17:33:26 +10:00
Alice Harris 679a120053 add Enable Class System button to User -> Stats ("Stats and Achievements") page when user has opted out 2014-09-02 14:56:14 +10:00
Tyler Renelle 592ffd9818 feat(registration): show some basic registration information on Settings
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
2014-08-25 18:01:57 -06:00
Tyler Renelle 184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop
Conflicts:
	views/options/settings.jade
2014-08-23 16:05:17 -06:00
Alice Harris fdf8aa696e add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892 2014-08-21 06:27:01 +10:00
Tyler Renelle 3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
Tyler Renelle a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Matteo Pagliazzi 6d251aeb91 feat(mobile): adapt boss box to mobile 2014-08-17 15:39:12 +02:00
Matteo Pagliazzi 4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00
Matteo Pagliazzi 0837f2c39b fix(mobile): start adapting boss to mobile 2014-08-17 13:29:40 +02:00
Alice Harris e500407466 change Request Feature link in footer, Tavern link box, CONTRIBUTING.md 2014-08-07 09:59:31 +10:00
Alice Harris 34a2e4c07a Merge pull request #3841 from Alys/defaultAvatar
split hairstyles into Base (free) and Set 1 (gems) fixes https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-05 08:14:09 +10:00
Matteo Pagliazzi 50d888e7f8 feat(backgrounds): move backgrounds to mixin 2014-08-04 14:41:59 +02:00
Alice Harris e340d584cd split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 15:56:44 +10:00
Jeremy Lee 26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) 2014-08-02 10:46:16 +10:00
Alice Harris a7502e10ea display backgrounds in reverse chronological order (most recent at top) 2014-07-27 14:54:17 +10:00
Tyler Renelle 6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness 2014-07-25 12:14:48 -06:00
Tyler Renelle a1f2375b9d feat(subscription): disable "update card" for paypal subscribers 2014-07-21 14:55:36 -06:00
Tyler Renelle dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall 5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Skyrunner 3ed977dad6 Fixed #3756?
It seems to be fixed, but I don't know the good development habits for
jade/whatever technology it is. Please comment & close if the fix is not
acceptable.
2014-07-20 16:54:18 +09:00
Tyler Renelle acc874c60d Merge pull request #3597 from 3onyc/feature/username-change
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
Tyler Renelle 34236536df feat(admin): allow admins to update user's items (restoring lost items,
granting quest scrolls, etc). @deilann :)
2014-07-17 14:09:39 -06:00
benmanley 4cf1030c85 refactor(game-pane.styl): tweak layout and colors
– Improve positioning and size of chat-box buttons
– Replace some px values with ems
– Replace contributor colors with variables (set in global-colors.styl)
2014-07-14 21:52:56 +01:00
Matteo Pagliazzi f2a10f8fc1 feat(i18n): add notices 2014-07-13 18:00:35 +02:00
Tyler Renelle c66c5ec83b feat(quests): seahorse quest 2014-07-07 15:02:19 -06:00
Matteo Pagliazzi e8779f2121 fix(jade): fix jade warning about "missing space before text for line..." 2014-07-04 12:09:18 +02:00
benmanley 967c46be87 refactor(boss): restyle boss stats meters
Update to reflect redesigned stats meters
2014-07-03 17:14:25 +01:00
Tyler Renelle d6d2be9a00 perf(inventory): bindonce for inventory listings, #3486 2014-07-01 12:42:26 -06:00
Tyler Renelle 9c55bfb498 fix(dilatory): round boss hp/rage to bil/mil/thou, fixes #3667 2014-06-30 21:28:09 -06:00
Tyler Renelle de2ba36274 fix(dilatory): typo 2014-06-30 20:47:02 -06:00
Tyler Renelle 76b509ef78 Merge branch 'bindonce-guilds' into develop 2014-06-30 19:40:36 -06:00
Tyler Renelle e5c002bcdb feat(chat): dynamic list of tavern mods (see http://goo.gl/9XhIZ6) 2014-06-29 16:20:38 -06:00