d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
a6c67f1781
fix(translations): merge @luveluen pull request, fix some syntax
2014-01-22 16:09:32 +01:00
4f07ab39b0
Update inventory.jade
2014-01-22 12:10:51 +01:00
f16654d235
feat(quests): add canBuy so we can exclude certain items from the
...
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
2014-01-21 14:44:53 -08:00
8b97438607
Update stable.jade
2014-01-20 19:44:33 +01:00
e47afa8965
Update stable.jade
2014-01-20 19:41:17 +01:00
c85e3a2107
Update inventory.jade
2014-01-20 19:23:49 +01:00
18eeafafc8
Update inventory.jade
2014-01-20 19:07:50 +01:00
06132f8a48
Update inventory.jade
2014-01-20 18:55:29 +01:00
fa212b6e93
Update index.jade
2014-01-20 17:50:28 +01:00
d000c70679
fix(translations): revert some views
2014-01-20 17:08:27 +01:00
ffff867ba3
Update stable.jade
2014-01-20 16:20:06 +01:00
462f11e48c
Update inventory.jade
2014-01-20 16:08:37 +01:00
c37512baa6
Update index.jade
2014-01-20 14:41:51 +01:00
58803773d2
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-10 15:43:44 -06:00
928f7cfdd7
Merge remote-tracking branch 'origin/sabe/rebirth' into develop
...
Conflicts:
src/models/user.js
views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
0eedeea47d
fix #2107 , add note about creating empty parties for quests
2013-12-25 12:09:34 -07:00
f8559b1762
bosses: pretty things up amongst the modals, etc. Move rewards to a
...
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
2013-12-24 23:30:48 -07:00
094989db13
quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements
2013-12-24 17:24:09 -07:00
cc3632b611
Add Orb of Rebirth to shop, image to modals, tweak modal text
2013-12-24 09:57:04 -06:00
f538a91538
bosses: no models, performance improvements
2013-12-23 14:17:08 -07:00
8095397317
Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency
2013-12-23 01:19:18 -07:00
ecb354e2cc
Quests: initial Bosses WIP - invite, accept, reject, etc
2013-12-22 17:46:54 -07:00
61245e31b8
update justin guide re: todos adding 1MP
2013-12-21 18:50:18 -07:00
226b90b74d
add headers for equipment / costume panes (@sabrecat)
2013-12-21 15:29:55 -07:00
676112c1b5
winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b ). Sorry for mixing concerns in this commit, some rebase difficulties
2013-12-20 10:26:23 -07:00
c43d784834
Add mention of Health refill to Fortify
2013-12-17 22:14:15 -06:00
03c4a04ff5
classes: better-positioned justin
2013-12-17 17:24:14 -07:00
2efc0972d6
cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment
2013-12-17 16:51:27 -07:00
949cd97b91
fix( #2003 ) healer gear not showing
2013-12-16 22:50:44 -07:00
5251b4ce3c
classes: add just guide for classes unlock
2013-12-16 13:33:05 -07:00
91e1287d06
APIv2: some finalization of APIv2. Add new routes, re-rigg
...
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
2013-12-15 16:53:06 -07:00
12cc6f51eb
classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks
2013-12-15 13:25:19 -07:00
dc348d5601
[ #1969 ] add in @Fandekasp's shirts, had to do separate commit for handling of
...
user.preferences.shirt
2013-12-14 00:35:03 -07:00
b5a4177719
separate saddle out to it's own market section
2013-12-12 18:38:05 -07:00
ee1cd3c05d
[ #1977 ] APIv2 WIP - start of a framework where operations are shared
...
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
847f090b7a
Remove "yet" from no-food message
...
Fix pet peeve :trombone:
2013-12-08 21:25:34 -06:00
76565384d3
Merge branch 'classes' into develop
...
Conflicts:
public/js/controllers/tasksCtrl.js
views/shared/modals/settings.jade
2013-12-08 18:17:53 -07:00
c524972aa2
Merge pull request #1952 from HabitRPG/sabe/tweak
...
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
4d3a359d6b
fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify
...
button, remove reroll from store)
2013-12-08 09:46:30 -07:00
714dad6e91
classes: small bug fixes
2013-12-07 20:41:48 -07:00
f8f8a1334b
Merge branch 'develop' into classes
...
Conflicts:
views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
79e8b2f4a5
Revert "mounts: temporarily remove mounts code from views. merging to master so"
...
This reverts commit d245c87f29
2013-12-07 11:34:53 -07:00
3e5c213694
classes armory: separate gear listings by class type, show selected gear
2013-12-06 09:26:02 -07:00
2563ec5763
classes: beards & mustaches!
2013-12-05 03:31:02 -07:00
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
8803df46c0
classes & grunt-spritesmith: death, paws, gems-cleanup
2013-12-04 16:02:08 -07:00
19b6eb73e0
Merge branch 'develop' into classes
...
Conflicts:
public/css/index.styl
src/models/user.js
views/options/profile.jade
views/shared/header/avatar.jade
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
Matteo Pagliazzi