Commit graph

318 commits

Author SHA1 Message Date
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
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
Tyler Renelle
9bee4b9f9e Merge branch 'master' into develop 2013-12-08 22:57: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
Dušan Juretić
f37c1a9f21 Test for food drop 2013-12-08 20:14:16 -03: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
Adrien Lemaire
053d900abb add 17 new shirts, slim+broad 2013-12-08 23:24:59 +11: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
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
deb7e83394 cleanup death handling 2013-12-07 11:30:24 -07: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
Dušan Juretić
e963674384 fix preening user history test by freezing time 2013-12-06 23:08:29 -03:00
Tyler Renelle
86dae794b1 classes: death WIP (handling lose 1 gear piece, 1 stat point). This will
need revisiting and testing
2013-12-06 17:45:07 -07:00
Tyler Renelle
acae9c36fe classes spritesmith #37 move from using *_warrior_0 for all "blank"
items, to *_base_0. Any left-over {type}_{class}_0 now are
significant (eg, weapon_*_0, as well as shield_rogue_0). This is
necessary for proper traversing up/down class shop, and allows for
completely random item deletions on death.
2013-12-06 15:41:11 -07:00
Tyler Renelle
ee558c9287 classes: move some files around 2013-12-06 14:30:01 -07:00
Tyler Renelle
41da82ff57 classes: add twoHanded attr on weapons (@sabrecat easy-peasy) 2013-12-06 11:45:30 -07:00
Tyler Renelle
47524726ea spritesmith #37 shield_warrior_0 (aka, no shield) 2013-12-06 09:25:24 -07:00
Tyler Renelle
665166507e classes: move item-store sorting from web to shard (so we can share with
mobile)
2013-12-05 18:19:39 -07:00
Tyler Renelle
ba6e416e4d 300-tier: support buying 300 tier (see http://goo.gl/qDCmX6) (FYI @danielthebard @SabreCat) 2013-12-05 16:13:56 -07:00
Tyler Renelle
b5c928238b grunt-spritesmith #37 contributor pet 2013-12-05 15:56:47 -07:00
Tyler Renelle
617d29b3fb classes: support buying special gear (backer, contrib, etc) from item store 2013-12-05 15:48:13 -07:00
Tyler Renelle
69d248f826 grunt-spritesmith #37 backer & contrib spritesheets support 2013-12-05 15:46:08 -07:00
Tyler Renelle
ee4777d5e8 classes spritesmith #37 remove chin outlines from helms so they won't
cover beards. move head_warrior_0 to head_0 so it doesn't add
extra chin outline. We'll need to figure out how to handle class_0 for
each class
2013-12-05 10:46:27 -07:00
Tyler Renelle
9ce88004cb classes spritesmith #37 rogue knife weapon/off-hand shop-sprites 2013-12-05 10:10:10 -07:00
Tyler Renelle
3c68bd90da classes & spritesmith [#37] fixes to top 3 rogue helms 2013-12-05 09:49:56 -07:00
Tyler Renelle
4818c0a830 classes: temporarily switch rogues to knives instead of bows, revisit
this commit - incomplete
2013-12-05 03:46:11 -07:00
Tyler Renelle
e7c7ab099e spritesmith [#37] @crystalphoenix BEARDS! 2013-12-05 02:27:43 -07:00
Tyler Renelle
7c6d2cfe31 classes spritesmith [#37] add shop 300-tier items 2013-12-05 02:04:03 -07:00
Tyler Renelle
1fd63c00c1 grunt-spritesmith [#37] add initial shop-sprites (these may need adjusting) 2013-12-05 01:34:07 -07:00
Tyler Renelle
2a417cd201 classes: add level requirements for spells, remove derby cleanup, unlock
classes properly
2013-12-04 23:53:15 -07:00
Tyler Renelle
80eb0f564a spritesmith [#37] fixes to shop-sprites 2013-12-04 23:09:45 -07:00
Tyler Renelle
a0ea8dbca2 costumes: add costume support (supporting habitrpg#5fea978) 2013-12-04 22:50:43 -07:00
Tyler Renelle
b74f4905f9 [#37]grunt-spritesmith: re-organize folders 2013-12-04 20:01:37 -07:00
Tyler Renelle
8aa89b8ee4 [#37]grunt-spritesmith: add 300-tier (@lemoness) 2013-12-04 20:01:35 -07:00
Tyler Renelle
94603fa0ca [#37]grunt-spritesmith: NPCs (this is a big one!) 2013-12-04 20:01:33 -07:00
Tyler Renelle
417986c6b4 [#37]grunt-spritesmith: shop sprites 2013-12-04 20:01:29 -07:00
Tyler Renelle
0f3f67b6b3 [#37]grunt-spritesmith: death & paws 2013-12-04 20:01:27 -07:00
Tyler Renelle
7dd4216b0f [#37]grunt-spritesmith: death 2013-12-04 20:01:25 -07:00
Tyler Renelle
3026cc2132 [#37] grunt-spritesmith: achievements 2013-12-04 20:01:14 -07:00
Tyler Renelle
53bbb20ba6 [#37] class: misc cleanup (moving / deletions) 2013-12-04 20:01:04 -07:00
Tyler Renelle
9c135482a2 [#37] classes: move m/f => broad/slim, add those body-types in, fix hair positioning 2013-12-04 20:00:50 -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