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

654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
18ccbb51df Merge remote-tracking branch 'colegleason/drops' into develop 
Conflicts:
	dist/habitrpg-shared.js
 2014-01-15 17:40:07 -07:00
Tyler Renelle
5dac20d9e8 Merge remote-tracking branch 'colegleason/checklist-mp' into develop 
Conflicts:
	dist/habitrpg-shared.js
 2014-01-15 16:52:13 -07:00
Tyler Renelle
8df7fe65c5 feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if 
you perform a perfect day of dailies, you get an achievement PLUS lvl/2
buff to all stats for the next day
 2014-01-15 16:26:47 -07:00
Matteo Pagliazzi
966151ebcc fix some translations 2014-01-15 16:53:52 +01:00
Cole Gleason
c967c1c21d Generate new browser code 2014-01-15 00:13:52 -06:00
Cole Gleason
c4e7e13ee1 remove console.log from MP calculation 2014-01-15 00:13:25 -06:00
Cole Gleason
98e0c5213e Don't give n+1 MP for a todo with n checklist items 2014-01-15 00:13:25 -06:00
Cole Gleason
2f51041bf4 fix randomVal to be actually random. Fixes habitrpg/habitrpg#2176 2014-01-14 21:54:54 -06:00
Tyler Renelle
3e290b4734 Revert auto-clearing completed to-dos, instead we'll hide stale completeds from our angular app 2014-01-14 17:59:35 -07:00
Tyler Renelle
d822cdc9eb update wording on auto-clear completed to-dos 2014-01-14 17:32:05 -07:00
Tyler Renelle
d3a076a405 give all tasks a creation date. When to-dos are completed, if they're 
sitting in "completed" section for more than 3 days, delete them on
cron. @sabrecat @paglias @colegleason @wc8 heads up. this should help
with the performance issues people are experiencing when they don't know
to clear completeds, but let me know if this you think this is a bad
idea. @wizonesolutions sorry for the delay ;)
 2014-01-14 16:49:52 -07:00
Matteo Pagliazzi
e4d1451756 Merge pull request #92 from Sinza-/develop 
Replace old strings on stats.jade
 2014-01-14 11:20:19 -08:00
Marcelo Sizer
cb4d43cda5 Replace old strings on stats.jade 2014-01-14 17:05:26 -02:00
Tyler Renelle
e6b0fbe381 move markdown directive out of main site into shared (so mobile can use it) 2014-01-14 11:11:14 -07:00
Matteo Pagliazzi
156af130df add some strings 2014-01-14 18:54:17 +01:00
Tyler Renelle
673267fb39 Revert 393bbb1 & 3bd81ab , too many issues. We'll work on a system-based 
cron solution. @colegleason
 2014-01-13 10:45:11 -07:00
Dušan Juretić
c9ddf0e15d Fix typos 2014-01-11 17:54:50 -03:00
Dušan Juretić
bbddb5f87d Added test for valid spell targets 2014-01-11 17:29:25 -03:00
Tyler Renelle
9b01ea5072 grunt 2014-01-09 20:49:12 -07:00
snicker
840f0baf0f Merge pull request #88 from speg/patch-1 
Typo
 2014-01-09 15:47:38 -08:00
Steve
4f467caa1a Typo 
Fixes https://github.com/HabitRPG/habitrpg/issues/2330
 2014-01-09 18:04:48 -05:00
Tyler Renelle
cfd475a7c7 grunt 2014-01-09 11:27:54 -07:00
Tyler Renelle
7ef3706803 Merge pull request #84 from colegleason/wibbly-wobbly 
Custom Day Start: change condition on when we run cron
 2014-01-09 09:57:54 -08:00
Cole Gleason
393bbb1885 Modify runCron tests to use hoursAgo instead of daysAgo. 
This commit also sets hoursAgo for many of the cases and restructures
how cronMatrix is parsed so that more specific settings may override
defaults higher up on the tree.
 2014-01-08 23:42:31 -06:00
Cole Gleason
3bd81abda3 startOfDay: if between midnight and custom day start, jump back to previous day 2014-01-08 22:30:56 -06:00
Sabe Jones
8c7b27cca0 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:21:32 -06:00
Tyler Renelle
87aa1ab731 Revert "#85 i heart lodash" 
This reverts commit 8097dc38d1.
 2014-01-08 18:55:46 -07:00
Tyler Renelle
8097dc38d1 #85 i heart lodash 2014-01-08 18:49:13 -07:00
Tyler Renelle
0d36c7f6c4 Merge pull request #85 from HabitRPG/sabe/fix 
Rebirth fix: flip owned items to explicit false
 2014-01-08 17:47:16 -08:00
Sabe Jones
a89ef25e23 Rebirth fix: flip owned items to explicit false instead of wiping them out, so limited edition gear can be repurchased 2014-01-08 19:35:54 -06:00
Tyler Renelle
60641524cf Merge pull request #82 from HabitRPG/sabe/preferences 
New user preference: open new tasks in edit mode
 2014-01-08 14:31:29 -08:00
Matteo Pagliazzi
d9e8c53d9a Merge pull request #81 from Sinza-/develop 
Add save variable to main.json
 2014-01-08 10:49:32 -08:00
Tyler Renelle
221574bcb2 #83 ski-sassin offhand pole should match 2nd-best regular offhand 2014-01-08 09:38:24 -07:00
Sabe Jones
7732f4af32 New user preference: open new tasks in edit mode 2014-01-07 20:16:35 -06:00
Marcelo Sizer
81a8bdb2fc Add save variable to main.json 2014-01-07 23:01:29 -02:00
Tyler Renelle
84637ad336 fix https://github.com/HabitRPG/habitrpg/issues/2276 provide 
newly-created tags with an id from the browser
 2014-01-07 17:23:47 -07:00
Tyler Renelle
398a919afb Merge pull request #79 from HabitRPG/sabe/fix 
Server side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock
 2014-01-07 11:55:52 -08:00
Tyler Renelle
939ce14185 https://github.com/HabitRPG/habitrpg/issues/2010 allow wrapping members (don't add ops to them) 2014-01-07 10:43:00 -07:00
Sabe Jones
9d9cf0788f Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:04:50 -06:00
Tyler Renelle
0157afb6b3 spritesmith: try using spritesmith-{TIMESTAMP}.png for image 
cache-busting (@paglias good idea)
 2014-01-06 22:57:35 -07:00
Tyler Renelle
eff279be5b spritesmith: reposition healer tiaras 2014-01-06 22:28:18 -07:00
Tyler Renelle
bb7d2918d6 Merge pull request #77 from Sinza-/develop 
Add strings from views/shared/tasks and views/shared/profiles folders
 2014-01-06 20:24:12 -08:00
Tyler Renelle
3069647b92 Merge pull request #78 from HabitRPG/sabe/fix 
Rebirth fix: force Costume preference off
 2014-01-06 19:47:32 -08:00
Sabe Jones
d2542b05ca Rebirth fix: force Costume preference off so avatar will display new gear prior to Market unlock 2014-01-06 21:30:47 -06:00
Tyler Renelle
2635db9e51 winter: weapons should be 2nd best, not 1st. Some refactoring 2014-01-06 18:24:31 -07:00
Tyler Renelle
4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle
c01d5d79d6 event-items: try a different approach than "unbreakable" (1335750). If they've owned it before (item==false), then they canOwn() again. In those cases, set item to 'event' 2014-01-06 17:13:44 -07:00
Tyler Renelle
1335750804 add unbreakable special items, so we can add special-event gear which users can buy during a certain period of time, but which they can't lose on death. Starting with party-hats 2014-01-06 14:15:21 -07:00
Marcelo Sizer
2834fed8ef Add strings from views/shared/tasks and views/shared/profiles folders 2014-01-06 17:51:08 -02:00
Sabe Jones
cd38cc9fb8 Merge pull request #75 from HabitRPG/sabe/tweak2 
Rebirth fixes: deequip pets and mounts, allow stacking at max level
 2014-01-05 15:33:02 -08:00