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

98 Commits

Author SHA1 Message Date
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 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 5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -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 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 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 37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -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
Tyler Renelle db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle 83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07: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
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
Sabe Jones 450e154948 On further thought, "Equipment" is better than "Gear." Also fixed a typo. 2013-11-17 10:01:27 -06:00
Sabe Jones 6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Tyler Renelle 95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link 
replace github contributing links → wikia link
 2013-11-13 23:26:19 -08:00
Adrien Lemaire 340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11: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 085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Tyler Renelle 20cac379cf pretty up our bailey notifs 2013-11-08 20:05:12 -08:00
Tyler Renelle f868bcae66 contrib: more enticing bailey announcement 2013-11-08 19:42:13 -08:00
Tyler Renelle 14be0b11c6 contrib: add bailey announcement 2013-11-08 19:28:07 -08:00
Tyler Renelle c0d36f13ef contrib: links to wikia in tavern & popup 2013-11-08 19:28:07 -08:00
Tyler Renelle 5f9d3991ac [#1766] remove "trigger next day" option 2013-11-08 13:54:29 -08:00
Matteo Pagliazzi 3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting 2013-11-08 22:33:48 +01:00
Tyler Renelle 7c94b4b6d3 contrib: add contributor achievement modal 2013-11-07 13:42:29 -08:00
Tyler Renelle 7fe4f31a16 contrib: show profile._id in modal so admins can assign contrib status 2013-11-07 13:05:34 -08:00
Tyler Renelle 962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle 188db745fc allow users to trigger "missed day" manually from Restore modal 2013-11-05 17:43:43 -08:00
Tyler Renelle 74e4ef0414 add bailey for challenges 2013-11-01 17:18:14 -07:00
Tyler Renelle 931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
Tyler Renelle 219318b405 challenges: remove username(), since we're now using user.profile.name 2013-10-28 18:20:21 -07:00
Matteo Pagliazzi a5af52a275 correctly award ultimategear achievement 2013-10-27 12:11:59 +01:00
Tyler Renelle ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Matteo Pagliazzi 20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Tyler Renelle 5c4c4ae252 typo in donate page 2013-10-22 20:55:55 -07:00
Tyler Renelle b90aadf7ab update bailey notif 2013-10-22 16:52:54 -07:00
Tyler Renelle 2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle b3853800a3 remove Ultra Mega Update (since we've been live for a long time). Add 
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
 2013-10-22 16:28:13 -07:00
Tyler Renelle b55cb1ccdb bailey update for skin tones, 0.0.10, selling drops. @lemoness this is 
the new format (jade), hit me offline for a tour
 2013-10-20 00:13:50 -07:00
Tyler Renelle 109d46b2ca paypal: fix to #1615 , explicitly set rm variable to avoid POST / on 
paypal redirect
 2013-10-13 16:05:18 -07:00