fc11e8bf8a
Merge pull request #103 from Rathlan/issue-2472-MakeHelpAvailable
...
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 15:04:00 -08:00
aad621ef63
Merge pull request #104 from luveluen/develop
...
Update main.json
2014-01-19 13:15:06 -08:00
2d8f8d1e08
Update main.json
...
minor bugfixes:
"showtourpop1"
"showtour2"
imageurl"
2014-01-19 21:44:12 +01:00
76c6e719cc
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 22:25:43 +02:00
4a933d597e
Merge pull request #102 from luveluen/develop
...
Update main.json
2014-01-19 10:50:05 -08:00
859ef6bbed
Update main.json
2014-01-19 19:45:29 +01:00
9ec0150a75
Update main.json
2014-01-19 19:40:29 +01:00
adf70541ba
Update main.json
2014-01-19 19:10:39 +01:00
2ae7d1dede
Merge pull request #86 from HabitRPG/sabe/preferences
...
Finish up @wc8 suggested user preferences
2014-01-19 06:40:34 -08:00
ffb77e45ed
grunt browserify
2014-01-18 22:11:52 -06:00
83d56cd88f
Merge pull request #96 from Alys/patch-1
...
stop wasting Stealth on todos and completed dailies
2014-01-18 20:10:42 -08:00
841399b981
stop wasting Stealth on todos and completed dailies
...
If I understand the code correctly, the stealth buff was being decremented regardless of task type and completion status. This change causes stealth to be used up only for dailies that have not been completed.
2014-01-19 11:53:38 +10:00
6c6978ab4f
Some beautification of nav menu dropdown options
2014-01-18 10:23:20 -06:00
06113f46e3
grunt browserify
2014-01-17 23:32:08 -07:00
dcd56aae2c
Merge pull request #93 from deilann/patch-1
...
Update content.coffee to change "Cloth Armor" to "Plain Clothing"
2014-01-17 21:59:30 -08:00
eca6524cad
Merge pull request #94 from colegleason/perfect-day
...
fix(perfect-day): do not count non-active dailies when calculating perfect-day
2014-01-17 21:22:54 -08:00
aafaee92e7
fix(perfect-day): do not count non-active dailies when calculating perfect-day
...
When we calculate the perfect-day achievement, we should check to see if
the daily had repeat set for yesterday as well as if it was completed.
Fixes HabitRPG/habitrpg#2446
2014-01-17 23:20:21 -06:00
b2efa6d0da
Update content.coffee to change "Cloth Armor"
...
Changes Cloth Armor to "Plain Clothing" for better consistency and sprite representation.
2014-01-16 18:18:44 -08:00
cc6e0a9c7b
tests(perfect-day) remove buffs from cron-matrix stuff for now
2014-01-15 18:01:44 -07:00
18ccbb51df
Merge remote-tracking branch 'colegleason/drops' into develop
...
Conflicts:
dist/habitrpg-shared.js
2014-01-15 17:40:07 -07:00
5dac20d9e8
Merge remote-tracking branch 'colegleason/checklist-mp' into develop
...
Conflicts:
dist/habitrpg-shared.js
2014-01-15 16:52:13 -07:00
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
966151ebcc
fix some translations
2014-01-15 16:53:52 +01:00
c967c1c21d
Generate new browser code
2014-01-15 00:13:52 -06:00
c4e7e13ee1
remove console.log from MP calculation
2014-01-15 00:13:25 -06:00
98e0c5213e
Don't give n+1 MP for a todo with n checklist items
2014-01-15 00:13:25 -06:00
2f51041bf4
fix randomVal to be actually random. Fixes habitrpg/habitrpg#2176
2014-01-14 21:54:54 -06:00
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
d822cdc9eb
update wording on auto-clear completed to-dos
2014-01-14 17:32:05 -07:00
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
e4d1451756
Merge pull request #92 from Sinza-/develop
...
Replace old strings on stats.jade
2014-01-14 11:20:19 -08:00
cb4d43cda5
Replace old strings on stats.jade
2014-01-14 17:05:26 -02:00
e6b0fbe381
move markdown directive out of main site into shared (so mobile can use it)
2014-01-14 11:11:14 -07:00
156af130df
add some strings
2014-01-14 18:54:17 +01:00
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
c9ddf0e15d
Fix typos
2014-01-11 17:54:50 -03:00
bbddb5f87d
Added test for valid spell targets
2014-01-11 17:29:25 -03:00
9b01ea5072
grunt
2014-01-09 20:49:12 -07:00
840f0baf0f
Merge pull request #88 from speg/patch-1
...
Typo
2014-01-09 15:47:38 -08:00
4f467caa1a
Typo
...
Fixes https://github.com/HabitRPG/habitrpg/issues/2330
2014-01-09 18:04:48 -05:00
cfd475a7c7
grunt
2014-01-09 11:27:54 -07:00
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
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
3bd81abda3
startOfDay: if between midnight and custom day start, jump back to previous day
2014-01-08 22:30:56 -06:00
8c7b27cca0
Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed
2014-01-08 22:21:32 -06:00
87aa1ab731
Revert " #85 i heart lodash"
...
This reverts commit 8097dc38d1
2014-01-08 18:55:46 -07:00
8097dc38d1
#85 i heart lodash
2014-01-08 18:49:13 -07:00
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
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
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
Tyler Renelle