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
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
f86aa0316b
fix #679 line height issue
2013-03-20 22:32:01 -04:00
1d93793616
fix customization modal cutting off herobox
2013-03-19 01:02:59 -04:00
fc01b44a5a
by popular demand, we're dropping the crosshatched square and going blank
2013-03-19 00:11:37 -04:00
915c86d8ba
implement avatar variable system with data attributes and css. LIKE A BOSS
2013-03-19 00:04:24 -04:00
507a0fc3c9
MASSIVE HEADER CHANGES OH SHIT
2013-03-18 23:42:03 -04:00
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
4061aaf825
include header.styl, minor tweaks to the button styles, housekeeping
2013-03-18 18:30:25 -04:00
8284693d0f
rebuilt header boiiii. Tested FF, Safari, Chrome
2013-03-18 18:29:53 -04:00
f332c5d9a8
Merge branch 'develop' into toebu-tags-filters
...
Conflicts:
src/app/index.coffee
src/app/tasks.coffee
styles/app/index.styl
views/app/index.html
views/app/tasks.html
2013-03-18 17:09:42 -04:00
e18c53f97f
middle of wrasslin the new header
2013-03-18 16:48:47 -04:00
13673c3ec7
flattenize header, change to <header>, even margins
2013-03-18 16:46:58 -04:00
3d581358ec
fix text showing behind button b/c of opacity bug
2013-03-18 14:37:24 -04:00
97294b793f
robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold
2013-03-18 14:37:14 -04:00
6d2df1ccc9
fix price input bug
2013-03-18 14:37:03 -04:00
e67295651f
didn't need that reset, probably will remove the whole thing once tested for shenanigans
2013-03-18 14:33:05 -04:00
Tyler Renelle