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

596 commits

Author SHA1 Message Date
Tyler Renelle
d1a2fbbbd9 feat(subscriptions): implement partial paypal-recurring. It's having issues with cookies 2014-03-24 20:47:10 -06:00
Sabe Jones
450a4e4ff5 feat(market): Implement Deer egg purchase 
Adds the Ghost Stag quest to the list of pet quests that unlock egg purchases in Market after 2 completions.
 2014-03-21 22:53:19 -05:00
Tyler Renelle
239e8abf68 feat(equipment): remove base gear from equipment. index.coffee is now 
such that when you click the same gear you have equipped, it un-equips.
 2014-03-21 15:03:46 -06:00
Tyler Renelle
531fe5eb31 feat(flower): add flower customization option 2014-03-21 12:29:57 -06:00
sabrecat
7102943aa1 feat(quests): Allow purchase of quest pets 
Implements purchase in the Market of the two currently available pet quest eggs, after the user has completed the corresponding quest at least twice. This is a hard-code solution; @lefnire or others a little more adept in Angular might be able to make this generic and extensible with an ng-repeat--I just couldn't get the expression quite right.
 2014-03-17 12:20:27 +00:00
Sabe Jones
d62d94c4fc WIP: Enable quest eggs in Market after two runs 2014-03-16 22:23:23 -05:00
Tyler Renelle
4814f479a4 Merge pull request #2874 from lorian/inn-text 
Added a second message under the "rest at the inn" button, explaining ho...
 2014-03-09 16:51:28 -06:00
Sabe Jones
ff3f1c590c fix(bosses): Use ceiling rounding for boss HP 
Corrects the issue reported by some users where boss HP shows 0 but they're not actually defeated yet. Man, Angular "number" directive, why you gotta round like that?
 2014-02-28 19:07:57 -06:00
Tyler Renelle
748f76b928 Merge pull request #2808 from deilann/createparty 
adding pertinent info to create party
 2014-02-27 09:35:55 -08:00
Sabe Jones
39380507e7 fix(Market): Move Saddle back with food 
Moves Saddle out of the Special category of the Market into the "Food and Saddles" group, to match up with the label and grouping used elsewhere.

Fixes #2937
 2014-02-25 19:23:57 -06:00
Matteo Pagliazzi
c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Tyler Renelle
13094c127a feat(premium): unlock mystery items within timeframe of sub sign-on 2014-02-22 21:43:44 -08:00
Tyler Renelle
91d8ebad6d feat(premium): add mystery-item gear slot 2014-02-22 20:38:16 -08:00
Matteo Pagliazzi
35a997c690 Merge pull request #2917 from benmanley/stable-styles 
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
 2014-02-22 15:25:01 +01:00
Tyler Renelle
a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
benmanley
8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley
c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
James Hsiao
9fe8da3c12 fix space issues: contrib modal, challenge list 2014-02-20 20:33:10 -05:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-02-20 16:34:28 -08:00
Tyler Renelle
67876d6306 fix(views): indentation issue, fixes #2913 2014-02-20 12:27:59 -08:00
Hsiao, James (CMG-Atlanta)
0690e1db5a added mysteryItem listing under subscriptions 2014-02-20 11:28:01 -05:00
Lorian
94480d8cdb Added a second message under the "rest at the inn" button, explaining how the inn interacts with boss fights. 2014-02-17 13:43:27 -08:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Matteo Pagliazzi
4018ec885b fix(header): use strings and a small css fix 2014-02-16 14:51:48 +01:00
deilann
18c3460ba8 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into createparty 2014-02-15 06:46:12 -08:00
Matteo Pagliazzi
8f19f225f1 fix(misc): some styles & translations 2014-02-14 18:35:21 +01:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Matteo Pagliazzi
fef858d555 refactor(caching): cache emojis and remove gemoji from bower 2014-02-12 15:21:40 +01:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Tyler Renelle
ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
deilann
e653d85cb7 adding pertinent info to create party 2014-02-10 05:37:31 -08:00
Matteo Pagliazzi
a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members 2014-02-09 16:29:16 +01:00
Matteo Pagliazzi
3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Lorian
322b257b72 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:57:28 -08:00
Matteo Pagliazzi
f3c42f19ab refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
Matteo Pagliazzi
b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle
313ec3d869 Merge branch 'develop' into bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 23:41:14 -07:00
Tyler Renelle
5db96ebca2 fix(bs3): port pet feeding bar 2014-02-07 21:57:26 -07:00
deilann
25941623b1 putting in issue ticket 
correctly putting in issue ticket for "report a bug"
 2014-02-07 17:44:56 -08:00
Tyler Renelle
3473b73452 chore(Merge): branch 'develop' into bs3 
Conflicts:
	views/options/inventory/inventory.jade
 2014-02-07 17:42:12 -07:00
Tyler Renelle
d034262834 feat(premium): subscriber mystery item (doesn't yet do anything) 2014-02-07 11:40:34 -07:00
Tyler Renelle
82d9233d99 feat(rainbow-hair): add rainbow hair colors 2014-02-07 10:01:31 -07:00
Tyler Renelle
ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 00:03:33 -07:00
deilann
66c7f48e2b updating LFG 
Updating Looking for Group to the proper (not dead) link.
 2014-02-06 11:37:35 -08:00
Matteo Pagliazzi
e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Matteo Pagliazzi
b6edc28b14 refactor(bs3): merge develop 2014-02-06 16:19:51 +01:00
Marcelo Sizer
386d108c3c Replace hard-coded strings for window.env.t on js files 2014-02-05 20:43:49 -02:00
deilann
908a5a2408 updating tavern link to new issue ticket 
Explains how Github works. Should reduce number of dupe tickets.
 2014-02-05 13:07:56 -08:00
Matteo Pagliazzi
5b9bbb9729 refactor(bs3): settings 2014-02-05 19:54:50 +01:00
Matteo Pagliazzi
0cc31465ed refactor(bs3): challenges 2014-02-05 19:39:26 +01:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
b89081dd41 refactor(bs3): misc fixes 2014-02-04 20:18:27 +01:00
Matteo Pagliazzi
685b7a3cd2 Merge branch 'develop' into paglias/bs3 2014-02-04 20:16:00 +01:00
Tyler Renelle
07a47d353d Merge pull request #2666 from marcgenesis/develop 
Fixed inventory alignment. Issue #2158
 2014-02-04 11:00:52 -08:00
Matteo Pagliazzi
56133894d8 refactor(bs3): sync with develop 2014-02-03 18:45:25 +01:00
Tyler Renelle
f8796e9028 feat(winter): remove purchasable winter hair colors, keep available if 
they purchased during event
 2014-02-02 23:17:54 -07:00
Cole Gleason
f193790550 Merge pull request #2698 from deilann/fixstats 
changing order of stats in character build
 2014-02-02 15:58:54 -08:00
deilann
2e3ee3f97c removes progress bar of unfeedable pets 2014-02-02 13:22:24 -08:00
Matteo Pagliazzi
07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi
571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi
3e077fea6d refactor(bs3): port rebirth and reroll modals, misc fixes 2014-02-02 13:52:42 +01:00
Matteo Pagliazzi
f31723b0ab refactor(bs3): sync with develop 2014-02-02 13:26:35 +01:00
Tyler Renelle
527f230ee5 Merge pull request #2701 from deilann/wizardtomage 
Change "Wizard" to "Mage" in member modal & inventory
 2014-02-01 16:21:32 -08:00
deilann
dafd015173 wizard to mage in inventory 2014-02-01 15:20:02 -08:00
deilann
d581986dd9 changing order of stats in character build 2014-02-01 13:14:51 -08:00
Marc-André Larivière
0afaa69d7d Created new CSS entry for equipment title and modified inventory.jade accordingly 2014-02-01 13:17:21 -05:00
Marc-André Larivière
875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Matteo Pagliazzi
0a047f5b2f Merge branch 'develop' into paglias/bs3 2014-02-01 16:47:32 +01:00
Tyler Renelle
52f8f0d5b0 feat(winter): remove winter scrolls & snowballs 2014-02-01 07:43:25 -08:00
Tyler Renelle
800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi
cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Tyler Renelle
aff885c05c feat(habitBirthday): add habitrpg birthday event. includes cakes for all 
pets, absurd party robes, npc swap, badge, etc. @lemoness
 2014-01-30 19:20:07 -07:00
Marc-André Larivière
2e64b03a63 Fixed inventory alignment. Issue #2158 2014-01-30 19:58:34 -05:00
Marc-André Larivière
49ec9d2e5c Fixed inventory alignment. Issue #2158 2014-01-30 19:57:50 -05:00
Matteo Pagliazzi
76db2d49c2 18n(merge): merge @Sinza- pr, @lefnire now it is ready 2014-01-30 22:25:42 +01:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Matteo Pagliazzi
5f0cf6575c fix(settings): remove unnecessary code 2014-01-30 18:44:53 +01:00
Matteo Pagliazzi
e9fb7d0343 Merge pull request #2627 from Sinza-/subscriber 
i18n(subscriber): replace subscriber hard-coded strings for env.t
 2014-01-30 09:37:42 -08:00
Cole Gleason
a6d66f68ba Merge remote-tracking branch 'upstream/sabe/attributes' into develop 2014-01-30 11:10:09 -06:00
Sabe Jones
f6e12fa25e fix(allocateNow): Send empty object to user.ops per @colegleason suggestion 
Tested with both implemented allocation modes, looks good!
 2014-01-30 07:55:27 -06:00
Marcelo Sizer
aeb705b652 style(tavern): add space between 2 and gems 2014-01-29 17:38:32 -02:00
Cole Gleason
2b17b041ca Merge pull request #2533 from Sinza-/buy-quest 
Add information to quests on the Market before you buy them
 2014-01-28 18:49:29 -08:00
Marcelo Sizer
cd4cb0a552 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:30:05 -02:00
Matteo Pagliazzi
9226b83d84 Merge pull request #2591 from Alys/patch-2 
Market "Sell..." button: add spaces, remove bracket
 2014-01-28 10:48:54 -08:00
Matteo Pagliazzi
abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json 
Split main.json
 2014-01-28 10:25:31 -08:00
Matteo Pagliazzi
3785dad215 Merge pull request #2605 from Sinza-/split-fix 
Remove duplicated 'none' and minor adjusts
 2014-01-28 10:24:37 -08:00
Sabe Jones
76a7ab5bcc feat(attributes): Add backfill button in flat and classbased allocation modes 
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
 2014-01-28 08:57:29 -06:00
Tyler Renelle
f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Marcelo Sizer
f8bc2d7618 Remove duplicated 'none' and minor adjusts 2014-01-27 23:27:11 -02:00
Tyler Renelle
2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Marcelo Sizer
06200accad fix(translation): Fix #2585. 
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
 2014-01-27 14:21:50 -02:00
Alice Harris
a0dad56a9b Market "Sell..." button: add spaces, remove bracket 
Fix some text appearance issues:

- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".

- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see 4f07ab39b0

- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
 2014-01-27 19:27:06 +10:00
Tyler Renelle
51bff23885 fix(stable): show hatchable combo when petOwned>0 (fyi @deilann) 2014-01-26 17:46:09 -08:00
Tyler Renelle
5caaff1cea fix(beastmaster): fixes #2557, adds opacity to previously-owned pets 
after they're mounted. You can earn them back again
 2014-01-26 17:24:48 -08:00