Commit graph

3724 commits

Author SHA1 Message Date
Tyler Renelle
d9bef28c5d migrate flags.rest => preferences.sleep 2013-12-12 20:59:16 -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
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
caa2f26003 [#1977] [#1616] move sortTask to user.ops 2013-12-12 17:32:54 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
d4e0ae85a0 [#1977] port pet-feeding to user.ops, so that it's now available in the API. Also add handling of 200 errors to simply notify and continue on up to server (friendly messages) 2013-12-12 15:58:17 -07:00
Tyler Renelle
4f44e8f2e1 Merge pull request #1982 from ThibG/develop
Fix syntax error in jade file
2013-12-12 09:59:17 -08:00
Thibaut Girka
6604a36a9a Fix syntax error in jade file 2013-12-12 18:56:43 +01:00
Tyler Renelle
fe6bb48dce Merge pull request #1981 from ThibG/develop
Fix mongoose query
2013-12-12 09:21:03 -08:00
Thibaut Girka
f9489b3385 Fix mongoose query
This caused an "Invalid sort() argument." error when accessing groups.
2013-12-12 14:47:55 +01: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
Adrien Lemaire
842f0de838 Merge pull request #1979 from SyntaxPickax/patch-1
Fixed Windows & UNIX path separators
2013-12-11 13:59:17 -08:00
Tyler Renelle
4e9b3f8522 fix 4323443 [#1977] thanks @toote 2013-12-11 08:54:54 -07:00
Brandon McPhail
4e86f7a852 Fixed Windows & UNIX path separators
Windows: node .\src\seed.js
UNIX: node ./src/seed.js

The readme had it backwards.
2013-12-10 18:01:27 -08:00
Tyler Renelle
4323443dbd [#1977] stricter PUT /user set-path validation, require they're setting on a
leaf-path (except for tasks.* - we still need to handle that properly)
2013-12-10 09:10:00 -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
108d852d12 remove reroll from tasks/lists.jade 2013-12-08 19:04:18 -07:00
Tyler Renelle
81dc41e177 classes: use habitrpg-shared#develop for current production
feature-freeze & classes feature sprint (@paglias @Fandekasp we're good
to go on translations et all now)
2013-12-08 18:21:28 -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
a3d2e59033 Merge pull request #1971 from Xatres/develop
Updated Beginner's Tour, Mk 5
2013-12-08 16:55:45 -08:00
Xatres
af82ff520c Updated Beginner's Tour, Mk 5
Fixed Wiki link (double quotes --> single quotes)
2013-12-08 18:59:38 -05:00
Tyler Renelle
4f64483c4e Merge pull request #1964 from Omnomnobot/patch-1
Fixed small translation errors
2013-12-08 09:28:58 -08:00
Tyler Renelle
542c72c95c Merge pull request #1957 from Xatres/develop
Updated Beginner's Tour
2013-12-08 09:01:11 -08: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
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4
Added link to HabitRPG wiki.
2013-12-08 09:54:36 -05: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
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
Tyler Renelle
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00
Tyler Renelle
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -07:00
Tyler Renelle
e367985fa8 window.env not available on frontpage, @paglias is this an ok workaround? 2013-12-07 11:56:22 -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
Xatres
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
Omnomnobot
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
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
Xatres
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
Matteo Pagliazzi
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
Matteo Pagliazzi
524796ba25 send only one momementjs language 2013-12-06 21:29:13 +01:00
Matteo Pagliazzi
c30934bc96 add force refresh middleware & add to batchUpdate 2013-12-06 21:16:22 +01:00
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
Sabe Jones
dd8b38ca04 Answer tavern FAQ in resource links 2013-12-06 06:34:54 -06:00
Sabe Jones
469a1e5e12 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-12-05 21:50:47 -06: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