sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
aac5cc6d39 [https://github.com/HabitRPG/habitrpg/issues/1977] add some basic 
documentation for user.ops
 2013-12-11 22:20:11 -07: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
Tyler Renelle
954cdf7f29 [https://github.com/HabitRPG/habitrpg/issues/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:05 -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
Tyler Renelle
9bee4b9f9e Merge branch 'master' into develop 2013-12-08 22:57:18 -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
1144752f52 remove reroll from items.coffee 2013-12-08 19:02:50 -07:00
Tyler Renelle
c28eb2f11c Merge remote-tracking branch 'Fandekasp/shirts' into develop 2013-12-08 18:57:14 -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
Dušan Juretić
f37c1a9f21 Test for food drop 2013-12-08 20:14:16 -03: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
Tyler Renelle
0846c8191a Merge pull request #49 from Xatres/master 
Updated Starting Tasks
 2013-12-08 08:22:56 -08:00
Tyler Renelle
40b89dda46 Merge pull request #46 from BlackEdder/max_drop_chance_clean 
Calculate chance to drop using a slowly increasing function
 2013-12-08 08:21:28 -08:00
Xatres
bee95205f4 Updated Starting Tasks, Mk 2 
Quickedit to clarify first task.
 2013-12-08 09:58:09 -05:00
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4 
Added link to HabitRPG wiki.
 2013-12-08 09:54:36 -05:00
Adrien Lemaire
053d900abb add 17 new shirts, slim+broad 2013-12-08 23:24:59 +11: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
6d2e67fab6 Merge branch 'master' into classes 
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	img/sprites/Egg_Sprite_Sheet.png
 2013-12-07 19:50:34 -07:00
Tyler Renelle
2dbbb3e521 Merge pull request #51 from therufs/master 
re-tweak potion ratios
 2013-12-07 18:04:33 -08:00
Ruthan
2953aa58fc Rebalance potion drop ratios 2013-12-07 20:16:13 -05:00
Ruthan
c9eac2ff8e Merge branch 'master' of https://github.com/therufs/habitrpg-shared 
Conflicts:
	dist/habitrpg-shared.js
	script/algos.coffee
 2013-12-07 20:12:03 -05:00
Tyler Renelle
1ec0dc12b3 Revert "mounts: remove food temporarily. merging to master so we can run schema" 
This reverts commit bf8c0dd9dc.

Conflicts:
	dist/habitrpg-shared.js
	script/algos.coffee
 2013-12-07 20:09:45 -05: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
d7407506bc Revert "mounts: remove food temporarily. merging to master so we can run schema" 
This reverts commit bf8c0dd9dc.

Conflicts:
	dist/habitrpg-shared.js
	script/algos.coffee
 2013-12-07 11:37:01 -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
Tyler Renelle
deb7e83394 cleanup death handling 2013-12-07 11:30:24 -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
Xatres
f044e9cbb1 Updated Starting Tasks 
Starting tasks updated to prevent overlap with updated Beginner's Tour. Also fleshed out the description of task colors.
 2013-12-07 11:22:55 -05:00