Commit Graph

209 Commits

Author SHA1 Message Date
Tyler Renelle 20376d69c0 don't hide completed todos from challenge progress modals 2014-01-03 14:42:18 -07:00
Tyler Renelle 81ca8d15b5 bring @JasonGross changes back in. Jason, updates should go to
script/content.coffee (dist/habitrpg-shared.js is a compiled file and
gets clobbered)
2014-01-03 14:18:35 -07:00
Tyler Renelle b0666cb1e3 challenges: don't remove challenge todos on clear-completed 2014-01-03 14:17:02 -07:00
Tyler Renelle 0e6f352e70 Merge pull request #71 from JasonGross/greener->bluer
Tasks get blue when you do them often, and the text for Pickpocket should reflect this
2014-01-02 20:20:11 -08:00
Tyler Renelle 1803bdb2ed fix https://github.com/HabitRPG/habitrpg/issues/2073 2014-01-02 21:09:26 -07:00
Jason Gross 3fbb454886 Tasks get blue when you do them often, not green.
I believe the sequence is red -> yellow -> green -> blue.  The text for 'Pickpocket' now reflects this slightly better, I believe.
2014-01-02 21:25:58 -05:00
Tyler Renelle 93201b5d39 back to normal winter npc sprites 2014-01-02 16:35:49 -07:00
Tyler Renelle 24b99617e6 grunt 2014-01-02 16:31:23 -07:00
Tyler Renelle b76b275a7c winter: party hat fix, big snowball in inventory (@lemoness). Still
small one in spells list, those are 32x22. I say we just leave it
2013-12-31 08:54:26 -07:00
Tyler Renelle 0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) 2013-12-31 08:47:10 -07:00
Tyler Renelle 549fd7bac0 new year's eve event: party hat, new NPCs 2013-12-31 08:44:01 -07:00
Tyler Renelle 19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2013-12-31 07:56:35 -07:00
Tyler Renelle eb016649e1 checklists: grant GP bonus for CLIs on To-Dos 2013-12-30 14:51:49 -07:00
Tyler Renelle 85c96886a3 checklists: point-match TDs for each CL-item. Bug fix on resetting CLs
on cron
2013-12-30 13:23:48 -07:00
Tyler Renelle bb80176920 checklists WIP 2013-12-29 22:37:12 -07:00
Tyler Renelle bb5fe9c6e5 classes: temporary stopgap for
https://github.com/HabitRPG/habitrpg/issues/2150 , burst-of-flames being
too powerful. This isn't the real solution we need something better
2013-12-29 16:58:45 -07:00
Tyler Renelle dfa25c6f3a fix https://github.com/HabitRPG/habitrpg/issues/2156 stack stealth 2013-12-28 22:01:44 -07:00
Tyler Renelle 77a1c91422 grunt 2013-12-28 16:35:38 -07:00
Tyler Renelle dfd2a17ef9 APIv2: instead of passing req to callback, passing response object so API can return the object when wrapped on the server 2013-12-28 11:51:38 -07:00
Tyler Renelle bafa3ffd21 winter: add snowball achievement 2013-12-27 09:48:35 -07:00
Tyler Renelle de0f2d5e48 #64 move hair_color_wips to project_files/ so they dont' get compiled to
the spritesheet (we'll move them back when they're complete). Add
 updated healer shields to shop_*, remove artifact from
 hair_bangs_rot. @crystalphoenix thanks for hard work!
2013-12-27 09:17:59 -07:00
Tyler Renelle ebd9872474 grunt with sabe's changes 2013-12-27 09:09:49 -07:00
Tyler Renelle 82afe6e796 spritesmith: swap xmas bailey => winter bailey @lemoness 2013-12-26 15:25:51 -07:00
Sabe Jones 54ed3c9497 Fix HabitRPG/habitrpg#2100 (can't get Ultimate Gear with Mage stuff) 2013-12-26 09:11:07 -06:00
Tyler Renelle dff68a6443 fix https://github.com/HabitRPG/habitrpg/issues/2114 (thanks @EvilTosha, was huntin that one!) 2013-12-25 20:37:49 -07:00
Sabe Jones 98556fdb23 Set the rebirth level on first achievement 2013-12-25 17:36:36 -06:00
Sabe Jones aeb74bbbf5 Remove broken notification 2013-12-25 17:25:32 -06:00
Sabe Jones d238592eb4 Fix NaN error on first achievement 2013-12-25 17:08:42 -06:00
Sabe Jones 701be90da2 Add achievement for rebirths 2013-12-25 16:55:07 -06:00
Tyler Renelle 84ef3fb861 API: better task defaults (for 3rd-party up/down scoring) 2013-12-25 10:56:21 -07:00
Tyler Renelle c7b5b5e601 Merge branch 'bosses' into develop 2013-12-25 08:25:06 -07:00
Tyler Renelle c2e01595c9 upgrade spritesmith 2013-12-25 00:34:20 -07:00
Tyler Renelle 1f3198e77b bosses: add content for evil-santa. also add "completion" field for quest content 2013-12-24 23:55:53 -07:00
Tyler Renelle 20d3c59c3b rename user.party.tally => user.party.progress 2013-12-24 21:57:46 -07:00
Sabe Jones 44d738af50 Herp derp, i can script coffee 2013-12-24 22:07:27 -06:00
Sabe Jones 6f4427b087 Fix bug (preexisting in Fortify, new in Rebirth) that zeroed out prices of custom Rewards 2013-12-24 21:55:54 -06:00
Sabe Jones 79bd322900 Complete op, except for Achievement. H/T @lefnire for the streak reset fix! 2013-12-24 21:18:29 -06:00
Tyler Renelle 9aeb4f9ffb quests: add collection quests & quest arks 2013-12-24 17:24:32 -07:00
Sabe Jones baa2e2a8fd Try a vanilla CoffeeScript (haha) solution 2013-12-24 17:24:05 -06:00
Sabe Jones 50ffe4dcda Attempt to fix bug that turned all tasks into Dailies 2013-12-24 16:22:24 -06:00
Sabe Jones f8b1fbda51 Fix "bounce" of Rebirth unlock. Other flags weren't sticking either; attempt alternate method of turning them off 2013-12-24 16:04:28 -06:00
Sabe Jones 8d51520b80 Compile rebirth CS into JS, fix Gem price 2013-12-24 15:36:03 -06:00
Sabe Jones c25394ad45 Fix missing unlock logic from grunt commit 2013-12-24 08:36:53 -06:00
Tyler Renelle 883abf34dd rebirth: grunt (@sabrecat) 2013-12-23 18:59:41 -07:00
Tyler Renelle 9d49176997 gpMod typo 2013-12-23 17:46:50 -07:00
Tyler Renelle 5eadabbf10 Quests: Initial bosses WIP, change all content.*.name to content.*.key for consistency (and to make room for quest.name). Bugfix on STR adjustment 2013-12-23 00:45:39 -07:00
Tyler Renelle 7f3337c1b9 Quests: Initial bosses WIP, change all content.*.name to content.*.key for consistency (and to make room for quest.name). Bugfix on STR adjustment 2013-12-22 22:20:44 -07:00
Sabe Jones 2f48b5f63d Initial commit: Rebirth unlock notification 2013-12-22 08:34:13 -06:00
Tyler Renelle b1a9e60c8e stats.mp++ when completing todos @wc8 @danielthebard 2013-12-21 16:44:15 -07:00
Tyler Renelle 1ba7700f43 Revert "restore MP on level up, and some additional MP on cron (based on"
This reverts commit b98cfdb066.
2013-12-21 16:38:32 -07:00