Commit graph

  • cdcdc11849 Update app.json WielebnyB 2013-05-14 00:14:28 +0300
  • 4a23ad4856 Merge branch 'develop' Tyler Renelle 2013-05-13 21:31:18 +0100
  • be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also include link to the pets spritesheet, and some info on mounts Tyler Renelle 2013-05-13 21:29:27 +0100
  • 35fe5dc68d Begin the french translation LazuliKazeno 2013-05-13 23:14:48 +0300
  • 90fca5c98a Remove translate middleware Daniel Saewitz 2013-05-13 15:44:21 -0400
  • 017999d544 Merge Daniel Saewitz 2013-05-13 15:42:39 -0400
  • 28adcc5b30 Merge pull request #948 from lancemanfv/translations Daniel Saewitz 2013-05-13 12:36:17 -0700
  • e98a9c7629 Update app.json lancemanfv 2013-05-13 21:07:13 +0300
  • 02d13c5ddd Update app.json lancemanfv 2013-05-13 20:50:36 +0300
  • c82e0651d1 Added other language folders with base json Stan Lindsey 2013-05-13 15:13:11 +0100
  • cf68e9d2a7 Update app.json Stan Lindsey 2013-05-13 15:58:56 +0200
  • dc7f80ceb9 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-13 11:02:20 +0100
  • d6b312eb13 Fix borked translations Daniel Saewitz 2013-05-12 15:18:16 -0400
  • 26e3a7d83c Additional Keys Stan Lindsey 2013-05-12 20:44:27 +0200
  • 7c62c523b4 Additional Keys Stan Lindsey 2013-05-12 20:43:28 +0200
  • f781f644ab Incorporation of translation variables Slappybag 2013-05-12 19:28:53 +0100
  • b11df0a755 Merge branch 'locale/nl' of github.com:jbnicolai/habitrpg into develop Daniel Saewitz 2013-05-12 14:20:11 -0400
  • 27a3627fa0 Merge pull request #1 from xeross/locale/nl Joshua Boy Nicolai 2013-05-12 11:17:44 -0700
  • ce6914f0c8 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Daniel Saewitz 2013-05-12 14:00:33 -0400
  • 445a968a9b Merge Daniel Saewitz 2013-05-12 13:58:50 -0400
  • b162a43545 module.exports growl notifications so other files can use it Tyler Renelle 2013-05-12 16:46:40 +0100
  • 367c860ac8 syntax error on my part Slappybag 2013-05-12 14:34:49 +0100
  • ae0dfa9ffe Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Slappybag 2013-05-12 13:33:40 +0100
  • 1079d060fc Final app.json english. Slappybag 2013-05-12 13:32:41 +0100
  • bb1ea755f1 tasks / rewards.html - pass in the actual list, and whether booleans @editable and @main, which will allow for challenges lists & mngr accounts / public lists Tyler Renelle 2013-05-12 13:11:27 +0100
  • a287160d3b Changed Tavern message to be less threatening & simplier. Slappybag 2013-05-12 12:41:00 +0100
  • f28a542aa4 small cleanup Tyler Renelle 2013-05-12 12:39:54 +0100
  • 7986464132 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Slappybag 2013-05-12 12:30:34 +0100
  • 912b716a28 fix the reroll buy-button bug Tyler Renelle 2013-05-12 12:29:00 +0100
  • dcc4d0c93e update Dailys => Dailies (we use dailys throughout the code so we can easly switch between singular/plural, but for actual text we want Dailies) Tyler Renelle 2013-05-12 11:36:56 +0100
  • 4347ba52ba overhaul tasks.html so we can start generalizing task-lists, ground-work for challenges Tyler Renelle 2013-05-12 11:32:59 +0100
  • f7145bb951 cleanup of the show-completed / show-remaining. That context-dependant / display-context-for stuff was bugging me out, and wasn't using Derby to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses() Tyler Renelle 2013-05-12 10:52:32 +0100
  • a9d3348678 last of the tokens=>gems Tyler Renelle 2013-05-12 10:15:31 +0100
  • 2164e7322b _partyMembers fetch as async to final 3-part subscription. test on beta first Tyler Renelle 2013-05-12 00:56:02 +0100
  • ca9d3bf2ed small bailey about tokens => gems Tyler Renelle 2013-05-12 00:51:59 +0100
  • e33eee4142 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-12 00:50:02 +0100
  • d54afdcc3d tavern: icon-eye-close instead of icon-glass (to signify resting) Tyler Renelle 2013-05-12 00:22:35 +0100
  • 8e7ab79098 Turn off locale set Daniel Saewitz 2013-05-11 18:05:27 -0400
  • 0d72818c9a Merge pull request #15 from lefnire/develop Shane Lister 2013-05-11 12:56:34 -0700
  • 0ca67bef95 wrap up some "token" => "gem" conversions, code-style Tyler Renelle 2013-05-11 19:19:09 +0100
  • 35342e8b71 Merge pull request #925 from SlappyBag/develop Tyler Renelle 2013-05-11 10:43:45 -0700
  • 7131742524 update FAQ link Tyler Renelle 2013-05-11 15:28:59 +0100
  • 0421c2e61b back to double _party - fetch then subscribe, separatated subscriptions seem to be causing problems Tyler Renelle 2013-05-11 13:08:09 +0100
  • e701d98bd7 make solo-user subscription a callback of unsubscribe Tyler Renelle 2013-05-11 12:32:36 +0100
  • 747b6e7930 BREAKING CHANGE - fetch _partyMembers, subscribe to _party, _user, _tavern. Could cut back substantially on subscription overhead. fetch is async to the subscriptions, need to test on beta that this is kosher Tyler Renelle 2013-05-11 12:13:48 +0100
  • 2fcf5632ef add "resources" to tavern, n00000bs Tyler Renelle 2013-05-11 11:20:36 +0100
  • e6cd061bfd don't calculate dailies on cron when user is resting, this to prevent abusing the inn. see https://trello.com/card/rest-in-tavern/50e5d3684fe3a7266b0036d6/14 Tyler Renelle 2013-05-10 23:16:59 +0100
  • fb29e35ffc another attempted fix for chat dupes - model.unshift like usual, callback checks for dupes and sets messages to unique. this way minimizes the model.set() (which clobbers other chatters if you are the duplicate bugger) Tyler Renelle 2013-05-10 19:20:53 +0100
  • 05de1364a8 apply active filters as tags to newly-created tasks Tyler Renelle 2013-05-10 18:35:14 +0100
  • 44bd61016f tags: cleaner tag-deletion handling Tyler Renelle 2013-05-10 18:23:05 +0100
  • eea9a2129f tags: some corrupt-tags bug fixes Tyler Renelle 2013-05-10 18:06:35 +0100
  • 170213cd8e Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Slappybag 2013-05-10 17:49:51 +0100
  • ec87bf82b6 floor some user stats Tyler Renelle 2013-05-10 17:31:47 +0100
  • 3f9054f459 small helpers.coffee cleanup Tyler Renelle 2013-05-10 17:30:26 +0100
  • 88e6f40804 Tokens = Gems for front-end display. Slappybag 2013-05-10 17:30:13 +0100
  • bf028a2130 prevent errors Tyler Renelle 2013-05-10 17:16:25 +0100
  • 24ea5511fa colons insted of dashes Tyler Renelle 2013-05-10 17:13:38 +0100
  • 293756719f add profile stats showing their attributes, gear, etc Tyler Renelle 2013-05-10 17:09:49 +0100
  • fcebebc601 use _items.next for the store, so we can access other _items throughout the app Tyler Renelle 2013-05-10 16:42:21 +0100
  • d696d1946d hide main avatar popover again, we'll display in profile stats, lvl near user name Tyler Renelle 2013-05-10 15:39:43 +0100
  • 836c0a74e3 "one random gear piece" Tyler Renelle 2013-05-10 15:38:22 +0100
  • 708e3cf781 more informative death modal, lose 1 lvl Tyler Renelle 2013-05-10 14:45:13 +0100
  • be3b71be39 tavern: show zzz's if they're checked in Tyler Renelle 2013-05-10 12:25:24 +0100
  • 73e029d63e bailey notification on death Tyler Renelle 2013-05-10 12:03:19 +0100
  • 1f3dbc8530 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-10 11:53:45 +0100
  • 2e61d3f1ea chat: allow delete message Tyler Renelle 2013-05-10 11:53:20 +0100
  • 12c6e111b4 Merge pull request #921 from switz/locales Stan Lindsey 2013-05-10 03:49:13 -0700
  • cd264d702a check if m.id works Tyler Renelle 2013-05-10 11:45:19 +0100
  • 4091109998 try to solve duplicate chat messages issue Tyler Renelle 2013-05-10 11:28:21 +0100
  • cd6a7fbcc4 nix old paw Tyler Renelle 2013-05-10 11:21:12 +0100
  • 193d79d72c Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-10 11:18:28 +0100
  • 164f8532e9 less harsh death. Now you lose 1 random item & all GP, but no levels. see #223 Tyler Renelle 2013-05-10 11:13:34 +0100
  • 016bb08572 fix "reset not working in development mode" Tyler Renelle 2013-05-10 11:12:16 +0100
  • 2a78fb5ea9 Revert "deploying in process.env.NODE_ENV='development' until we can fix #840" Tyler Renelle 2013-05-10 10:29:33 +0100
  • e0af8c6cec Merge pull request #922 from Shaners/develop Tyler Renelle 2013-05-10 00:57:44 -0700
  • 2234f57d73 Resting icon and pixely version of missing pet Shane Lister 2013-05-09 16:41:44 -0700
  • a9401055b1 Merge pull request #14 from lefnire/develop Shane Lister 2013-05-09 16:29:02 -0700
  • 9969168d3e Pin derby-i18n to switz#master Daniel Saewitz 2013-05-09 13:11:32 -0400
  • 58d6c39be8 Allow translations to be set from local model Daniel Saewitz 2013-05-09 13:07:54 -0400
  • 8aee3c7446 chat: small cleanup.hmmm, how to handle duplicates? see https://workflowy.com/shared/3ca12ef1-8335-f196-1b74-c1955402c5f5/ Tyler Renelle 2013-05-09 14:29:09 +0100
  • 8db131dbda Merge branch 'master' into develop Tyler Renelle 2013-05-09 13:59:49 +0100
  • 1e8adc7e17 tags: add clear-filters button so you can reset filters, but primarily to fix #918 (stopgap) Tyler Renelle 2013-05-09 13:59:37 +0100
  • e0e9c5eac4 remove unecessary package.json bits Tyler Renelle 2013-05-09 10:54:27 +0100
  • 6aba44c43d deploying in process.env.NODE_ENV='development' until we can fix #840 Tyler Renelle 2013-05-09 09:56:49 +0100
  • fdb2f2510c remove nix-drop-limit from development Tyler Renelle 2013-05-09 09:56:05 +0100
  • d92157cf13 why is findOne crapping out on dev? "function(e){return this.where("id").equals(e).findOne()" Tyler Renelle 2013-05-09 09:27:21 +0100
  • 2774662474 backer-gear: add bailey alert Tyler Renelle 2013-05-09 09:14:05 +0100
  • 6e3328c614 backer-gear: fix styles to use Shaners' shop sprites Tyler Renelle 2013-05-09 09:13:56 +0100
  • 3033fa2f3d Merge branch 'backer-gear' of github.com:lefnire/habitrpg into backer-gear Tyler Renelle 2013-05-09 08:49:04 +0100
  • f1660a899b Merge pull request #917 from Shaners/backer-gear Tyler Renelle 2013-05-09 00:48:54 -0700
  • 8137e4b2a6 Merge branch 'develop' of github.com:lefnire/habitrpg into backer-gear Tyler Renelle 2013-05-09 08:40:34 +0100
  • bbf08efd44 105x Sprite Sheet and Lowered Shade Helmet Shane Lister 2013-05-08 23:40:12 -0700
  • 25e3500f74 Backer-only GIF Timing Adjustments Shane Lister 2013-05-08 22:11:29 -0700
  • 4300e04e43 Backer-Only Shop Sprites Shane Lister 2013-05-08 17:02:39 -0700
  • d52d6aa026 Merge pull request #13 from lefnire/backer-gear Shane Lister 2013-05-08 16:39:26 -0700
  • e95e313e45 temporary shop sprites to test how things work, will replace with @Shaners official stuff Tyler Renelle 2013-05-08 22:28:17 +0100
  • ca14a4a153 backer: slight body armor alignment Tyler Renelle 2013-05-08 21:48:04 +0100
  • d3fdd051e1 backer: fix pets html, add migration Tyler Renelle 2013-05-08 21:40:01 +0100
  • 78944e93ef party: chat - better messages.length check Tyler Renelle 2013-05-08 21:30:35 +0100
  • ef9e058f54 party: chat - better messages.length check Tyler Renelle 2013-05-08 21:30:35 +0100