sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
301 commits 3 branches 0 tags 1.6 GiB
Commit graph

301 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Tyler Renelle
e204bed2d9 Merge @Shaners eggs with food sprites 2013-12-03 18:21:25 -07:00
Tyler Renelle
4bbf0cfae8 Merge remote-tracking branch 'Shaners/contrib' into classes 
Conflicts:
	img/sprites/Egg_Sprite_Sheet.png
	img/sprites/archive/BackerOnly-Shop-temporary.png
	img/sprites/archive/player_sprites.png
	img/sprites/archive/player_sprites105x.png
 2013-12-03 18:16:33 -07:00
Tyler Renelle
9409f5ee7f grunt-spritesmith eggs #37 2013-12-03 18:11:50 -07:00
Tyler Renelle
5c97887d0d Merge branch 'master' into classes 
Conflicts:
	img/sprites/Mount-SpriteSheet.png
 2013-12-03 18:10:08 -07:00
Tyler Renelle
0ffc836120 mounts: mounts & food sprites & css 2013-12-03 18:04:51 -07:00
Tyler Renelle
dbd7aaf4c4 classes: spritesmith add pets 2013-12-03 17:58:37 -07:00
Tyler Renelle
5ebf3a7802 classes: spritesmith wip #37 2013-12-03 16:49:54 -07:00
Tyler Renelle
c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) 2013-12-03 16:32:20 -07:00
Tyler Renelle
091600d7fc classes: add _statsComputed property, and sample 
`user.stats.buffs.stealth` handling (@SabreCat @danielthebard)
 2013-12-02 19:14:29 -07:00
Tyler Renelle
f662b3af18 Merge branch 'master' into classes 
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
 2013-12-01 19:24:40 -07:00
Tyler Renelle
9976610652 classes: armory WIP 2013-11-30 16:32:09 -07:00
Tyler Renelle
0d0080ace4 Merge pull request #47 from HabitRPG/sabe/classes 
Draft of names, descriptions, stats, and costs for class-based equipment
 2013-11-30 11:29:07 -08:00
Tyler Renelle
5d0b925a4c fix tests for 282e105 . May be temporary, unless we verify that 282e105 
was the fix for https://github.com/HabitRPG/habitrpg/issues/1057
 2013-11-29 17:21:22 -07:00
Tyler Renelle
282e105ea3 [https://github.com/HabitRPG/habitrpg/issues/1057] don't exit-early when 
attempting to detect if they've switched timezones. Also, don't need to
sanitize user.lastCron in shared, do it in Mongoose
 2013-11-29 17:15:41 -07:00
Tyler Renelle
bf7f7b6583 [#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart) 2013-11-29 16:47:08 -07:00