Commit Graph

267 Commits

Author SHA1 Message Date
Tyler Renelle 5fd805db88 feat(plans): consectuive-month subscription perks (gifting) 2014-12-03 14:17:07 -07:00
Tyler Renelle 5b01fff700 feat(gifts): allow gifting subscriptions 2014-12-03 14:17:07 -07:00
Tyler Renelle e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle 57bfee02cf feat(plans): consecutive months & extra months (like a time-card) 2014-12-03 14:17:07 -07:00
Tyler Renelle e63f2b6d97 Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
Conflicts:
	database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
benmanley 50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Alice Harris 48cfd1c2a1 convert JackOLantern-Base pumpkin pet code to commented-out example code for future use 2014-11-01 07:30:40 +10:00
Tyler Renelle b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Blade Barringer ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Tyler Renelle d0caf5f69b tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save() 2014-10-14 17:40:20 -06:00
Tyler Renelle d5610ba01f tmp(halloween): grant pumpkin pet to all users through october,
REMEMBER revert on 11/1
2014-10-14 17:29:27 -06:00
Tyler Renelle 57a5a62d7c fix(memleak): possible improvements to leaked vars #4079 2014-10-06 17:59:07 -06:00
Tyler Renelle ef83c9999b fix(tests): snowball 2014-10-03 15:51:30 -06:00
Tyler Renelle 0bb1de680c fix(challenges): since we're setting {minimize:false} on tasks, don't
overwrite user tasks.*.challenges in the _.merge()
2014-10-03 14:34:58 -06:00
Matteo Pagliazzi 8fa8e39eca Revert "Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have""
This reverts commit 0fa7277cf0.
2014-10-03 19:05:37 +02:00
Tyler Renelle 0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Tyler Renelle e21230f8c2 Revert "small fix"
This reverts commit f3401e72c2.
2014-09-30 21:42:48 -06:00
Tyler Renelle 0fa7277cf0 Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have"
This reverts commit a6631f5d36.
2014-09-30 21:28:47 -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
Tyler Renelle a6631f5d36 fix(tasks): tmp fix for #4066, minimize:false on tasks so they have
tags:{} default empty object
2014-09-27 15:53:42 -06:00
Tyler Renelle f3401e72c2 small fix 2014-09-26 11:24:29 -06:00
Tyler Renelle 562f593c8f fix(spells): temp fix to #4067, for some reason _v is undefined after
casting spells?
2014-09-24 13:07:40 -06:00
Alice Harris c68a061c0d experimental changes for indicating acceptance of guidelines 2014-09-07 15:14:58 +10:00
Alice Harris 87d8387640 change order of staff/moderator names at top of Tavern chat to staff, npc, moderator 2014-09-05 21:20:42 +10:00
Alice Harris cd7f87bbfe add glyphicons to admin names, refactor code to reduce duplication of contrib.level style assignments, sort moderator name list sensibly 2014-09-05 21:17:56 +10:00
Alice Harris 73cd71d74b add star/tower glyphicons for mods/staff in Hall; in Hall, change admin's description of levels; create migration script for increasing admin tiers 2014-09-05 21:17:55 +10:00
Alice Harris 95b16f8690 change headAccessory to eyewear 2014-08-29 18:51:28 +10:00
Tyler Renelle 39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Alice Harris a8ad9f89e8 reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-07 13:50:29 +10:00
Tyler Renelle 33b2e8c4fe fix(flower): remove default on flower for now, #1529 @Alys 2014-08-05 13:08:40 -06:00
Matteo Pagliazzi 1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Alice Harris 2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 13:20:51 +10:00
Jeremy Lee 79bd088589 add correct styling to moderator names in message above Tavern chat 2014-08-02 07:28:29 +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 016d99a4a7 fix(dilatory): dont' modify original user.progress on world boss dmg,
fixes #3737
2014-07-14 20:52:37 -06:00
Tyler Renelle 7dfce54454 Revert "fix(quests): prevent very high damage for all quests" (@lemoness
@deilann - now it's just world boss, capped 900)

This reverts commit 89369e21a3.
2014-07-12 16:13:27 -06:00
Tyler Renelle 89369e21a3 fix(quests): prevent very high damage 2014-07-12 15:16:32 -06:00
Tyler Renelle 860b3acc52 fix(dilatory): tmp fix to prevent high damage #3712 2014-07-12 15:06:07 -06:00
Tyler Renelle 496618c665 fix(quests): don't reset quest progress when world boss defeated 2014-07-12 14:32:12 -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
Tyler Renelle 14c6019258 fix(dilatory): misc chat fixes for better formatting of neglect strikes 2014-06-25 21:35:22 -06:00
Tyler Renelle 9f1035c317 feat(dilatory): scene damage + boss def/str. bug fixes, tests 2014-06-25 14:12:30 -06:00
Tyler Renelle 79df201c66 feat(dilatory): load tavern boss on each cron, removing caching for now (was too buggy) 2014-06-25 13:34:45 -06:00
Tyler Renelle 850f67cd29 feat(bosses): add limit-break for bosses 2014-06-25 13:34:45 -06:00
Tyler Renelle fad4e5bb02 feat(dilatory): model updates for tavern bosses 2014-06-25 13:34:45 -06:00
Tyler Renelle eb5d47f604 chore(angular): upgrade to angular 1.3.0-beta.11 2014-06-11 15:58:07 -06:00
Tyler Renelle c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06:00