Thibaut Girka
6604a36a9a
Fix syntax error in jade file
2013-12-12 18:56:43 +01:00
Tyler Renelle
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
Sabe Jones
847f090b7a
Remove "yet" from no-food message
...
Fix pet peeve :trombone:
2013-12-08 21:25:34 -06:00
Tyler Renelle
b6fceaca1b
fix some tavern links
2013-12-08 19:55:49 -07:00
Tyler Renelle
108d852d12
remove reroll from tasks/lists.jade
2013-12-08 19:04:18 -07:00
Tyler Renelle
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
Tyler Renelle
c524972aa2
Merge pull request #1952 from HabitRPG/sabe/tweak
...
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
Tyler Renelle
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
Tyler Renelle
714dad6e91
classes: small bug fixes
2013-12-07 20:41:48 -07:00
Tyler Renelle
f8f8a1334b
Merge branch 'develop' into classes
...
Conflicts:
views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
Tyler Renelle
680f0e974e
mounts: bailey notif
2013-12-07 11:56:34 -07:00
Tyler Renelle
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
Tyler Renelle
59f8727cbf
classes: small tweaks
2013-12-07 11:31:11 -07:00
Tyler Renelle
c51cdd0849
classes: proper handling of items on class-switch, un-equipping items,
...
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
2013-12-06 15:41:58 -07:00
Tyler Renelle
8216828514
classes #943 reroll sets you on your new class's item track. Handling of two-handed staves
2013-12-06 10:51:23 -07:00
Tyler Renelle
3e5c213694
classes armory: separate gear listings by class type, show selected gear
2013-12-06 09:26:02 -07:00
Sabe Jones
dd8b38ca04
Answer tavern FAQ in resource links
2013-12-06 06:34:54 -06:00
Tyler Renelle
b9845aec4a
classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d
2013-12-05 15:48:50 -07:00
Tyler Renelle
e5c34af7fd
grunt-spritesmith contrib gear habitrpg-shared#69d248f
2013-12-05 15:47:08 -07:00
Tyler Renelle
ad0c953d0a
classes: misc spell-casting fixes, support party spells
2013-12-05 11:05:47 -07:00
Tyler Renelle
5fd378ebed
classes: fixes to beard / chin overlap
2013-12-05 11:05:36 -07:00
Tyler Renelle
80e97a71ed
classes: misc fixes
2013-12-05 09:52:41 -07:00
Tyler Renelle
2563ec5763
classes: beards & mustaches!
2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900
classes: fixes to class-selection & reroll, remove show/hide gear since
...
we're using costumes
2013-12-04 23:53:55 -07:00
Tyler Renelle
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
Tyler Renelle
decaa2867b
classes: misc fixes. start a running migration file (add to, or add notes as we go along)
2013-12-04 17:50:40 -07:00
Tyler Renelle
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0
classes & grunt-spritesmith: death, paws, gems-cleanup
2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
Tyler Renelle
350e3681d7
classes: grunt-spritesmith fixes
2013-12-03 18:51:19 -07:00
Tyler Renelle
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
Sabe Jones
dab22ec051
Small formatting fix to Advanced Options
2013-12-02 11:10:58 -06:00
Sabe Jones
37f7a923ea
Fix #1934 (make Reset and Restore options more distinct)
2013-12-02 10:20:38 -06:00
Sabe Jones
45b87288f0
Change "reroll" to "Fortify" in Gems popover text
2013-12-01 15:03:03 -06:00
Sabe Jones
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
Tyler Renelle
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
Nick Gordon
62aeb7087a
fixes #1936 . petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller
2013-11-27 21:22:15 -08:00
Tyler Renelle
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87
Merge remote-tracking branch 'origin/sabe_tweak' into develop
...
Conflicts:
views/options/social/tavern.jade
2013-11-27 11:28:31 -07:00
Tyler Renelle
aca122d6de
fix up CONTRIBUTING.md, update "submit bugs" links with this change
2013-11-26 17:09:13 -07:00
Nick Gordon
86f62ac2b2
fix for #1920 , again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles
2013-11-26 14:56:24 -08:00
Nick Gordon
a4fb0b42ad
well, this wasn't the fix i was thinking of for #1893 , but it works and I don't know why I didn't do it in the first place
2013-11-26 12:06:48 -08:00
Nick Gordon
15f3907f00
fix for #1920
2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
d1240473dd
use bindonce for days of the week, thanks @snicker!
2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
a47a32dbd6
translate days of the week, @snicker here I would like to use bo-text but does not work
2013-11-25 17:30:35 +01:00
Nick Gordon
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
Sabe Jones
780b0a3593
Change Markdown help link to point at HabitRPG wiki
2013-11-24 13:13:21 -06:00
Nick Gordon
f4323ddc24
markdown links in chat will now open in a blank window.
...
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
2013-11-24 10:32:51 -08:00
Matteo Pagliazzi
6736da36d4
use jade class syntax
2013-11-24 17:49:25 +01:00
