Commit graph

10 commits

Author SHA1 Message Date
Tyler Renelle
5043c46b5a move some pet html around 2013-03-22 19:21:35 -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
70dcd0b886 move rewards column into rewards rewards.html 2013-03-18 16:47:03 -04:00
Daniel Saewitz
78bc27439a Remove trailing spaces 2013-03-16 19:36:07 -04:00
Tyler Renelle
9501e67661 add missing namespaces for rewards & tasks for consistency & organization 2013-03-16 19:22:53 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Zachary Kain
e5a893a710 revamp rewards and pets UI. Obv pets is temporary pending new pet system 2013-03-09 01:34:15 -05:00
Zachary Kain
efe1c9267e WIP: new 'Task Actions' UI (buttons, checkboxes, etc) 2013-03-05 14:16:10 -05:00
Tyler Renelle
39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00
Tyler Renelle
99e459e05f with last commit 2013-02-17 00:25:42 -05:00