Commit Graph

627 Commits

Author SHA1 Message Date
Marcelo Sizer 91bcf7ff87 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:20:28 -02:00
Marcelo Sizer 97c1197a3e Create front.json file and minor fixes 2014-01-27 23:26:01 -02:00
Marcelo Sizer 04701ec121 Update json files for drops.jade 2014-01-27 15:08:22 -02:00
Marcelo Sizer 5bdc75593a Fix typos 2014-01-27 00:30:33 -02:00
Marcelo Sizer bc023189fd Fix typo 2014-01-26 17:35:23 -02:00
Marcelo Sizer 58cc787b5c Split main.json 2014-01-26 17:32:40 -02:00
Matteo Pagliazzi 138966cf1f Merge pull request #114 from HabitRPG/paglias/translations-refactoring
Refactor translations
2014-01-24 13:52:46 -08:00
Matteo Pagliazzi bd54bf1c53 refactor(translations) 2014-01-24 22:49:42 +01:00
Cole Gleason b246a6d430 Merge branch 'round-boss' into develop 2014-01-24 15:33:30 -06:00
Cole Gleason e76c81b3d7 refactor(api.percent): allow for round direction to be specified 2014-01-24 15:31:08 -06:00
Matteo Pagliazzi 50af412b1d refactor(translations) 2014-01-24 21:27:34 +01:00
Matteo Pagliazzi c96adf3552 refactor(translations): achievements 2014-01-24 20:08:19 +01:00
Matteo Pagliazzi 1663e09f74 improve(translation): stringNotFound use template 2014-01-24 18:03:03 +01:00
Matteo Pagliazzi aae81e7f93 fic(translations): remove string for terms and privacy 2014-01-24 17:39:11 +01:00
Matteo Pagliazzi 0b21a089be fix(translations): merge pr 2014-01-24 17:10:05 +01:00
Marcelo Sizer fd8e67e236 Fix version conflicts 2014-01-24 07:24:29 -02:00
Cole Gleason cbd3aeac70 Merge pull request #89 from colegleason/ultimate-gear
Calculate ultimateGear achievement in user.ops
2014-01-23 22:04:46 -08:00
Cole Gleason a501d5c3ba perf(ultimateGear): move ultimateGear from ops to fns so it only runs once 2014-01-24 00:02:51 -06:00
Cole Gleason 2283093845 fix(ultimateGear): fix bug where ultimateGear isn't awarded
This does several things:
- Moves the calculation of the ultimateGear achievement into its own
function on user.ops.
- Only computes ultimateGear if item is last and the user does not
already have the achievement
- Fixes bug where ultimateGear was not awarded if user wasn't wearing
their class gear at the time of item purchase.
- Adds content.classes and content.gearTypes which we should start using
elsewhere.
- Added tests for ultimateGear

Fixes HabitRPG/habitrpg#2232.
2014-01-23 23:49:04 -06:00
Marcelo Sizer 576cf1f58b Fix spacing errors 2014-01-23 22:00:12 -02:00
Matteo Pagliazzi 5e0bcfd874 fix(translations) 2014-01-23 16:58:03 +01:00
Matteo Pagliazzi 63bd5e071c fix(translations) 2014-01-23 16:53:21 +01:00
Matteo Pagliazzi 2f05c63b8f (translations) 2014-01-23 16:09:25 +01:00
Matteo Pagliazzi 753760275d improve(translations) 2014-01-23 15:51:29 +01:00
Matteo Pagliazzi 2bc0286d36 fix(json) 2014-01-23 15:48:01 +01:00
Matteo Pagliazzi 64c1e74afb Merge pull request #111 from luveluen/develop
Update main.json
2014-01-23 06:36:11 -08:00
Luveluen b3d2793e76 Update main.json 2014-01-23 10:29:06 +01:00
Sabe Jones 667a4264c5 docs(rebirth): Bullet point to reassure users that they can get their limited ed gear back after Rebirth 2014-01-22 20:41:43 -06:00
Sabe Jones 02311e8500 fix(translations): Remove more spurious NBSPs from English translation 2014-01-22 20:32:12 -06:00
Dušan Juretić 432ab0dc66 Test quests valid values 2014-01-22 22:40:12 -03:00
Matteo Pagliazzi a46e1273ae improve(translation): merge @Sinza- pr 2014-01-22 19:42:50 +01:00
Marcelo Sizer b648bf7b6b Add missing strings 2014-01-22 16:21:57 -02:00
Marcelo Sizer 7ebfb28b78 Add strings for views/shared/modals folder 2014-01-22 16:01:03 -02:00
Matteo Pagliazzi 28bc3382d5 Revert "improve(translations): add translations for achievement modals"
This reverts commit c7f07e3522.
2014-01-22 17:34:32 +01:00
Matteo Pagliazzi c7f07e3522 improve(translations): add translations for achievement modals 2014-01-22 17:08:47 +01:00
Matteo Pagliazzi 7f7d0cfdf1 Merge pull request #107 from luveluen/develop
Update main.json
2014-01-22 06:35:23 -08:00
Luveluen 73d89dae07 Update main.json 2014-01-22 12:07:34 +01:00
Sabe Jones af2bfa3efe fix(locales): Remove spurious nbsp from English locale settings page 2014-01-21 19:41:51 -06:00
Tyler Renelle 0aa2f44693 chore(css): mounts consolidation 2014-01-21 17:00:32 -08:00
Tyler Renelle 56cc5db9b7 fix(quests): don't drop canBuy:false items 2014-01-21 14:49:56 -08:00
Tyler Renelle 2ee93763fc feat(quests): add the gryphon quest, mount, pet, egg. For the glory of @baconsaur! 2014-01-21 14:41:07 -08:00
Tyler Renelle 965e57ed2f chore(grunt): grunt with @sabrecat's mount=>spritesmith, + my multi-drops 2014-01-21 13:32:46 -08:00
Tyler Renelle 8c5e5e0a3a Merge pull request #109 from HabitRPG/sabe/tweak
move mounts to spritesmith system
2014-01-21 13:31:24 -08:00
Tyler Renelle 051c3c89c8 feat(quests): allow quests to drop multiple items 2014-01-21 13:12:58 -08:00
Luveluen 6d3a1718fa Update main.json 2014-01-20 20:02:04 +01:00
Matteo Pagliazzi bc986ba45a fix(translations) 2014-01-20 17:51:02 +01:00
Sabe Jones cfa386683e refactor(sprites): remove deprecated Mount-SpriteSheet.png and strip down Mounts.css
This commit removes the old mounts spritesheet, and removes all manually created mount CSS from Mounts.css, leaving only the 18px top margin used to position mounts in the herobox.
2014-01-19 22:04:21 -06:00
Tyler Renelle cb7e654c48 refactor(sprites): grunt spritesmith for @sabrecat's e44c84bef9 2014-01-19 17:48:06 -08:00
Sabe Jones e44c84bef9 refactor(sprites): create individual sprites from mounts spritesheet
Previously, Mounts lived on a separate spritesheet from all other site graphics, and the CSS for their individual elements was manually generated. This commit doesn't change that setup yet, but creates the individual image files needed to compile mount sprites into the site master spritesheet using grunt-spritesmith. (The task won't run on my machine, so someone else needs to execute that step!)
2014-01-19 19:14:32 -06:00
Tyler Renelle 587a660ac1 fix(todos): add dateCompleted to todos so they're archived 3 days after completion, not 3 days after creation. fixes https://github.com/HabitRPG/habitrpg/issues/2478 2014-01-19 17:11:19 -08:00