Tyler Renelle
ae4ca337c8
Merge pull request #1949 from bobbyroberts99/develop
...
Reposition Markdown formatting link
2013-12-14 21:21:45 -08:00
Tyler Renelle
d1a34f570d
customizations: migrate skins for more PCs, start building out migration
2013-12-14 16:12:41 -07:00
Tyler Renelle
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
Tyler Renelle
549add08ed
classes: 2gems / new hair,beard,stache
2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f
classes: misc fixes
2013-12-13 21:53:42 -07:00
Tyler Renelle
478be61113
fix(classes) misc class fixes (not @snicker, ng-if on item store since
...
we dynamically swap it sometimes)
2013-12-12 20:03:32 -07:00
Tyler Renelle
b5a4177719
separate saddle out to it's own market section
2013-12-12 18:38:05 -07:00
Tyler Renelle
dc63eff41d
[ #1977 ] move sleep & clear-completed to user.ops
2013-12-12 16:59:53 -07: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
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
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
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
e5c34af7fd
grunt-spritesmith contrib gear habitrpg-shared#69d248f
2013-12-05 15:47:08 -07:00
Tyler Renelle
5fd378ebed
classes: fixes to beard / chin overlap
2013-12-05 11:05:36 -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
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
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
37f7a923ea
Fix #1934 (make Reset and Restore options more distinct)
2013-12-02 10:20:38 -06:00
Sabe Jones
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
Bob Steffes
2905a2777e
Fix reposition of markdown formatting after 2 reverts
...
What a mess, but I think it's oK now. Sorry.
2013-11-30 16:37:04 -08:00
Bob Steffes
0dd911f2ba
Revert "Re-modify position of markdown down formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:29:17 -08:00
Bob Steffes
b1e5ee6433
Revert "Reposition Markdown formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:26:35 -08:00
Tyler Renelle
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
Bob Steffes
bb3f0ae7ec
Reposition markdown formatting link (3rd try)
...
This replaces previous 2 commits. z-index has been removed.
2013-11-30 12:07:23 -08:00
Bob Steffes
db7e582c95
Re-modify position of markdown down formatting link
...
I think this one makes more sense than previous PR and it also adjust
spacing of Note. Still interested in feedback (would it make sense to
add to docs.css and call a class or just do it inline?
This is also first time, I've submitted a change to a pull request (and
I'm not sure what's gonna happen). Hopefully github is smart and just
modifies the previous commit (but we'll see).
2013-11-30 10:21:32 -08:00
Bob Steffes
7fdda14cb8
Reposition Markdown formatting link
...
There's probably a better way to do this. Feedback welcome.
2013-11-30 08:07:20 -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
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
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08: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
Sabe Jones
f7908ddbcb
Correct and clarify some details on contributor rewards
2013-11-24 09:50:21 -06:00
Sabe Jones
c51a34730d
Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off.
2013-11-24 08:53:48 -06:00
Sabe Jones
9086ccffcd
Consistent formatting of markdown hint in group edit fields
2013-11-24 07:41:41 -06:00
