5fd378ebed
classes: fixes to beard / chin overlap
2013-12-05 11:05:36 -07:00
80e97a71ed
classes: misc fixes
2013-12-05 09:52:41 -07:00
2563ec5763
classes: beards & mustaches!
2013-12-05 03:31:02 -07:00
dde0655900
classes: fixes to class-selection & reroll, remove show/hide gear since
...
we're using costumes
2013-12-04 23:53:55 -07:00
62d50a1f4d
classes: fixes to buying items
2013-12-04 23:10:14 -07:00
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
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
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
55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
350e3681d7
classes: grunt-spritesmith fixes
2013-12-03 18:51:19 -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
a28327410e
Updated Beginner's Tour
...
As requested by SabreCat, I've done some editing on the Beginner's Tour. Mostly I just flesh out the guide to how the game works and try to contextualize everything on the page with the user avatar. If we implement these changes, there may need to be a few edits to the starting task descriptions to prevent overlap.
Definitely check to make sure I didn't mess up any of the coding. I'm a writer, not a programmer.
2013-12-02 19:01:17 -05:00
aa133cc5c6
removes line on li elements in markdown, fixes #1951
2013-12-02 15:37:09 -08:00
dab22ec051
Small formatting fix to Advanced Options
2013-12-02 11:10:58 -06:00
37f7a923ea
Fix #1934 (make Reset and Restore options more distinct)
2013-12-02 10:20:38 -06:00
45b87288f0
Change "reroll" to "Fortify" in Gems popover text
2013-12-01 15:03:03 -06:00
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
30a5b349f8
Fix #1909 (keep stack selected after selling item)
2013-12-01 10:16:21 -06:00
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
0dd911f2ba
Revert "Re-modify position of markdown down formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:29:17 -08:00
b1e5ee6433
Revert "Reposition Markdown formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:26:35 -08:00
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
1000796ddd
Merge pull request #1946 from theyliveforever/develop
...
Spanish translation revised
2013-11-30 13:22:49 -08:00
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
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
7200ab16f4
thanksgiving: back to normal
2013-11-30 10:25:51 -07:00
7fdda14cb8
Reposition Markdown formatting link
...
There's probably a better way to do this. Feedback welcome.
2013-11-30 08:07:20 -08:00
2cd35472fc
Update app.json
2013-11-30 00:07:39 -02:00
9bb4e2c272
update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45
2013-11-29 09:06:13 -08:00
e7373b173d
JP translation fixes
2013-11-29 09:05:16 +11:00
20d7651a66
Some JP translations
2013-11-29 09:04:57 +11:00
5b610bfc5c
small fix for sanity
2013-11-27 22:48:48 -08:00
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
1d03fee4e3
change reference to images directory for emoji, fixes #1935
2013-11-27 20:46:18 -08:00
63e44062b4
thanksgiving: newstuff too
2013-11-27 11:59:07 -07:00
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
962b854f87
Merge remote-tracking branch 'origin/sabe_tweak' into develop
...
Conflicts:
views/options/social/tavern.jade
2013-11-27 11:28:31 -07:00
caaebe01a2
re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!)
2013-11-27 10:53:47 -07:00
68bb5993c9
Merge pull request #1925 from bobbyroberts99/patch-1
...
Update Contributing.md
2013-11-27 08:26:18 -08:00
44401a9162
add emoji.js file to tests, fix travis build
2013-11-27 16:28:09 +01:00
bdf32325f6
remove emoji css from manifest and move into index.styl
2013-11-27 16:19:56 +01:00
d3eed2282c
fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it
2013-11-27 16:08:34 +01:00
a196cc0586
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-27 15:59:02 +01:00
4dbd2fd2f6
pointed to new repository with minifiable code for emoji parsing
2013-11-27 06:19:45 -08:00
13a7292377
emoji works, huzzah. addresses #681 , #1840 , and some discussion in #1908
2013-11-26 21:49:53 -08:00
29f0597178
Update Contributing.md
...
Correct link to userID on wikia and make a few grammatical & punctuation changes.
2013-11-26 20:03:52 -08:00
4af9d97c33
Update CONTRIBUTING.md
...
add links to "Contributing to HabitRPG" and "Tips"
2013-11-27 11:54:00 +11:00
aca122d6de
fix up CONTRIBUTING.md, update "submit bugs" links with this change
2013-11-26 17:09:13 -07:00
Tyler Renelle