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
Matteo Pagliazzi
2bc0286d36 fix(json) 2014-01-23 15:48:01 +01:00
Matteo Pagliazzi
64c1e74afb Merge pull request #111 from luveluen/develop 
Update main.json
 2014-01-23 06:36:11 -08:00
Luveluen
b3d2793e76 Update main.json 2014-01-23 10:29:06 +01:00
Sabe Jones
667a4264c5 docs(rebirth): Bullet point to reassure users that they can get their limited ed gear back after Rebirth 2014-01-22 20:41:43 -06:00
Sabe Jones
02311e8500 fix(translations): Remove more spurious NBSPs from English translation 2014-01-22 20:32:12 -06:00
Dušan Juretić
432ab0dc66 Test quests valid values 2014-01-22 22:40:12 -03:00
Matteo Pagliazzi
a46e1273ae improve(translation): merge @Sinza- pr 2014-01-22 19:42:50 +01:00
Marcelo Sizer
b648bf7b6b Add missing strings 2014-01-22 16:21:57 -02:00
Marcelo Sizer
7ebfb28b78 Add strings for views/shared/modals folder 2014-01-22 16:01:03 -02:00
Matteo Pagliazzi
28bc3382d5 Revert "improve(translations): add translations for achievement modals" 
This reverts commit c7f07e3522.
 2014-01-22 17:34:32 +01:00
Matteo Pagliazzi
c7f07e3522 improve(translations): add translations for achievement modals 2014-01-22 17:08:47 +01:00
Matteo Pagliazzi
7f7d0cfdf1 Merge pull request #107 from luveluen/develop 
Update main.json
 2014-01-22 06:35:23 -08:00
Luveluen
73d89dae07 Update main.json 2014-01-22 12:07:34 +01:00
Sabe Jones
af2bfa3efe fix(locales): Remove spurious nbsp from English locale settings page 2014-01-21 19:41:51 -06:00
Tyler Renelle
0aa2f44693 chore(css): mounts consolidation 2014-01-21 17:00:32 -08:00
Tyler Renelle
56cc5db9b7 fix(quests): don't drop canBuy:false items 2014-01-21 14:49:56 -08:00
Tyler Renelle
2ee93763fc feat(quests): add the gryphon quest, mount, pet, egg. For the glory of @baconsaur! 2014-01-21 14:41:07 -08:00
Tyler Renelle
965e57ed2f chore(grunt): grunt with @sabrecat's mount=>spritesmith, + my multi-drops 2014-01-21 13:32:46 -08:00
Tyler Renelle
8c5e5e0a3a Merge pull request #109 from HabitRPG/sabe/tweak 
move mounts to spritesmith system
 2014-01-21 13:31:24 -08:00
Tyler Renelle
051c3c89c8 feat(quests): allow quests to drop multiple items 2014-01-21 13:12:58 -08:00
Michael Crouch
3f981602e9 Fix typo in description of constitution. 2014-01-21 09:14:36 -05:00
Luveluen
6d3a1718fa Update main.json 2014-01-20 20:02:04 +01:00
Matteo Pagliazzi
bc986ba45a fix(translations) 2014-01-20 17:51:02 +01:00
Sabe Jones
cfa386683e refactor(sprites): remove deprecated Mount-SpriteSheet.png and strip down Mounts.css 
This commit removes the old mounts spritesheet, and removes all manually created mount CSS from Mounts.css, leaving only the 18px top margin used to position mounts in the herobox.
 2014-01-19 22:04:21 -06:00
Tyler Renelle
cb7e654c48 refactor(sprites): grunt spritesmith for @sabrecat's e44c84bef9 2014-01-19 17:48:06 -08:00
Sabe Jones
e44c84bef9 refactor(sprites): create individual sprites from mounts spritesheet 
Previously, Mounts lived on a separate spritesheet from all other site graphics, and the CSS for their individual elements was manually generated. This commit doesn't change that setup yet, but creates the individual image files needed to compile mount sprites into the site master spritesheet using grunt-spritesmith. (The task won't run on my machine, so someone else needs to execute that step!)
 2014-01-19 19:14:32 -06:00
Tyler Renelle
587a660ac1 fix(todos): add dateCompleted to todos so they're archived 3 days after completion, not 3 days after creation. fixes https://github.com/HabitRPG/habitrpg/issues/2478 2014-01-19 17:11:19 -08:00
Tyler Renelle
77b2e5400f Merge pull request #100 from HabitRPG/sabe/fix 
fix(calculateDelta): don't detrain stats on ripening To-Dos
 2014-01-19 15:18:05 -08:00
Tyler Renelle
21ea62b918 Merge pull request #101 from HabitRPG/sabe/fix2 
fix(checklists): Make checklist To-Do behavior more intuitive
 2014-01-19 15:16:04 -08:00
Tyler Renelle
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
Matteo Pagliazzi
aad621ef63 Merge pull request #104 from luveluen/develop 
Update main.json
 2014-01-19 13:15:06 -08:00
Luveluen
2d8f8d1e08 Update main.json 
minor bugfixes: 
"showtourpop1" 
"showtour2" 
imageurl"
 2014-01-19 21:44:12 +01:00
Paul Sainsbury
76c6e719cc Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ 2014-01-19 22:25:43 +02:00
Matteo Pagliazzi
4a933d597e Merge pull request #102 from luveluen/develop 
Update main.json
 2014-01-19 10:50:05 -08:00
Luveluen
859ef6bbed Update main.json 2014-01-19 19:45:29 +01:00
Luveluen
9ec0150a75 Update main.json 2014-01-19 19:40:29 +01:00
Luveluen
adf70541ba Update main.json 2014-01-19 19:10:39 +01:00
Sabe Jones
a770d0c72f fix(checklists): Make checklist To-Do behavior more intuitive 
Previously, all To-Do scoring was multiplied by the length of the checklist, including cron "reddening" and ultimate scoring. The checkboxes themselves only affected MP bonuses. Now, checklist tasks redden at the same rate as any other task, and the score multiplier only applies to checklist items that have actually been accomplished when the user concludes the overall To-Do.

Fixes HabitRPG/habitrpg#2327, HabitRPG/habitrpg#2405, and HabitRPG/habitrpg#2483.
 2014-01-19 10:36:04 -06:00
Sabe Jones
70394ea0b9 fix(autoAllocate): don't detrain stats on ripening To-Dos 
Previously, on cron, the reddening of To-Dos would subtract from the stat training for task-based auto-allocation. This had a tendency to cause users with lots of active tasks to get backward stat allocations on levelup. Now the "down" direction for To-Dos is not counted for attribute training. (Missed Dailies will still detrain.)

Fixes HabitRPG/habitrpg/#2247
 2014-01-19 09:36:23 -06:00
Sabe Jones
2ae7d1dede Merge pull request #86 from HabitRPG/sabe/preferences 
Finish up @wc8 suggested user preferences
 2014-01-19 06:40:34 -08:00
Cole Gleason
ffb77e45ed grunt browserify 2014-01-18 22:11:52 -06:00
Cole Gleason
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
Alice Harris
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
Sabe Jones
6c6978ab4f Some beautification of nav menu dropdown options 2014-01-18 10:23:20 -06:00
Tyler Renelle
06113f46e3 grunt browserify 2014-01-17 23:32:08 -07:00
Cole Gleason
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
Tyler Renelle
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
Cole Gleason
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
deilann
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
Tyler Renelle
cc6e0a9c7b tests(perfect-day) remove buffs from cron-matrix stuff for now 2014-01-15 18:01:44 -07:00