Commit Graph

2194 Commits

Author SHA1 Message Date
Tyler Renelle 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)
2013-05-12 11:36:56 +01:00
Tyler Renelle 4347ba52ba overhaul tasks.html so we can start generalizing task-lists,
ground-work for challenges
2013-05-12 11:33:05 +01:00
Tyler Renelle 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()
2013-05-12 10:52:32 +01:00
Tyler Renelle a9d3348678 last of the tokens=>gems 2013-05-12 10:15:31 +01:00
Tyler Renelle 2164e7322b _partyMembers fetch as async to final 3-part subscription. test on
beta first
2013-05-12 00:56:02 +01:00
Tyler Renelle ca9d3bf2ed small bailey about tokens => gems 2013-05-12 00:51:59 +01:00
Tyler Renelle e33eee4142 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-12 00:50:02 +01:00
Tyler Renelle d54afdcc3d tavern: icon-eye-close instead of icon-glass (to signify resting) 2013-05-12 00:26:17 +01:00
Daniel Saewitz 8e7ab79098 Turn off locale set 2013-05-11 18:05:27 -04:00
Tyler Renelle 0ca67bef95 wrap up some "token" => "gem" conversions, code-style 2013-05-11 19:19:09 +01:00
Tyler Renelle 35342e8b71 Merge pull request #925 from SlappyBag/develop
Tokens = Gems for front-end display.
2013-05-11 10:43:45 -07:00
Tyler Renelle 7131742524 update FAQ link 2013-05-11 15:29:27 +01:00
Tyler Renelle 0421c2e61b back to double _party - fetch then subscribe, separatated
subscriptions seem to be causing problems
2013-05-11 13:08:09 +01:00
Tyler Renelle e701d98bd7 make solo-user subscription a callback of unsubscribe 2013-05-11 12:32:36 +01:00
Tyler Renelle 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
2013-05-11 12:13:48 +01:00
Tyler Renelle 2fcf5632ef add "resources" to tavern, n00000bs 2013-05-11 11:20:36 +01:00
Tyler Renelle 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
2013-05-10 23:16:59 +01:00
Tyler Renelle 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)
2013-05-10 19:20:53 +01:00
Tyler Renelle 05de1364a8 apply active filters as tags to newly-created tasks 2013-05-10 18:35:14 +01:00
Tyler Renelle 44bd61016f tags: cleaner tag-deletion handling 2013-05-10 18:23:05 +01:00
Tyler Renelle eea9a2129f tags: some corrupt-tags bug fixes 2013-05-10 18:06:35 +01:00
Tyler Renelle ec87bf82b6 floor some user stats 2013-05-10 17:31:47 +01:00
Tyler Renelle 3f9054f459 small helpers.coffee cleanup 2013-05-10 17:30:26 +01:00
Slappybag 88e6f40804 Tokens = Gems for front-end display. 2013-05-10 17:30:13 +01:00
Tyler Renelle bf028a2130 prevent errors 2013-05-10 17:16:25 +01:00
Tyler Renelle 24ea5511fa colons insted of dashes 2013-05-10 17:13:38 +01:00
Tyler Renelle 293756719f add profile stats showing their attributes, gear, etc 2013-05-10 17:09:49 +01:00
Tyler Renelle fcebebc601 use _items.next for the store, so we can access other _items
throughout the app
2013-05-10 16:42:21 +01:00
Tyler Renelle d696d1946d hide main avatar popover again, we'll display in profile stats, lvl
near user name
2013-05-10 15:39:43 +01:00
Tyler Renelle 836c0a74e3 "one random gear piece" 2013-05-10 15:38:22 +01:00
Tyler Renelle 708e3cf781 more informative death modal, lose 1 lvl 2013-05-10 14:53:02 +01:00
Tyler Renelle be3b71be39 tavern: show zzz's if they're checked in 2013-05-10 12:25:24 +01:00
Tyler Renelle 73e029d63e bailey notification on death 2013-05-10 12:03:19 +01:00
Tyler Renelle 1f3dbc8530 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-10 11:53:45 +01:00
Tyler Renelle 2e61d3f1ea chat: allow delete message 2013-05-10 11:53:20 +01:00
Stan Lindsey 12c6e111b4 Merge pull request #921 from switz/locales
@slappybag => Allow locale to be set from a model middleware
2013-05-10 03:49:13 -07:00
Tyler Renelle cd264d702a check if m.id works 2013-05-10 11:45:19 +01:00
Tyler Renelle 4091109998 try to solve duplicate chat messages issue 2013-05-10 11:42:42 +01:00
Tyler Renelle cd6a7fbcc4 nix old paw 2013-05-10 11:21:12 +01:00
Tyler Renelle 193d79d72c Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-10 11:18:28 +01:00
Tyler Renelle 164f8532e9 less harsh death. Now you lose 1 random item & all GP, but no levels.
see #223
2013-05-10 11:13:34 +01:00
Tyler Renelle 016bb08572 fix "reset not working in development mode" 2013-05-10 11:12:16 +01:00
Tyler Renelle 2a78fb5ea9 Revert "deploying in process.env.NODE_ENV='development' until we can fix #840"
This reverts commit 6aba44c43d.
2013-05-10 10:29:33 +01:00
Tyler Renelle e0af8c6cec Merge pull request #922 from Shaners/develop
Missing Pet Icons, Resting Graphics
2013-05-10 00:57:44 -07:00
Shane Lister 2234f57d73 Resting icon and pixely version of missing pet 2013-05-09 16:41:44 -07:00
Shane Lister a9401055b1 Merge pull request #14 from lefnire/develop
Get my develop branch updated
2013-05-09 16:29:02 -07:00
Daniel Saewitz 9969168d3e Pin derby-i18n to switz#master 2013-05-09 13:11:32 -04:00
Daniel Saewitz 58d6c39be8 Allow translations to be set from local model 2013-05-09 13:07:54 -04:00
Tyler Renelle 8aee3c7446 chat: small cleanup.hmmm, how to handle duplicates? see https://workflowy.com/shared/3ca12ef1-8335-f196-1b74-c1955402c5f5/ 2013-05-09 14:29:09 +01:00
Tyler Renelle 8db131dbda Merge branch 'master' into develop 2013-05-09 13:59:49 +01:00