sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4349 commits 3 branches 0 tags 1.6 GiB
Commit graph

467 commits

Author SHA1 Message Date
deilann
d581986dd9 changing order of stats in character build 2014-02-01 13:14:51 -08: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
Tyler Renelle
62af638e8a Merge pull request #2570 from deilann/patch-1 
removed stray paren in profile.jade
 2014-01-26 12:41:06 -08:00
Marcelo Sizer
c09d89f872 Fix version conflict 2014-01-26 17:39:36 -02:00
Marcelo Sizer
8d41c44ad7 Fix version conflict 2014-01-26 17:37:54 -02:00
Marcelo Sizer
8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Matteo Pagliazzi
4274090205 fix(translations): fix #2564 and similar ones 2014-01-26 14:48:38 +01:00
deilann
2c0f5fc5d0 removed stray paren 
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
 2014-01-25 13:17:01 -08:00
Cole Gleason
2a91cee0ff Merge branch 'round-boss' into develop 2014-01-25 13:22:49 -06:00
Cole Gleason
1412570484 revert(party): Round boss health up instead of to nearest integer 
This reverts commit 626da5681f.

Fixes #2563.
 2014-01-25 13:22:24 -06:00
Dušan Juretić
70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Marcelo Sizer
17c63cdc6e Replace string for env.t 2014-01-24 20:26:33 -02:00
Matteo Pagliazzi
2eb7ea5e91 Merge pull request #2550 from HabitRPG/paglias/translations-refactoring 
Refactor translations
 2014-01-24 13:53:46 -08:00
Matteo Pagliazzi
5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Cole Gleason
0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-01-24 15:29:17 -06:00
Cole Gleason
626da5681f fix(party): Round boss health up instead of to nearest integer 
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.

Fixes #2504.
 2014-01-24 15:27:30 -06:00
Matteo Pagliazzi
d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00
Marcelo Sizer
ed71522131 Fix version conflict 2014-01-24 07:28:30 -02:00
Marcelo Sizer
d3d970b87f Make locked quests purchasable 2014-01-23 23:11:30 -02:00
Marcelo Sizer
fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Marcelo Sizer
9e6a9a3d0e Don't show information if the quest is locked 2014-01-23 18:26:55 -02:00
Marcelo Sizer
6c68c51ab5 Fix version conflict 2014-01-23 17:26:37 -02:00
Marcelo Sizer
b2d5e2a090 Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest 2014-01-23 15:53:42 -02:00
Matteo Pagliazzi
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Luveluen
6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen
669789df67 Update index.jade 2014-01-23 09:45:34 +01:00
Luveluen
50f992b63c Update hall.jade 2014-01-23 09:43:17 +01:00
Luveluen
ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen
ed180692e3 Update create-group.jade 2014-01-23 09:36:32 +01:00
Luveluen
6fb88ee1b5 Update chat-message.jade 2014-01-23 09:35:18 +01:00
Luveluen
34fe364fea Update chat-box.jade 2014-01-23 09:33:41 +01:00