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

143 commits

Author SHA1 Message Date
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
Tyler Renelle
a1590f7f3e classes: update some classes wording 2013-12-16 13:03:33 -07:00
Tyler Renelle
8082d8ae30 add unlock set for hairs, beards, mustaches 2013-12-16 12:15:59 -07:00
Tyler Renelle
7c2e803475 classes: charge gems for class-change 2013-12-16 11:47:55 -07:00
Tyler Renelle
d1a34f570d customizations: migrate skins for more PCs, start building out migration 2013-12-14 16:12:41 -07:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of 
user.preferences.shirt
 2013-12-14 00:35:03 -07:00
Tyler Renelle
549add08ed classes: 2gems / new hair,beard,stache 2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared 
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
 2013-12-11 21:42:57 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Tyler Renelle
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 2013-12-04 15:09:56 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
e240a4404f reorganize menus 2013-11-19 11:22:41 +11:00
Adrien Lemaire
7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Adrien Lemaire
0ce0823de4 update ui to test hidable gears 2013-11-19 11:22:41 +11:00
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire
2e0d83a9cb remove broken website field from profile 
Websites can be added with markdown in the blurb field
 2013-11-12 17:31:10 +11:00
Tyler Renelle
42534b5233 [#1792] put purchased limited skins back on avatar tab 2013-11-11 08:21:29 -08:00
Tyler Renelle
cde96bf28b halloween: take down halloween skins 2013-11-11 00:27:20 -08:00
Tyler Renelle
77fee06fdb gMerge branch 'challenges' into develop 
Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade
 2013-10-29 15:38:47 -07:00
Tyler Renelle
c5671550f1 challenges: add group.memberCount and ability to specifiy field projections in GET request /api/v1/groups?type=guild&fields=name,description,chat 2013-10-28 18:20:02 -07:00
Matteo Pagliazzi
5744146ff6 port group websites 2013-10-28 21:58:38 +01:00
Tyler Renelle
35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Shaners
5fa398780f Adds red hair option for web. 2013-10-24 00:03:09 -07:00
Tyler Renelle
619a15b316 gem icon for unlock-set as well 2013-10-22 19:33:55 -07:00
Tyler Renelle
077850b172 halloween: explicit gems instead of 'G' 2013-10-22 19:22:32 -07:00
Tyler Renelle
e7886e00b4 halloween: highlght limited skins, add description about limited, rename 
to "rainbow" and "spooky" @lemoness
 2013-10-22 17:56:46 -07:00
Tyler Renelle
2c1d8e1688 halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe) 2013-10-22 14:32:51 -07:00
Tyler Renelle
6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi
68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02:00
Shane Lister
91c9e5627f Update profile.jade 
Reorder and add new skin choices.
 2013-09-26 23:23:30 -07:00
Dušan Juretić
daa06943ab fix user profile websites show/hide conditions 2013-09-16 22:59:08 -03:00
Tyler Renelle
e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to 
sanitize the content
 2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky 
once everything's in markdown
 2013-09-09 13:27:25 -04:00
Tyler Renelle
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for 
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
 2013-09-08 12:28:06 -04:00
Tyler Renelle
0b34b41bbe fix to toggle helm 2013-09-08 11:39:30 -04:00
Tyler Renelle
6efd789e6d rewrite: fix user avatar stats 2013-09-01 13:55:45 -04:00
Tyler Renelle
c9d3f6247d rewrite2 add customizations options 2013-08-27 21:54:11 -04:00