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
520 commits 3 branches 0 tags 1.6 GiB
Commit graph

520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
221574bcb2 #83 ski-sassin offhand pole should match 2nd-best regular offhand 2014-01-08 09:38:24 -07:00
Tyler Renelle
84637ad336 fix https://github.com/HabitRPG/habitrpg/issues/2276 provide 
newly-created tags with an id from the browser
 2014-01-07 17:23:47 -07:00
Tyler Renelle
398a919afb Merge pull request #79 from HabitRPG/sabe/fix 
Server side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock
 2014-01-07 11:55:52 -08:00
Tyler Renelle
939ce14185 https://github.com/HabitRPG/habitrpg/issues/2010 allow wrapping members (don't add ops to them) 2014-01-07 10:43:00 -07:00
Sabe Jones
9d9cf0788f Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:04:50 -06:00
Tyler Renelle
0157afb6b3 spritesmith: try using spritesmith-{TIMESTAMP}.png for image 
cache-busting (@paglias good idea)
 2014-01-06 22:57:35 -07:00
Tyler Renelle
eff279be5b spritesmith: reposition healer tiaras 2014-01-06 22:28:18 -07:00
Tyler Renelle
bb7d2918d6 Merge pull request #77 from Sinza-/develop 
Add strings from views/shared/tasks and views/shared/profiles folders
 2014-01-06 20:24:12 -08:00
Tyler Renelle
3069647b92 Merge pull request #78 from HabitRPG/sabe/fix 
Rebirth fix: force Costume preference off
 2014-01-06 19:47:32 -08:00
Sabe Jones
d2542b05ca Rebirth fix: force Costume preference off so avatar will display new gear prior to Market unlock 2014-01-06 21:30:47 -06:00
Tyler Renelle
2635db9e51 winter: weapons should be 2nd best, not 1st. Some refactoring 2014-01-06 18:24:31 -07:00
Tyler Renelle
4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle
c01d5d79d6 event-items: try a different approach than "unbreakable" (1335750). If they've owned it before (item==false), then they canOwn() again. In those cases, set item to 'event' 2014-01-06 17:13:44 -07:00
Tyler Renelle
1335750804 add unbreakable special items, so we can add special-event gear which users can buy during a certain period of time, but which they can't lose on death. Starting with party-hats 2014-01-06 14:15:21 -07:00
Marcelo Sizer
2834fed8ef Add strings from views/shared/tasks and views/shared/profiles folders 2014-01-06 17:51:08 -02:00
Sabe Jones
cd38cc9fb8 Merge pull request #75 from HabitRPG/sabe/tweak2 
Rebirth fixes: deequip pets and mounts, allow stacking at max level
 2014-01-05 15:33:02 -08:00
Sabe Jones
d7fd82039f Fix assignment operator bug 2014-01-05 17:31:08 -06:00
Tyler Renelle
63034a587b grunt 2014-01-05 16:17:46 -07:00
Tyler Renelle
01fae2a2f0 Merge pull request #76 from Alys/patch-3 
subtract MP when unticking a todo (instead of add)
 2014-01-05 14:52:50 -08:00
Tyler Renelle
9692338a73 Merge pull request #73 from Alys/patch-2 
fix(?) for issue 2222 - untick removes too little XP,GP
 2014-01-05 14:49:49 -08:00
Tyler Renelle
f923798388 Merge pull request #72 from Alys/patch-1 
change food.key to food.text (displayed text only)
 2014-01-05 14:48:53 -08:00
Alice Harris
9ce3749d65 subtract MP when unticking a todo (instead of add) 
Currently, when you untick a completed todo, you GAIN MP. Lines 837-839 of this change will cause you to loose it instead.

Line 841 will prevent your MP becoming negative if you used up all your MP before unticking the todo... BUT do we want to prevent negative MP under that circumstance? Perhaps it should be allowed to go negative? The circumstance I'm thinking of is:
1. You tick off a todo, causing your MP to reach (for example) 10.
2. You cast a spell that costs 10 MP. MP is now 0.
3. You realise that you had ticked off the todo accidentally (or deliberately to rort the system!) and so you untick the todo, which (without line 841) would cause your MP to go to -1. Strictly speaking, it SHOULD be -1 because you had spent MP that you hadn't truly earned, but negative MP might look weird and cause "bug" reports. Line 841 will prevent it being negative.
 2014-01-06 07:38:26 +10:00
Tyler Renelle
31e1639cd1 Merge pull request #74 from HabitRPG/sabe/tweak 
Add some value to high Mana pools
 2014-01-05 08:49:53 -08:00
Sabe Jones
319689afea Rebirth fixes: deequip pets and mounts, allow stacking at max level 2014-01-05 10:17:18 -06:00
Sabe Jones
ceb7bc20bf Add some value to high Mana pools 2014-01-05 09:14:21 -06:00
Alice Harris
6c5eae1847 fix(?) for issue 2222 - untick removes too little XP,GP 
This is a proposed fix for issue 2222 ("unticking a todo with a checklist removes much less XP and GP than it should") BUT I HAVE NOT TESTED THIS (I don't have a local install yet - sorry). Please see my comments at the end of that issue. Note that I don't know why "if direction is 'up'" was originally included - there might have been (and still be) a good reason for it.
 2014-01-05 19:46:27 +10:00
Tyler Renelle
2d8dd47414 autoAllocate: more code compactifying (for fun) 2014-01-04 18:11:13 -07:00
Alice Harris
fc39ae4a4a change food.key to food.text (displayed text only) 
Change food.key to food.text in displayed text, to stop the "potatoe" typo being seen.
 2014-01-05 10:37:07 +10:00
Tyler Renelle
fdd856c2f8 autoAllocate: small tweak to taskbased to make it more apparent which is kicking 2014-01-04 17:32:14 -07:00
Tyler Renelle
2721800f37 autoAllocate: compactify some code (no reason, just for the ninja 
feel). Add simulation script to show results for all auto-allocate
methods for levels 1-20
 2014-01-04 17:16:45 -07:00
Tyler Renelle
f4f6dcebdc Merge remote-tracking branch 'origin/sabe/attributes' into develop 2014-01-04 15:58:16 -07:00
Tyler Renelle
20376d69c0 don't hide completed todos from challenge progress modals 2014-01-03 14:42:18 -07:00
Tyler Renelle
81ca8d15b5 bring @JasonGross changes back in. Jason, updates should go to 
script/content.coffee (dist/habitrpg-shared.js is a compiled file and
gets clobbered)
 2014-01-03 14:18:35 -07:00
Tyler Renelle
b0666cb1e3 challenges: don't remove challenge todos on clear-completed 2014-01-03 14:17:02 -07:00
Tyler Renelle
0e6f352e70 Merge pull request #71 from JasonGross/greener->bluer 
Tasks get blue when you do them often, and the text for Pickpocket should reflect this
 2014-01-02 20:20:11 -08:00
Tyler Renelle
1803bdb2ed fix https://github.com/HabitRPG/habitrpg/issues/2073 2014-01-02 21:09:26 -07:00
Jason Gross
3fbb454886 Tasks get blue when you do them often, not green. 
I believe the sequence is red -> yellow -> green -> blue.  The text for 'Pickpocket' now reflects this slightly better, I believe.
 2014-01-02 21:25:58 -05:00
Tyler Renelle
93201b5d39 back to normal winter npc sprites 2014-01-02 16:35:49 -07:00
Tyler Renelle
24b99617e6 grunt 2014-01-02 16:31:23 -07:00
Tyler Renelle
8523f68672 expose api.pets 2014-01-02 16:30:25 -07:00
Tyler Renelle
72f021b4bc Merge pull request #70 from colegleason/crit-notif 
Add Critical Hit notificaiton via user._tmp
 2014-01-02 11:59:15 -08:00
Cole Gleason
737fbd737c Add Critical Hit notificaiton via user._tmp 2014-01-02 13:36:49 -06:00
Matteo Pagliazzi
604c8ab7b2 moved locales and locales-old from habitrpg, @lefnire I left them in habitrpg so that the strings already translated will continue to work, I will make sure to remove them when everything is done 2014-01-02 20:22:19 +01:00
Tyler Renelle
8d2d1e9276 Merge pull request #69 from Alys/patch-1 
Tools of the Trade description now mentions drops
 2014-01-01 21:57:04 -08:00
Alice Harris
93531ac24a Tools of the Trade description now mentions drops 
Edited description for Tools of the Trade to state that it increases the chance of drops (because the spell buffs PER and PER is used to calculate "chance" in the randomDrop function)
 2014-01-02 11:58:30 +10:00
Dušan Juretić
3549659d94 Added test for max MP calculation 2014-01-01 22:53:19 -03:00
Sabe Jones
3df4724999 Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:37 -06:00
Tyler Renelle
b76b275a7c winter: party hat fix, big snowball in inventory (@lemoness). Still 
small one in spells list, those are 32x22. I say we just leave it
 2013-12-31 08:54:26 -07:00
Tyler Renelle
0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) 2013-12-31 08:47:10 -07:00
Tyler Renelle
549fd7bac0 new year's eve event: party hat, new NPCs 2013-12-31 08:44:01 -07:00