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
6c927414d1
grunt-spritesmith: eggs, food, hatchingPotions, gems #37
2013-12-03 18:43:08 -07:00
Tyler Renelle
49b45bc626
Merge @Shaners eggs with food sprites
2013-12-03 18:21:59 -07:00
Tyler Renelle
e204bed2d9
Merge @Shaners eggs with food sprites
2013-12-03 18:21:25 -07:00
Tyler Renelle
4bbf0cfae8
Merge remote-tracking branch 'Shaners/contrib' into classes
...
Conflicts:
img/sprites/Egg_Sprite_Sheet.png
img/sprites/archive/BackerOnly-Shop-temporary.png
img/sprites/archive/player_sprites.png
img/sprites/archive/player_sprites105x.png
2013-12-03 18:16:33 -07:00
Tyler Renelle
9409f5ee7f
grunt-spritesmith eggs #37
2013-12-03 18:11:50 -07:00
Tyler Renelle
5c97887d0d
Merge branch 'master' into classes
...
Conflicts:
img/sprites/Mount-SpriteSheet.png
2013-12-03 18:10:08 -07:00
Tyler Renelle
0ffc836120
mounts: mounts & food sprites & css
2013-12-03 18:04:51 -07:00
Tyler Renelle
dbd7aaf4c4
classes: spritesmith add pets
2013-12-03 17:58:37 -07:00
Tyler Renelle
5ebf3a7802
classes: spritesmith wip #37
2013-12-03 16:49:54 -07:00
Tyler Renelle
c46795e7a5
classes: grunt-spritesmith WIP #37 (working for male sprites now)
2013-12-03 16:32:20 -07:00
Tyler Renelle
091600d7fc
classes: add _statsComputed property, and sample
...
`user.stats.buffs.stealth` handling (@SabreCat @danielthebard)
2013-12-02 19:14:29 -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
Xatres
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
Nick Gordon
aa133cc5c6
removes line on li elements in markdown, fixes #1951
2013-12-02 15:37:09 -08: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
Tyler Renelle
f662b3af18
Merge branch 'master' into classes
...
Conflicts:
dist/habitrpg-shared.js
dist/spritesheets.css
script/items.coffee
2013-12-01 19:24:40 -07:00
Sabe Jones
45b87288f0
Change "reroll" to "Fortify" in Gems popover text
2013-12-01 15:03:03 -06:00
BlackEdder
9fad649c64
Added comment about further changes that will be needed
2013-12-01 18:46:53 +00:00
Sabe Jones
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
Sabe Jones
30a5b349f8
Fix #1909 (keep stack selected after selling item)
2013-12-01 10:16:21 -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
Tyler Renelle
9976610652
classes: armory WIP
2013-11-30 16:32:09 -07:00
Tyler Renelle
1000796ddd
Merge pull request #1946 from theyliveforever/develop
...
Spanish translation revised
2013-11-30 13:22:49 -08: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
Tyler Renelle
0d0080ace4
Merge pull request #47 from HabitRPG/sabe/classes
...
Draft of names, descriptions, stats, and costs for class-based equipment
2013-11-30 11:29:07 -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
Tyler Renelle
7200ab16f4
thanksgiving: back to normal
2013-11-30 10:25:51 -07: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
Andrea
2cd35472fc
Update app.json
2013-11-30 00:07:39 -02:00
Tyler Renelle
5d0b925a4c
fix tests for 282e105 . May be temporary, unless we verify that 282e105
...
was the fix for https://github.com/HabitRPG/habitrpg/issues/1057
2013-11-29 17:21:22 -07:00
Tyler Renelle
282e105ea3
[ https://github.com/HabitRPG/habitrpg/issues/1057 ] don't exit-early when
...
attempting to detect if they've switched timezones. Also, don't need to
sanitize user.lastCron in shared, do it in Mongoose
2013-11-29 17:15:41 -07:00
Tyler Renelle
bf7f7b6583
[ #1057 ] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart)
2013-11-29 16:47:08 -07:00
Sabe Jones
b2a4d215a8
Draft of names, descriptions, stats, and costs for class-based equipment.
2013-11-29 17:31:43 -06:00
Nick Gordon
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
Nicole Foster
e7373b173d
JP translation fixes
2013-11-29 09:05:16 +11:00
Nicole Foster
20d7651a66
Some JP translations
2013-11-29 09:04:57 +11:00
snicker
671c130512
Merge pull request #45 from snicker/master
...
suggested fix for adding "special" pets
2013-11-28 13:45:40 -08:00
Nick Gordon
9b0eea6624
grunted
2013-11-28 13:42:29 -08:00
Nick Gordon
f977bd5171
I don't know much about coffeescript, but this build should pass now
2013-11-28 12:46:49 -08:00
BlackEdder
10ab2a9374
Calculate chance to drop using a slowly increasing function
...
Maximum of the function is probability of 0.75. The old system would
give a guaranteed drop at a modifier of 20. With this function the
probability is then roughly .55.
2013-11-28 18:06:48 +00:00
Nick Gordon
328a9d28dc
suggested fix for adding "special" pets so that the list does not have to be duplicated multiple times. the user model can be updated in habitrpg to pull from here instead of hard coding it
2013-11-27 22:50:19 -08:00
