Commit Graph

964 Commits

Author SHA1 Message Date
deilann 3580a8b1a3 Merge pull request #201 from tjwds/wikiforreal
Update groups.json (only en this time)
2014-05-05 20:05:41 -07:00
joe woods 49f2c67cfa Update groups.json
ayyyyeee
2014-05-05 22:57:54 -04:00
deilann 0a85b7e35a updating daniel text to make inn mechanics clear
Fixes https://github.com/HabitRPG/habitrpg/issues/3248
2014-05-05 18:47:40 -07:00
Tyler Renelle 00147a8671 Merge pull request #198 from jbutz/todo_archive_flag_cron
feat(archive_todo): add cron to archive todos
2014-05-03 21:44:11 -06:00
Tyler Renelle bedf472ff3 Merge remote-tracking branch 'PeterHatch/single-pass-spritesmith' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2014-05-03 21:29:37 -06:00
Tyler Renelle 746ce6de4f feat(spring): take egg hunt quest out of the market 2014-04-30 22:28:54 -06:00
Tyler Renelle c091290fd0 feat(may): may mystery box 2014-04-30 22:26:30 -06:00
Tyler Renelle b304243119 feat(spring): back to normal npcs 2014-04-30 22:17:59 -06:00
Sabe Jones af45479f93 fix(abilities): Correct crits, desc for Flames
Clarifies mechanics of Burst of Flames, and changes crittable spells to use the secondary stat for the class in question.
2014-04-30 21:38:26 -05:00
Tyler Renelle 34c86a869f chore(grunt): grunt 2014-04-30 00:31:23 -06:00
Sabe Jones 6ff3046230 fix(abilities): Correct crits and desc for Smash
Change the critical hit stat for Brutal Smash to use STR instead of PER, and update description for completeness/accuracy.
2014-04-29 22:12:27 -05:00
Sabe Jones 258ed6f003 fix(achievements): Tweak wording for Streaker
Updated the Streaker achievement modal text to be more appropriate given the fact it now only appears the first time it's attained.
2014-04-28 06:29:43 -05:00
Sabe Jones 193dd46ad3 feat(checklists): Create expand/collapse string
String for tooltip to indicate that checklist badges are clickable
2014-04-26 18:09:34 -05:00
Sabe Jones b783f4ba4c fix(gear): Typo correction
Change "status" to "stat" in description of bunny ears
2014-04-25 22:38:38 -05:00
Sabe Jones a2afea351a fix(quests): Replace @ with bold
The @ convention for calling out usernames makes sense in chat, due to the At functionality, but it looks rather odd in quest text. Replaced it with some inline HTML that should serve the purpose more elegantly.
2014-04-24 19:08:13 -05:00
Tyler Renelle db95376b52 feat(mystery): april mystery items 2014-04-24 17:42:36 -06:00
benmanley 8b26a92b7f i18n(toolbar): add string for "noNotifications" 2014-04-23 21:30:46 +01:00
Sabe Jones 676d90fda0 fix(cron): Move daily MP after Perfect Day
Previously, users gained MP very early in the cron process. This meant that no buffs affected daily MP gain. Now, MP gain happens after the Perfect Day bonus is applied, so getting an INT boost that pushes you over 100 max MP gives you a tangible benefit.
2014-04-22 21:05:58 -05:00
Tyler Renelle b0c1b13af0 fix(vice3): allow re-purchase of broken "Stephen Weber's Shaft of the
Dragon". Fixes https://github.com/HabitRPG/habitrpg/issues/3308
2014-04-22 12:27:35 -06:00
Jason Butz 52ff5a7d5a feat(archive_todo): update to archive todos
I thought this bit of code was in the other repo. So long as part 3 follows
close behind this, there shouldn't be an issue
2014-04-18 12:33:45 -04:00
Jason Butz 17aed0a9d7 feat(archive_todo): add cron to archive todos
This is part 2 of habitrpg#3062. Part 1 MUST be merged first.
Part 1 pull request: habitrpg#3302
2014-04-18 11:45:21 -04:00
Tyler Renelle 4d4339903a chore(grunt): grunt 2014-04-18 08:36:59 -07:00
deilann c15789d6ae Merge pull request #197 from denis-sokolov/default-tasks
improve(default-tasks): add checklist, emojis, markdown
2014-04-17 00:30:19 -07:00
Denis Sokolov 93ccb987d8 improve(default-tasks): add checklist, emojis, markdown 2014-04-17 16:12:09 +09:00
Tyler Renelle bc5ff6412a feat(wondercon): add wondercon gear 2014-04-16 17:47:09 -06:00
Tyler Renelle b93bf8be7f feat(accessories): add body accessory & better handling of gear sorting 2014-04-16 17:44:13 -06:00
Tyler Renelle cfb762db58 chore(grunt): grunt 2014-04-15 14:56:14 -06:00
Sabe Jones 1e128a3ae9 fix(achievements): Differentiate singular and plural
Gets rid of the clunky "(s)" on the Streak and Perfect Day achievements, and makes a few other textual improvements.
2014-04-14 22:18:50 -05:00
Tyler Renelle 64b4ce69aa i18n(notif-restyle): add "clear" 2014-04-13 23:02:33 -06:00
Tyler Renelle daa627a5cc i18n(notif-restyle): add strings for "menu" & "notifications" 2014-04-13 23:00:39 -06:00
Dušan Juretić 1a881c63d0 Fix Quests unit tests: allow gp and exp to be 0 2014-04-12 13:13:48 -03:00
deilann 4cdf3b1f3c Merge pull request #195 from meganstrickland/develop
Pet Egg Skeleton sprite correction
2014-04-07 16:05:40 -07:00
meganstrickland 043f017602 Pet Egg Skeleton sprite correction
Skeleton Pet Egg was using an old version of the file with stray pixels.
I've replaced the file with the corrected version.
2014-04-07 16:03:41 -07:00
deilann 79171b707e string to clarify no adding members to existing quests
"Remember: only current party members will be invited. Once the invitation is sent, no new party members can join the quest!" to go at bottom of quest modals.

Should hopefully cut back on the number of newer players starting a quest and thinking they can add other folks.
2014-04-07 15:56:12 -07:00
Tyler Renelle 692a1f6639 feat(spring): put spring npcs back in (@lemoness) 2014-04-07 15:08:52 -06:00
Tyler Renelle 462ffe5fd3 chore(grunt): grunt 2014-04-06 21:51:40 -06:00
Tyler Renelle bd8d2dcbd0 feat(eggQuest): add april egg quest 2014-04-06 21:29:34 -06:00
deilann 491f0e8b81 Merge pull request #194 from mapleoin/commadot
replace comma with dot before capitalization
2014-04-06 14:02:27 -07:00
Ionuț Arțăriși 1ca15c04ce replace comma with dot before capitalization 2014-04-06 22:57:41 +02:00
Tyler Renelle a1eb1f8a59 feat(hair): limited ed pastel hair 2014-04-03 23:00:24 -07:00
Tyler Renelle c9b63a6a31 feat(premium): april mystery box 2014-04-02 00:15:02 -06:00
Tyler Renelle 7b040242bb fix(npcs): put ian.gif back in 2014-04-02 00:10:52 -06:00
Tyler Renelle 4b03f373dd chore(april-fools): revert april fools 2014-04-02 00:06:34 -06:00
Tyler Renelle c091be3064 feat(april-fools): april-fools npcs & characters 2014-03-31 20:09:28 -06:00
Tyler Renelle 806151dbe7 chore(grunt): grunt 2014-03-30 18:26:34 -06:00
deilann 383d0204f4 Merge pull request #192 from PeterHatch/lower-ski-parka
Lowered Ski Parka by one 3x3 pixel block.
2014-03-30 05:56:54 -07:00
deilann 5db43ecd66 add self damage from dailies to quest info
https://github.com/HabitRPG/habitrpg/issues/3170
2014-03-30 03:00:28 -07:00
Peter Hatch 67a9fa4b27 Lowered Ski Parka by one 3x3 pixel block. 2014-03-29 20:15:25 -07:00
deilann 44a92df300 Merge pull request #190 from mapleoin/questscontent
fix some minor grammar/spelling mistakes in Quests Content
2014-03-29 14:58:52 -07:00
Ionuț Arțăriși 7a989203b5 fix some minor grammar/spelling mistakes in Quests Content
- squeeking should be squeaking

"How can you expect to the fight the beast if it already has control over you?"
should be:
"How can you expect to fight the beast if it already has control over you?"

"The beast is a grand dragon of immense power and comprised of the
shadows themselves. Vice, the treacherous Shadow Wyrm."
- the second sentence has no verb, it should be a continuation of the
  first one
2014-03-29 18:11:43 +01:00