Tyler Renelle
|
b852d9a9f2
|
classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f
|
2013-12-06 11:46:07 -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 |
|
Tyler Renelle
|
7f1892b34a
|
classes: move item-store sorting from web to shard (so we can share with
mobile) habitrpg-shared#6651665
|
2013-12-05 18:20:09 -07: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
|
62d50a1f4d
|
classes: fixes to buying items
|
2013-12-04 23:10:14 -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 |
|
Tyler Renelle
|
91c141140d
|
classes: armory WIP
|
2013-11-30 16:33:21 -07:00 |
|
Tyler Renelle
|
1000796ddd
|
Merge pull request #1946 from theyliveforever/develop
Spanish translation revised
|
2013-11-30 13:22:49 -08:00 |
|
Tyler Renelle
|
7200ab16f4
|
thanksgiving: back to normal
|
2013-11-30 10:25:51 -07:00 |
|
Andrea
|
2cd35472fc
|
Update app.json
|
2013-11-30 00:07:39 -02: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 |
|
Nick Gordon
|
5b610bfc5c
|
small fix for sanity
|
2013-11-27 22:48:48 -08: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 |
|
Nick Gordon
|
1d03fee4e3
|
change reference to images directory for emoji, fixes #1935
|
2013-11-27 20:46:18 -08:00 |
|
Tyler Renelle
|
63e44062b4
|
thanksgiving: newstuff too
|
2013-11-27 11:59:07 -07: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
|
caaebe01a2
|
re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!)
|
2013-11-27 10:53:47 -07:00 |
|
Tyler Renelle
|
68bb5993c9
|
Merge pull request #1925 from bobbyroberts99/patch-1
Update Contributing.md
|
2013-11-27 08:26:18 -08:00 |
|
Matteo Pagliazzi
|
44401a9162
|
add emoji.js file to tests, fix travis build
|
2013-11-27 16:28:09 +01:00 |
|
Matteo Pagliazzi
|
bdf32325f6
|
remove emoji css from manifest and move into index.styl
|
2013-11-27 16:19:56 +01:00 |
|
Matteo Pagliazzi
|
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 |
|
Matteo Pagliazzi
|
a196cc0586
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2013-11-27 15:59:02 +01:00 |
|
Nick Gordon
|
4dbd2fd2f6
|
pointed to new repository with minifiable code for emoji parsing
|
2013-11-27 06:19:45 -08:00 |
|
Nick Gordon
|
13a7292377
|
emoji works, huzzah. addresses #681, #1840, and some discussion in #1908
|
2013-11-26 21:49:53 -08:00 |
|
Bob Steffes
|
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 |
|
Adrien Lemaire
|
4af9d97c33
|
Update CONTRIBUTING.md
add links to "Contributing to HabitRPG" and "Tips"
|
2013-11-27 11:54:00 +11:00 |
|
Tyler Renelle
|
aca122d6de
|
fix up CONTRIBUTING.md, update "submit bugs" links with this change
|
2013-11-26 17:09:13 -07:00 |
|
Tyler Renelle
|
878c9756d1
|
add CONTRIBUTING.md, which will automatically add a "read this before
submitting a ticket" kinda thing to issues.
|
2013-11-26 16:58:01 -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 |
|
Tyler Renelle
|
2b128f71f4
|
[#1532] add better validation on preferences.dayStart, and a migration to
cleanup corrupt ones
|
2013-11-26 15:18:20 -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
|
15f3907f00
|
fix for #1920
|
2013-11-26 11:51:21 -08:00 |
|
Matteo Pagliazzi
|
860a084c69
|
fix for multiple guilds creation
|
2013-11-26 20:16:10 +01:00 |
|