Commit Graph

9193 Commits

Author SHA1 Message Date
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 7107f2d323 refactor(bosses): DRY bosses so we can share code between tavern boss &
party boss
2014-06-25 13:34:44 -06:00
Tyler Renelle 3b0a22409e perf(achievements): bindonce on achievements 2014-06-25 13:34:08 -06:00
Matteo Pagliazzi ef38db9fad chore(i18n): update locales 2014-06-25 18:08:03 +02:00
deilann b68126a76b Merge pull request #3653 from wc0/patch-1
add dataTool link to tavern.jade
2014-06-24 19:24:49 -07:00
Tyler Renelle 2bffa643a9 feat(mystery): mystery items 062014 2014-06-24 16:45:47 -06:00
Tyler Renelle fd645fb6a5 feat(mystery): mystery items 062014 2014-06-24 16:41:18 -06:00
wc0 a343759e82 add dataTool link to tavern.jade
adds dataTool link, step 2 for https://github.com/HabitRPG/habitrpg/issues/3649
2014-06-24 16:10:18 -04:00
deilann 17f857f493 Merge pull request #236 from wc8/patch-3
add string to groups.json
2014-06-24 13:09:20 -07:00
wc8 3ef239d73d add string to groups.json
step 1: https://github.com/HabitRPG/habitrpg/issues/3649 dataTool string
2014-06-24 15:58:22 -04:00
Matteo Pagliazzi b9bd9c7970 chore(i18n): update locales 2014-06-24 20:03:23 +02:00
Sabe Jones 91cdf4e272 Merge pull request #233 from Alys/patch-1
Beastmaster: props -> congratulate (remove slang)
2014-06-23 19:00:39 -05:00
Sabe Jones 63c3938b37 Merge pull request #235 from Alys/patch-2
"No Back Accessory" for base back - fixes #3640
2014-06-23 18:59:34 -05:00
Yafinee 9f39000cc1 #3633 - Attributes order 2014-06-23 16:08:38 +00:00
Alice Harris 806dd051fa "No Back Accessory" for base back - fixes #3640
Changes the text and notes for the base back gear from "No Helm" to "No Back Accessory".
2014-06-23 18:09:15 +10:00
deilann 996e7b243b fix(tests): add in freeRebirth 2014-06-22 14:10:25 -07:00
deilann 931525df0b fix(tests): add in freeRebirth
Really, I should fix this more systematically, but I think this should fix the tests for the moment, which is badly needed.
2014-06-22 14:00:59 -07:00
deilann 5181b046b4 fix(winter): add specialClass to winter 2013 items
Fixes https://github.com/HabitRPG/habitrpg/issues/3641

Removed "can own" text and replaced it with specialClass, so that Winter 2013 items grant class bonus.
2014-06-22 13:37:34 -07:00
Sabe Jones eb07a9c77a feat(crits): Make crit hits boost MP
Another nudge to make STR more attractive: critical hit on a To-Do multiplies MP gain.
2014-06-22 14:44:39 -05:00
Nicolás Jones 272b71fc11 Update settings.jade 2014-06-22 13:45:27 -03:00
Alice Harris ec0248f6c8 Beastmaster: props -> congratulate (remove slang)
"give this user props" is an idiomatic phrase that non-native-English speakers could have problems with, especially since "prop" is also a noun that refers to an object. 

A player in the Tavern today said, _"Yeah! Beast Master Quest Complete! :D What about this 'give this user props!', am I going to get some cool gear or sth? :D"_  I had to disappoint him with the sad truth. :)
2014-06-22 19:03:53 +10:00
wc8 94ec31c750 reverts to danielText
Had intended to submit Tavern message as a pull request, not directly edit, will resubmit later.
2014-06-21 21:22:56 -04:00
Rob Eden 89d4db6d6e Increase max-width of food-tray to 17em
Increase max-width of food-tray to 17em to allow for scrollbar when necessary.
2014-06-21 14:51:32 -05:00
wc8 339dad2165 Update tavern.jade
changes popover content for daniel, adds message & links for https://github.com/HabitRPG/habitrpg/issues/3627 but this only my second pull request so it likely need to be reviewed before it is pulled. I basically followed the Pets links for Matt's messages.

#232 is needed before this one to add the danielTavern strings content.
2014-06-21 15:29:18 -04:00
Tyler Renelle 1a7530d6e4 Merge pull request #3636 from vIiRuS/fixApiDoc
Fix api documentation
2014-06-21 13:19:43 -06:00
wc8 45bf2ff4af innText update of groups.json to call username
, <%= name %>? added to innText
2014-06-21 15:15:39 -04:00
deilann d72ca6f650 Merge pull request #230 from wc8/patch-1
innText update of groups.json 2nd try
2014-06-21 12:06:55 -07:00
wc8 8e68e3810e innText update of groups.json 2nd try
Trying again without incorporating username.
2014-06-21 14:57:05 -04:00
Tyler Renelle 0dfefb72c9 Merge pull request #3635 from vIiRuS/newStuff
create new static view for news
2014-06-21 12:06:34 -06:00
Phillip Thelen c6d24853f0 Fix api documentation
correctly display swagger-ui and change old api documentation
2014-06-21 19:31:52 +02:00
Phillip Thelen 8175f01f23 create new static view for news 2014-06-21 18:38:30 +02:00
Tyler Renelle 3a29ae437c perf(chat): {{::bindonce}} test on chat to see if that improves, #3486 2014-06-20 21:00:39 -06:00
Tyler Renelle f939bdcbcb feat(summer): summer event 2014-06-20 15:28:29 -06:00
Tyler Renelle 040f922d95 chore(bailey): summer update + new gear, npcs, etc 2014-06-20 15:09:14 -06:00
Tyler Renelle 81ab40f89f summer 2014-06-19 23:15:24 -06:00
deilann c78fa3c514 Merge pull request #3629 from robeden/develop
Cap food-try max width to 15em
2014-06-19 15:03:30 -07:00
Rob Eden 3e04ec9215 Cap food-try max width to 15em
Fix for https://github.com/HabitRPG/habitrpg/issues/3628, which caps the max-width in .food-tray to 15em.
2014-06-19 16:17:43 -05:00
Nicolás Jones 9f6e6af5c7 Update settings.jade 2014-06-18 00:10:48 -03:00
Nicolás Jones 9f8baa617e Update settingsCtrl.js 2014-06-18 00:03:45 -03:00
Nicolás Jones f7727eef23 Update settingsCtrl.js 2014-06-18 00:03:21 -03:00
Nicolás Jones 207975f592 Update settings.jade 2014-06-18 00:02:35 -03:00
Tyler Renelle 6fdec4a146 refactor(stats): iterate stats via jade instead of angular. needed for some mobile stuff 2014-06-17 16:30:13 -06:00
deilann 39908ed8fa Merge pull request #228 from robeden/develop
Fix for issues #3573 - Correction for strange pixel on gems.
2014-06-17 13:58:21 -07:00
Rob Eden fb68cf87a9 Fix for issues #3573 - Correction for strange pixel on gems. 2014-06-17 10:45:20 -05:00
Tyler Renelle 8d31376165 fix(mongo): tmp fix to #3607 until
https://github.com/LearnBoost/mongoose/issues/1920 fixed
2014-06-16 17:45:42 -06:00
Tyler Renelle b2ebc93cac Merge pull request #3613 from negue/fix_margins
fix avatar and background margin
2014-06-16 17:36:40 -06:00
Matteo Pagliazzi 7e11d970a8 fix(i18n): use string 2014-06-16 21:55:31 +02:00
Matteo Pagliazzi 57e1013ada fix(i18n): stable 2014-06-16 21:52:25 +02:00