Commit graph

24 commits

Author SHA1 Message Date
Celtis
0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02:00
Tyler Renelle
f28a542aa4 small cleanup 2013-05-12 12:40:06 +01: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
Slappybag
88e6f40804 Tokens = Gems for front-end display. 2013-05-10 17:30:13 +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
016bb08572 fix "reset not working in development mode" 2013-05-10 11:12:16 +01:00
Tyler Renelle
c9aa04439d begin implementing streaks 2013-05-03 18:20:28 +01:00
Tyler Renelle
055848452b add "max-gear" achievement 2013-05-03 16:24:28 +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
d2b4072ad6 better wording on buying tokens 2013-03-28 00:49:57 -07:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07: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
9f7b653a25 Merge branch 'develop' into ads
Conflicts:
	views/app/tasks.html
2013-03-16 19:27:29 -04:00
Tyler Renelle
9501e67661 add missing namespaces for rewards & tasks for consistency & organization 2013-03-16 19:22:53 -04:00
Tyler Renelle
9c0a640f9f add ads back in 2013-03-16 19:18:17 -04:00
Daniel Saewitz
f71e2fbade Working... in progress 2013-03-08 12:55:04 -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
a3ef2e1977 temporary method for active profile username - {#if} on private paths
in derby seems iffy
2013-02-17 01:51:40 -05:00
Tyler Renelle
4602e0bf5b more separation 2013-02-17 00:55:52 -05:00
Tyler Renelle
dd5f2f7a12 move more html files around 2013-02-17 00:45:17 -05:00
Tyler Renelle
e2016e1eed separate everything out into individual html files 2013-02-17 00:25:34 -05:00