a3d2e59033
Merge pull request #1971 from Xatres/develop
...
Updated Beginner's Tour, Mk 5
2013-12-08 16:55:45 -08:00
af82ff520c
Updated Beginner's Tour, Mk 5
...
Fixed Wiki link (double quotes --> single quotes)
2013-12-08 18:59:38 -05:00
4f64483c4e
Merge pull request #1964 from Omnomnobot/patch-1
...
Fixed small translation errors
2013-12-08 09:28:58 -08:00
542c72c95c
Merge pull request #1957 from Xatres/develop
...
Updated Beginner's Tour
2013-12-08 09:01:11 -08:00
c524972aa2
Merge pull request #1952 from HabitRPG/sabe/tweak
...
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
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
8283eca0d4
Updated Beginner's Tour, Mk 4
...
Added link to HabitRPG wiki.
2013-12-08 09:54:36 -05:00
a85baa2725
groups: send down full user.items for party / guilds. It's not that much
...
really, and trying to keep it up-to-date with ever-evolving
UserSchema.items is a pain (eg, needed to add mounts)
2013-12-07 19:53:50 -07:00
46f91db14c
Mounts: prevent feeding special pets
2013-12-07 13:54:19 -07:00
8f75b84b42
mounts: bugfix to drop notif for food
2013-12-07 12:17:03 -07:00
680f0e974e
mounts: bailey notif
2013-12-07 11:56:34 -07:00
e367985fa8
window.env not available on frontpage, @paglias is this an ok workaround?
2013-12-07 11:56:22 -07:00
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
2d6fb91273
Updated Beginner's Tour, Mk 3
...
Quickfix to changed "sex" to "body type," in anticipation of coming customization updates.
2013-12-07 11:59:08 -05:00
73cd36c7b0
Update app.json
...
ITA - Conoscendo l'italiano vorrei aiutare con la traduzione. Dato che mi sembrava tutto ok, ho solo apportato qualche piccola correzione.
ENG - I speak Italian and I'd want to help with the translation. In this file all seemed ok, so I only corrected some little things.
2013-12-07 17:37:17 +01:00
d2a0fb073f
Updated Beginner's Tour, Mk 2
...
Fixed issues proposed by SabreCat, including gender neutral language, general terminology, and adding a note about unlockable features at the end.
2013-12-06 15:46:39 -05:00
9b459e37f3
fix siteVerion check & reload page after batchUpdate if needed, @lefnire let me know what do you think and if it needs to be applied to other routes too
2013-12-06 21:43:25 +01:00
524796ba25
send only one momementjs language
2013-12-06 21:29:13 +01:00
c30934bc96
add force refresh middleware & add to batchUpdate
2013-12-06 21:16:22 +01:00
dd8b38ca04
Answer tavern FAQ in resource links
2013-12-06 06:34:54 -06:00
469a1e5e12
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-12-05 21:50:47 -06: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
1000796ddd
Merge pull request #1946 from theyliveforever/develop
...
Spanish translation revised
2013-11-30 13:22:49 -08:00
7200ab16f4
thanksgiving: back to normal
2013-11-30 10:25:51 -07: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
Tyler Renelle