Commit Graph

1144 Commits

Author SHA1 Message Date
Tyler Renelle 893f04aaa2 fix(dilatory): update stats with real avgs from global usage 2014-06-30 19:55:51 -06:00
Tyler Renelle 0dcbe7b18c chore(premium): update present box 2014-06-30 19:49:49 -06:00
Matteo Pagliazzi 47eef0d02c chore(i18n): update locales 2014-06-30 21:38:25 +02:00
Tyler Renelle 339b1c5354 fix(i18n): remove static contrib list (see http://goo.gl/9XhIZ6 , #239) 2014-06-29 16:14:53 -06:00
Tyler Renelle d12f3a6bf9 Merge pull request #239 from Alys/moderators
add list of moderators to top of Tavern chat
2014-06-29 16:12:25 -06:00
Matteo Pagliazzi aa2b3599ad Merge pull request #240 from Omnomnobot/patch-1
Fixed a typo ("whe" --> "when")
2014-06-28 15:23:51 +02:00
Omnomnobot 0e22e9771f Fixed a typo ("whe" --> "when") 2014-06-28 10:17:27 +02:00
Alice Harris 3c8d37f2d9 add moderator names (moderatorList.json) and associated text (moderatorIntro* in groups.json) for displaying at the top of Tavern chat 2014-06-28 14:25:50 +10:00
Tyler Renelle 92fc8bd5cf feat(dilatory): broken matt 2014-06-27 13:07:37 -07:00
Tyler Renelle 006927ba35 Merge pull request #238 from vIiRuS/patch-1
Check if items are owned before equipping
2014-06-27 12:24:47 -07:00
Phillip Thelen c190d49b4f Check if items are owned before equipping
This checks if the user actually owns the pet, mount or gear they are trying to equip. This also prevents users from setting things that do not exist. (before users could set the value for pets and mounts to any string. Not sure if this leaves possiblilities for xss attacks. but this fix also prevents that).
2014-06-27 14:36:25 +02:00
Matteo Pagliazzi 01769e3dea chore(i18n): update locales 2014-06-26 12:27:00 +02:00
Tyler Renelle e8e9a5b123 Merge pull request #237 from Alys/patch-1
fix 2 spelling mistakes
2014-06-25 21:38:49 -06:00
Tyler Renelle de302ecf45 feat(dilatory): better strings for negelect strings & completion, + formatting 2014-06-25 21:34:37 -06:00
Alice Harris 103cd95b0a fix 2 spelling mistakes
havock -> havoc
Habitca -> Habitica
2014-06-26 12:34:57 +10:00
Tyler Renelle 1fc62f1322 fix(bosses): Limit Break => Rage 2014-06-25 14:58:05 -06:00
Tyler Renelle e62a18bd37 feat(dilatory): Add dilatory boss. Add limit-break (rage) to bosses. Add defense 2014-06-25 14:49:24 -06:00
Matteo Pagliazzi ef38db9fad chore(i18n): update locales 2014-06-25 18:08:03 +02:00
Tyler Renelle fd645fb6a5 feat(mystery): mystery items 062014 2014-06-24 16:41:18 -06: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
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
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
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 f939bdcbcb feat(summer): summer event 2014-06-20 15:28:29 -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
Matteo Pagliazzi b557007aa8 chore(i18n): update locales 2014-06-16 21:37:46 +02:00
deilann 5beff88330 fix(backgrounds): clearer wording wrt lim editions
Fixes https://github.com/HabitRPG/habitrpg/issues/3610
2014-06-15 10:11:38 -07:00
Matteo Pagliazzi ab3a86d8a2 chore(i18n): update locales 2014-06-13 22:35:05 +02:00
Tyler Renelle 8989f4a465 i18n(background): Backgrounds => "User Backgrounds" @lemoness 2014-06-12 13:34:20 -06:00
Matteo Pagliazzi 4b07f6dfcd chore(i18n): update locales 2014-06-12 15:21:49 +02:00
Tyler Renelle 81108a0039 feat(backgrounds): i18n for backgrounds 2014-06-10 18:29:33 -06:00
Tyler Renelle 1151576e6c feat(backgrounds): group bgs into sets in content.coffee, for easier
"purchase set"
2014-06-10 17:47:08 -06:00
Tyler Renelle d95528a205 feat(backgrounds): add backgrounds feature 2014-06-10 17:47:08 -06:00
deilann 7161462f2c fix(typo): percepition to perception
Fixes https://github.com/HabitRPG/habitrpg/issues/3586
2014-06-10 02:17:22 -07:00
Sabe Jones d9cf1813c8 Merge pull request #225 from Gaelan/just_call_it_perception
Stop using abbreviated names of attributes in UI.
2014-06-09 22:09:43 -05:00
Bob Example 648d8dfa9d Stop using abbreviated names of attributes in UI. 2014-06-09 17:14:31 -07:00
Tyler Renelle 9767c540c3 feat(bosses): add Octohulu quest 2014-06-09 14:23:46 -06:00
Tyler Renelle 781ebfccce fix(equipment): only markModified(gear) when equipping gear 2014-06-09 13:31:32 -06:00
Matteo Pagliazzi baa43e5d44 chore(i18n): update locales 2014-06-07 14:30:03 +02:00
Matteo Pagliazzi e7682a14f6 fix(i18n): use strings 2014-06-07 14:26:11 +02:00
Tyler Renelle 5d2399015e Merge pull request #222 from Alys/equip-fix2
show "unequipped" message instead of "equipped" when taking off gear
2014-06-06 13:58:06 -06:00