Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,708 Commits 64 Branches 1,256 Tags
847f090b7ae39655e27bb620fffe61a3910f292a
Commit Graph

198 Commits

Author SHA1 Message Date
Tyler Renelle 108d852d12 remove reroll from tasks/lists.jade 2013-12-08 19:04:18 -07:00
Tyler Renelle 76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Tyler Renelle c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle 4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Tyler Renelle f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle 680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -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 8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle 5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle 80e97a71ed classes: misc fixes 2013-12-05 09:52:41 -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 5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) 2013-12-04 17:50:40 -07:00
Tyler Renelle 88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -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 350e3681d7 classes: grunt-spritesmith fixes 2013-12-03 18:51:19 -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
Sabe Jones dab22ec051 Small formatting fix to Advanced Options 2013-12-02 11:10:58 -06:00
Sabe Jones 37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones 45b87288f0 Change "reroll" to "Fortify" in Gems popover text 2013-12-01 15:03:03 -06:00
Sabe Jones af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Tyler Renelle 91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Nick Gordon 62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Tyler Renelle 7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle 962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Nick Gordon 86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Nick Gordon 15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi d1240473dd use bindonce for days of the week, thanks @snicker! 2013-11-25 17:38:07 +01:00
Matteo Pagliazzi a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work 2013-11-25 17:30:35 +01:00
Sabe Jones 780b0a3593 Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
Tyler Renelle 83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire 47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle 33c2c1db2d Merge pull request #1888 from HabitRPG/sabe_tweak 
Fix matters of colons
 2013-11-23 14:45:45 -08:00
Tyler Renelle c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00
Nick Gordon 4453ac9fb8 removed comments from testing. 2013-11-23 11:14:16 -08:00
Nick Gordon 52145a479e testing completed, committing test results in comments 2013-11-23 10:55:56 -08:00
Nick Gordon 40de2f3bf0 manual testing of bindonce commencing -____- 2013-11-23 09:26:39 -08:00
Matteo Pagliazzi df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Sabe Jones 0d6f3dd5e6 Make number format consistent between current exp and exp TNL (fix #1827) 2013-11-23 09:46:28 -06:00
Adrien Lemaire d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Sabe Jones 983df5c97c Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. 2013-11-23 06:54:00 -06:00
Nick Gordon 90582c3709 more bindonce rollbacks... bo-if seems to work sometimes, othertimes not 2013-11-22 22:57:41 -08:00
Nick Gordon dfb09b1f9b Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal 2013-11-22 15:59:53 -08:00
Nick Gordon b431336463 more optimizations with bindonce, replacing ngIf with boIf. 
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
 2013-11-22 15:16:24 -08:00