sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-31 15:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
3e40443d0f tags: try more explicit model.push 2013-05-06 17:17:24 +01:00
Tyler Renelle
d975931500 tags: add tags legend to task meta 2013-05-06 17:05:34 +01:00
Tyler Renelle
b561dcba09 tags: eff it, refresh after saving tags 2013-05-06 16:53:59 +01:00
Tyler Renelle
fa7232760c tags: use icon-pencil for editing 2013-05-06 16:43:01 +01:00
Tyler Renelle
82682e1af1 tags: cleanup, prevent bug for multiple tag-creation 2013-05-06 16:41:35 +01:00
Tyler Renelle
ccd091b622 tags: some visual cleanup of the filter bar 2013-05-06 15:59:58 +01:00
Tyler Renelle
bed0f64d47 tags: use select combobox instead of dropdown, easier code & mitigates 
some css issues
 2013-05-06 15:27:27 +01:00
Tyler Renelle
40dc8e422c new tag sets _newTag to '', reset dom, static-bound tag loop 2013-05-06 15:18:36 +01:00
Tyler Renelle
9740e79d8d reset dom on tags instead of location.reload() 2013-05-06 15:14:32 +01:00
Tyler Renelle
a3003a758d Merge branch 'tags' into develop 
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html
 2013-05-06 14:01:43 +01:00
Tyler Renelle
9737e0e2a2 settings in two panes rather than sub-tabs 2013-05-06 09:55:44 +01:00
Tyler Renelle
0cf18483ff chat functions better with just some padding rather than hight & 
line-height (see multi-line chats with the large line-height)
 2013-05-05 23:34:14 +01:00
Tyler Renelle
ed1f3acded full username test in chat (_user.profile.name only part of the 
equation), and min-height: 60px - was getting stacked longtext issue
 2013-05-05 23:29:10 +01:00
Tyler Renelle
06be572220 Merge remote-tracking branch 'switz/chat' into develop 
Conflicts:
	src/app/helpers.coffee
 2013-05-05 23:17:17 +01:00
Tyler Renelle
b0b90f686c add back in model.id(), modified lefnire/racer#habitrpg model.id() instead 2013-05-05 23:04:09 +01:00
Tyler Renelle
b4b0733e21 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-05 22:04:28 +01:00
Tyler Renelle
d055f68c5b temporary fix to #891, model.id() isn't working for some reason. 
Provide custom `helpers.uuid()` function until I can figure this out
 2013-05-05 22:03:26 +01:00
Daniel Saewitz
669cdb35b6 Cleanup model code 2013-05-05 13:47:50 -04:00
Daniel Saewitz
3526cd6f72 Keep relative times updated every 60 seconds 2013-05-05 13:44:24 -04:00
Daniel Saewitz
c1c2f025ad Merge develop and add functionality to party chat 2013-05-05 13:07:36 -04:00
Stan Lindsey
671f843d30 csv export script 2013-05-05 17:00:59 +01:00
Tyler Renelle
9b1bcb8367 dynamic pets, fix #897 2013-05-05 13:54:32 +01:00
Daniel Saewitz
68a932d5ab Remove timestamp 2013-05-04 15:00:26 -04:00
Daniel Saewitz
c8ddd39577 Add relative dates to chat 2013-05-04 14:56:21 -04:00
Daniel Saewitz
66dbc3f258 Highlight username in tavernchat 2013-05-04 13:15:47 -04:00
Tyler Renelle
7ebe611078 adjust achievement view logic for previous commit 2013-05-04 16:41:07 +01:00
Tyler Renelle
0f1ec096ef add backer.contributor & backer.npc for tavern & party chat 2013-05-04 16:03:03 +01:00
Tyler Renelle
c8e4386b4b add backer, npc, and contributor achievements (still need to run 
database migrations for them)
 2013-05-04 14:24:37 +01:00
Tyler Renelle
3a259ae1c7 preparation for backer-gear setting by restricting sets to user.backer 2013-05-04 14:10:38 +01:00
Tyler Renelle
b468f052fd remove "+ undefined" for (-)habit. Workaround, need to find why 
stats.gp is being set from (-)habit at all
 2013-05-04 12:10:34 +01:00
Tyler Renelle
54ef864458 wording update 2013-05-04 11:45:51 +01:00
Tyler Renelle
5232589678 bailey alert for streaks 2013-05-04 11:35:11 +01:00
Tyler Renelle
0b48c1ab25 minimum of 1 silver streak bonus 2013-05-04 11:26:26 +01:00
Tyler Renelle
fb9ca0af71 was adding accidental extra % point 2013-05-04 11:04:30 +01:00
Tyler Renelle
3444449048 small chance 2013-05-04 10:44:06 +01:00
Tyler Renelle
7d22602b9a some streaks cleanup. set taskObj.streak AFTER model.set() so that we 
get before/after values in listeners. Take away streak achievement if
they went 21, undo to 20
 2013-05-04 10:35:30 +01:00
Tyler Renelle
de810cc722 show streakBonus in gpModifier 2013-05-04 10:11:06 +01:00
Tyler Renelle
c389588965 woops, chanceMultiplier should be delta, not 1 2013-05-04 09:42:46 +01:00
Tyler Renelle
381fb48c03 emit the streak bonus so we can display the growl notification. I'm 
not sure I like this approach, because (1) we can't set growl order,
streak bonus comes first, and (2) I want to keep model-aware code to a
minimum so we can weed out the mem leak
 2013-05-04 09:41:11 +01:00
Tyler Renelle
5b6cf5c039 remove the minimum of 1% drop-chance, now that we have streaks in 2013-05-04 09:38:10 +01:00
Tyler Renelle
4584433506 Merge branch 'master' into develop 2013-05-04 08:56:59 +01:00
Tyler Renelle
60b6c8a400 fix missing username bug 2013-05-04 08:56:44 +01:00
Tyler Renelle
dd8935ec63 put popover back in for main herobox #890 2013-05-04 08:11:01 +01:00
Tyler Renelle
55957ca72d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-03 23:38:28 +01:00
Daniel Saewitz
2a03d033d8 Merge pull request #887 from switz/chat 
@lefnire => Send chat message on enter and disallow empty messages
 2013-05-03 15:29:52 -07:00
Daniel Saewitz
63495a647b Send chat message on enter and disallow empty messages 2013-05-03 14:59:37 -04:00
Tyler Renelle
bcb2505a96 add streak GP bonus & drop bonus (separately handled) 2013-05-03 18:51:47 +01:00
Tyler Renelle
c9aa04439d begin implementing streaks 2013-05-03 18:20:28 +01:00
Tyler Renelle
df59817f64 add bailey notification for achievements 2013-05-03 16:39:11 +01:00
Tyler Renelle
5a5d8ec2da add migration for current users with ultimate gear 2013-05-03 16:31:16 +01:00