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
a9d3348678
last of the tokens=>gems
2013-05-12 10:15:31 +01:00
0ca67bef95
wrap up some "token" => "gem" conversions, code-style
2013-05-11 19:19:09 +01:00
2fcf5632ef
add "resources" to tavern, n00000bs
2013-05-11 11:20:36 +01:00
be3b71be39
tavern: show zzz's if they're checked in
2013-05-10 12:25:24 +01:00
6e3328c614
backer-gear: fix styles to use Shaners' shop sprites
2013-05-09 09:13:56 +01:00
e95e313e45
temporary shop sprites to test how things work, will replace with
...
@Shaners official stuff
2013-05-08 22:28:17 +01:00
ca14a4a153
backer: slight body armor alignment
2013-05-08 21:48:04 +01:00
fcc0c4d3f3
add backer pet, move backer styles into its own stylus
2013-05-08 16:24:26 +01:00
5cb5089e58
add backer stuff to stylesheets
2013-05-08 15:55:10 +01:00
981bf3e71a
start setting up backer gear in html
2013-05-08 15:42:44 +01:00
743474e573
CSS Updates: Filters Edit & Party/Tavern Chat
2013-05-07 17:48:00 +01:00
2d5c54a287
Disable border on completed
2013-05-07 03:51:41 -04:00
fe950b5044
Fixes #868
2013-05-07 03:43:39 -04:00
81dbaaef67
use unicode & icon-repeat to solve character support issue, temporary
...
solution to #868
2013-05-06 22:20:21 +01:00
9370958693
tags: move tags stuff in tasks html out to filters.html, click the
...
tag on a task to apply tag
2013-05-06 17:57:06 +01:00
a3003a758d
Merge branch 'tags' into develop
...
Conflicts:
src/app/index.coffee
src/app/tasks.coffee
styles/app/index.styl
views/app/index.html
views/app/settings.html
views/app/tasks.html
2013-05-06 14:01:43 +01:00
0cf18483ff
chat functions better with just some padding rather than hight &
...
line-height (see multi-line chats with the large line-height)
2013-05-05 23:34:14 +01:00
ed1f3acded
full username test in chat (_user.profile.name only part of the
...
equation), and min-height: 60px - was getting stacked longtext issue
2013-05-05 23:29:10 +01:00
c1c2f025ad
Merge develop and add functionality to party chat
2013-05-05 13:07:36 -04:00
66dbc3f258
Highlight username in tavernchat
2013-05-04 13:15:47 -04:00
7c93d80ae5
add beast-master achievement
2013-05-03 16:08:22 +01:00
2b9f4e336b
add achievemnts in as spritesheet
2013-05-03 15:46:59 +01:00
079d91956a
prettier rest-in-tavern
2013-05-02 21:21:51 +01:00
4d1f48a79d
increase user-menu min-width (for options)
2013-05-02 17:32:41 +01:00
77bd61c244
Add bailey the crier for alerts. move CHANGELOG.md into the modal
2013-05-02 16:56:43 +01:00
a40a41fa9c
add in alexander the merchant
2013-05-02 15:12:00 +01:00
e22634658a
add in daniel / tavern tab content
2013-05-02 15:01:11 +01:00
60b5783689
add separate game-pane from tasks-pane, make layout smoother #828
2013-05-02 14:16:57 +01:00
9e86248120
"unlock all the pets" style stable layout
2013-04-15 02:03:32 -04:00
72ee444608
back to our roots: store vendor files in public/vendor instead of
...
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
2013-04-09 13:21:20 -04:00
4edbb8bf3d
pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future)
2013-03-27 11:34:41 -07:00
32f07afd7a
pets: move pets down a bit
2013-03-26 22:37:19 -07:00
f95a537894
pets: move inventory.styl out of items.styl
2013-03-26 22:35:51 -07:00
f6b2c08a60
Merge branch 'develop' into pets
...
Conflicts:
views/app/rewards.html
2013-03-26 17:54:31 -07:00
0f49ec3ebc
fix 697 remove level from top of herobox
2013-03-25 16:03:13 -04:00
c5c6629419
pets: add base food
2013-03-25 12:42:38 -06:00
4af56b998f
pets: some better default inventory/stable layout
2013-03-25 11:50:32 -06:00
5102b7fc51
Merge branch 'develop' into pets
2013-03-25 08:58:15 -06:00
b038b74534
checkbox shenanigans fix.
2013-03-25 10:05:44 -04:00
52d419a823
add min-width fix to hero-stats being squishd on smalls screens.
...
@zakkain feel free to change, just wanted a quick-fix
2013-03-23 10:07:26 -06:00
cdcf7aa3b2
temp fix to undo being hidden
2013-03-23 08:22:05 -06:00
acdb9eb5e5
add better temporary pet positioning
2013-03-22 22:40:12 -06:00
a1a85241d5
add "hatching powder" (as temporary pet food), clean up some dialogs,
...
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
3ce2686662
Merge branch 'develop' into switz-inventory
...
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
Merge branch 'develop' into switz-inventory
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
2013-03-21 13:51:38 -06:00
0ddac82f1d
MAD BUG FIXES YO
2013-03-21 14:49:07 -04:00
fa89b20dd5
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank
Conflicts:
styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
d737bd0714
remove a ton of public/vendor git submodules, using CDN instead. The
...
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -06:00
fa94bef0f6
new input class names on restore function
2013-03-21 13:03:03 -04:00
86f560f69b
layer "new stuff" below "offline" error
2013-03-21 10:32:34 -06:00
Tyler Renelle