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

96 commits

Author SHA1 Message Date
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01: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
82d9233d99 feat(rainbow-hair): add rainbow hair colors 2014-02-07 10:01:31 -07: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
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
deilann
d581986dd9 changing order of stats in character build 2014-02-01 13:14:51 -08: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
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
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
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
Marcelo Sizer
f8bc2d7618 Remove duplicated 'none' and minor adjusts 2014-01-27 23:27:11 -02: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
Matteo Pagliazzi
5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Marcelo Sizer
ed71522131 Fix version conflict 2014-01-24 07:28:30 -02:00
Marcelo Sizer
fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Sabe Jones
d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Matteo Pagliazzi
a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Matteo Pagliazzi
52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Matteo Pagliazzi
fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Luveluen
87d528ce50 Update profile.jade 
fullname -> fullName
 2014-01-19 21:46:57 +01:00
Luveluen
bfebb61520 Update profile.jade 2014-01-19 21:40:41 +01:00
Luveluen
1f0d91e9c6 Update profile.jade 2014-01-19 21:04:03 +01:00
Luveluen
d87a3caae7 Update profile.jade 2014-01-19 20:50:31 +01:00
Luveluen
f748d89fdc Update profile.jade 2014-01-19 20:11:03 +01:00
Luveluen
e8647c7cbc Update profile.jade 2014-01-19 20:05:48 +01:00
Luveluen
745fdeb34f Update profile.jade 2014-01-19 19:59:35 +01:00
Luveluen
805299a34c Update profile.jade 2014-01-19 19:55:52 +01:00
Luveluen
6f19cdaf6c Update profile.jade 2014-01-19 18:27:48 +01:00
Sabe Jones
5521dd0bb1 UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off 2014-01-14 21:07:46 -06:00
Tyler Renelle
daeb846ffb profile.jade use some jade magic to compactify the code 2014-01-13 22:15:32 -07:00
Sabe Jones
0a959b5f92 More UI demystification 2014-01-07 22:56:18 -06:00
Sabe Jones
459af67fcd Fix #2277: make Automatic Allocation checkbox set "task activity" mode 2014-01-06 21:20:54 -06:00
Sabe Jones
a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Sabe Jones
d3a6191a5e Merge branch 'develop' into sabe/attributes 2013-12-30 10:25:08 -06:00
Sabe Jones
c3aed6fb28 RPG demystification, cont'd 2013-12-29 20:58:35 -06:00
Tyler Renelle
fd324fc220 classes: fix class-modal heads. Also, little class title display trick 
@sabrecat (tiny perf bonus)
 2013-12-29 12:21:56 -07:00
Sabe Jones
2f79472439 Some work on demystification of RPG elements 2013-12-29 11:04:31 -06:00
Sabe Jones
cc5a6de9cb Initial commit: add allocationMode user preference and form for choosing it 2013-12-27 09:54:48 -06:00
Tyler Renelle
f2d58e1c8e update bailey per @lemoness , update limited-edition end date 2013-12-20 18:52:32 -07:00
Tyler Renelle
6cb90093d0 winter: bailey notif, show winter colors as limited-edition 2013-12-20 11:03:43 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
e13da00a54 fix #2009 how about a compromise. change button to "change and 
reroll" (it's right next to your class name, so "change what?" should be
obvious)
 2013-12-17 09:26:15 -07:00
Tyler Renelle
3b4fca506a separate unlock for facial-hair / hair 2013-12-16 13:46:54 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00