Commit graph

116 commits

Author SHA1 Message Date
Tyler Renelle
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Tyler Renelle
149961c07d z-index fix on NPC popover dialogs 2013-05-15 12:23:18 +01:00
Tyler Renelle
4aeb7c5635 better "level: 1" positioning, add stats to party members 2013-05-15 11:51:16 +01:00
Tyler Renelle
a9d3348678 last of the tokens=>gems 2013-05-12 10:15:31 +01:00
Tyler Renelle
0ca67bef95 wrap up some "token" => "gem" conversions, code-style 2013-05-11 19:19:09 +01:00
Tyler Renelle
fcc0c4d3f3 add backer pet, move backer styles into its own stylus 2013-05-08 16:24:26 +01:00
Tyler Renelle
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
Tyler Renelle
2b9f4e336b add achievemnts in as spritesheet 2013-05-03 15:46:59 +01:00
Tyler Renelle
77bd61c244 Add bailey the crier for alerts. move CHANGELOG.md into the modal 2013-05-02 16:56:43 +01:00
Tyler Renelle
60b5783689 add separate game-pane from tasks-pane, make layout smoother #828 2013-05-02 14:16:57 +01:00
Tyler Renelle
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
Tyler Renelle
f95a537894 pets: move inventory.styl out of items.styl 2013-03-26 22:35:51 -07:00
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
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
Zachary Kain
507a0fc3c9 MASSIVE HEADER CHANGES OH SHIT 2013-03-18 23:42:03 -04:00
Zachary Kain
4061aaf825 include header.styl, minor tweaks to the button styles, housekeeping 2013-03-18 18:30:25 -04:00
Zachary Kain
8284693d0f rebuilt header boiiii. Tested FF, Safari, Chrome 2013-03-18 18:29:53 -04:00
Tyler Renelle
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
Zachary Kain
e18c53f97f middle of wrasslin the new header 2013-03-18 16:48:47 -04:00
Zachary Kain
13673c3ec7 flattenize header, change to <header>, even margins 2013-03-18 16:46:58 -04:00
Tyler Renelle
6182a474c7 remoe bootstrap import from .styl, start pulling in from
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
Tyler Renelle
0c1151b123 don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
Tyler Renelle
4614e48cdc Adding first rudimentary version of tagging and filtering. New users get three tags: morning, afternoon and evening. At the moment, one can not change these tags or add new ones. There are also some problems: tagging a newly added task, also tags one of the existing tasks. Also, when having an active filter and removing the corresponding tag from a task, that task is immediately hidden, although you are still editing it. 2013-03-17 09:10:27 -04:00
Tyler Renelle
ee9e6064b2 add a ton of static page, beef up the footer, make this website look
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Tyler Renelle
65b7f432a9 get the pets working for the avatar box, with consistent names (need
to manually apply with model.set for now)
2013-03-09 12:03:38 -05:00
Zachary Kain
5ac7403241 add scrollbars 2013-03-06 01:58:07 -05:00
Zachary Kain
456580e352 gut & re-style Task Options, only Rewards tasks & options left to go through 2013-03-06 00:50:39 -05:00
Zachary Kain
1a308da495 better responsive breakpoints, more robust custom grid 2013-03-05 15:01:52 -05:00
Zachary Kain
efe1c9267e WIP: new 'Task Actions' UI (buttons, checkboxes, etc) 2013-03-05 14:16:10 -05:00
Philip How
55faeda4e0 Notification changes to .coffees 2013-02-27 23:26:53 -05:00
Tyler Renelle
8ca41e2b99 move bootstrap responsive inclusion into lib/app/index.js - will also
allow us to cut down on components included
2013-02-16 19:27:00 -05:00
Tyler Renelle
3392074fdd import date-picker from stylus 2013-02-16 19:09:54 -05:00
david.rhinehart
b44aa6a039 Fixes #390 added fixed notification area to top 2013-02-16 11:04:40 -06:00
david.rhinehart
fb90106f7e Fixes #390 added fixed notification area to top 2013-02-16 11:02:55 -06:00
Tyler Renelle
064abc959b reverting the commit-set for the progress-bars https://github.com/lefnire/habitrpg/pull/379 (@zakkain I'll follow up on GH)
Revert "move progress-pollyfill to require for performance"

This reverts commit 96b983b564.
2013-02-13 15:21:44 -05:00
Zachary Kain
188950c8fb refactor a bit 2013-02-12 13:13:35 -05:00
Zachary Kain
08c76380ce remove gradient code, doesn't add much and looks cool w/out it 2013-02-12 12:41:50 -05:00
Zachary Kain
433329db43 Replace progress bar markup with <progress> element. Add polyfill & styles 2013-02-12 12:33:15 -05:00
Zachary Kain
ab327ab661 mobile header responsive hotfix - allows scrolling so header doesn't block stuff 2013-02-10 16:38:37 -05:00
Zachary Kain
7a24b39edc rewrite header markup, reduce fiddly avatar css, improve mobile layout 2013-02-09 17:25:08 -05:00
Zachary Kain
c2dd51959f rewrite game over modal, remove tables 2013-02-09 16:22:39 -05:00
Zachary Kain
675b506ff5 create avatar viewing window & add customizer-specific stylesheet 2013-02-09 14:41:19 -05:00
Tyler Renelle
bb8eba7df1 Merge branch 'customizations'
Conflicts:
	styles/app/index.styl
2013-02-08 18:29:55 -05:00
Tyler Renelle
3d4de16c6e Merge branch 'master' of github.com:lefnire/habitrpg
Conflicts:
	styles/app/index.styl
2013-02-08 18:28:10 -05:00
Stan Lindsey
6bd5f41048 Revoked changes waiting new push 2013-02-08 23:23:00 +00:00
Stan Lindsey
1f4ecdec9d Coin position issue
#346
2013-02-08 23:11:45 +00:00
Tyler Renelle
748d2d2de2 Merge pull request #310 from SlappyBag/master
#291
2013-02-08 14:32:15 -08:00