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

618 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
640da7aa54 rebirth: return user in response 2013-12-31 08:00:47 -07:00
Tyler Renelle
19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop 
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
 2013-12-31 07:56:35 -07:00
Sabe Jones
c4a82d4edd Daily derp! Don't return PER when STR is suggested 2013-12-30 23:09:47 -06:00
Tyler Renelle
eb016649e1 checklists: grant GP bonus for CLIs on To-Dos 2013-12-30 14:51:49 -07:00
Tyler Renelle
85c96886a3 checklists: point-match TDs for each CL-item. Bug fix on resetting CLs 
on cron
 2013-12-30 13:23:48 -07:00
Sabe Jones
9f4efc31ed Break out autoAllocate to its own function 2013-12-30 11:39:53 -06:00
Sabe Jones
958ec99f1a Merge branch 'develop' into sabe/attributes 2013-12-30 10:27:58 -06:00
Tyler Renelle
bb80176920 checklists WIP 2013-12-29 22:37:12 -07:00
Tyler Renelle
bb5fe9c6e5 classes: temporary stopgap for 
https://github.com/HabitRPG/habitrpg/issues/2150 , burst-of-flames being
too powerful. This isn't the real solution we need something better
 2013-12-29 16:58:45 -07:00
Tyler Renelle
af499a0663 fix https://github.com/HabitRPG/habitrpg/issues/2172 save task.tags 2013-12-29 16:46:25 -07:00
Tyler Renelle
dfa25c6f3a fix https://github.com/HabitRPG/habitrpg/issues/2156 stack stealth 2013-12-28 22:01:44 -07:00
Tyler Renelle
77a1c91422 grunt 2013-12-28 16:35:38 -07:00
Sabe Jones
0478323efc Change out one if chain for a switch, put stats in 3:2:1:1 order in code (@paglias) 2013-12-28 17:26:17 -06:00
Tyler Renelle
dfd2a17ef9 APIv2: instead of passing req to callback, passing response object so API can return the object when wrapped on the server 2013-12-28 11:51:38 -07:00
Sabe Jones
6997cd9821 Implement new "flat" and "classbased" automatic allocation modes 2013-12-28 11:56:36 -06:00
Tyler Renelle
bafa3ffd21 winter: add snowball achievement 2013-12-27 09:48:35 -07:00
Tyler Renelle
de0f2d5e48 #64 move hair_color_wips to project_files/ so they dont' get compiled to 
the spritesheet (we'll move them back when they're complete). Add
 updated healer shields to shop_*, remove artifact from
 hair_bangs_rot. @crystalphoenix thanks for hard work!
 2013-12-27 09:17:59 -07:00
Tyler Renelle
ebd9872474 grunt with sabe's changes 2013-12-27 09:09:49 -07:00
Tyler Renelle
aebfe7c63c Merge pull request #64 from crystalphoenix/develop 
Redone healer shields, start on new bang colors
 2013-12-27 08:09:32 -08:00
Tyler Renelle
0c9c078928 Merge pull request #59 from HabitRPG/sabe/classes 
Content update to match #2019 fix
 2013-12-27 07:58:55 -08:00
Tyler Renelle
4ee8e47700 Merge pull request #62 from HabitRPG/sabe/tweak 
Improve food drop notification phrasing
 2013-12-27 07:58:09 -08:00
Tyler Renelle
82afe6e796 spritesmith: swap xmas bailey => winter bailey @lemoness 2013-12-26 15:25:51 -07:00
Tyler Renelle
d95e85f4d1 Merge pull request #66 from HabitRPG/sabe/tweak2 
Fix HabitRPG/habitrpg#2100 (can't get Ultimate Gear with Mage stuff)
 2013-12-26 08:26:32 -08:00
Sabe Jones
54ed3c9497 Fix HabitRPG/habitrpg#2100 (can't get Ultimate Gear with Mage stuff) 2013-12-26 09:11:07 -06:00
Tyler Renelle
dff68a6443 fix https://github.com/HabitRPG/habitrpg/issues/2114 (thanks @EvilTosha, was huntin that one!) 2013-12-25 20:37:49 -07:00
Sabe Jones
98556fdb23 Set the rebirth level on first achievement 2013-12-25 17:36:36 -06:00
Sabe Jones
aeb74bbbf5 Remove broken notification 2013-12-25 17:25:32 -06:00
Sabe Jones
d238592eb4 Fix NaN error on first achievement 2013-12-25 17:08:42 -06:00
Sabe Jones
701be90da2 Add achievement for rebirths 2013-12-25 16:55:07 -06:00
Tyler Renelle
050d266970 don't force-refresh on errors 2013-12-25 13:00:48 -07:00
Dušan Juretić
acbe058317 Fix tests by adding quest attributes 2013-12-25 15:29:39 -03:00
Tyler Renelle
84ef3fb861 API: better task defaults (for 3rd-party up/down scoring) 2013-12-25 10:56:21 -07:00
Tyler Renelle
c7b5b5e601 Merge branch 'bosses' into develop 2013-12-25 08:25:06 -07:00
Tyler Renelle
c2e01595c9 upgrade spritesmith 2013-12-25 00:34:20 -07:00
Tyler Renelle
1f3198e77b bosses: add content for evil-santa. also add "completion" field for quest content 2013-12-24 23:55:53 -07:00
Tyler Renelle
20d3c59c3b rename user.party.tally => user.party.progress 2013-12-24 21:57:46 -07:00
Sabe Jones
44d738af50 Herp derp, i can script coffee 2013-12-24 22:07:27 -06:00
Sabe Jones
6f4427b087 Fix bug (preexisting in Fortify, new in Rebirth) that zeroed out prices of custom Rewards 2013-12-24 21:55:54 -06:00
Sabe Jones
79bd322900 Complete op, except for Achievement. H/T @lefnire for the streak reset fix! 2013-12-24 21:18:29 -06:00
Tyler Renelle
9aeb4f9ffb quests: add collection quests & quest arks 2013-12-24 17:24:32 -07:00
Sabe Jones
baa2e2a8fd Try a vanilla CoffeeScript (haha) solution 2013-12-24 17:24:05 -06:00
Sabe Jones
50ffe4dcda Attempt to fix bug that turned all tasks into Dailies 2013-12-24 16:22:24 -06:00
Sabe Jones
f8b1fbda51 Fix "bounce" of Rebirth unlock. Other flags weren't sticking either; attempt alternate method of turning them off 2013-12-24 16:04:28 -06:00
Sabe Jones
8d51520b80 Compile rebirth CS into JS, fix Gem price 2013-12-24 15:36:03 -06:00
Sabe Jones
a5efa094e8 First draft of Rebirth user op 2013-12-24 12:25:50 -06:00
Tyler Renelle
fe6b505c09 drop-rate calculation modification. not the end solution, just a step toward 
implementing collection quests (fyi @sabrecat)
 2013-12-24 09:32:15 -07:00
Sabe Jones
f1c7018ac0 It would help to actually set the flag on the server rather than just, y'know, mention it 2013-12-24 09:09:48 -06:00
Sabe Jones
923dda6970 Watch your parentheses, Sabe. Let WebStorm help you! 2013-12-24 09:04:18 -06:00
Sabe Jones
56a94eb9a9 Fix rebirthEnabled flag getting set only on client and dying off on refresh 2013-12-24 08:59:51 -06:00
Sabe Jones
c25394ad45 Fix missing unlock logic from grunt commit 2013-12-24 08:36:53 -06:00