Skip to content

Commit

Permalink
Merge branch 'develop' into delta
Browse files Browse the repository at this point in the history
  • Loading branch information
Sabe Jones committed Apr 26, 2024
2 parents 1a4590c + 3e19b8a commit 462ab79
Show file tree
Hide file tree
Showing 73 changed files with 1,069 additions and 623 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Habitica ![Build Status](https://github.com/HabitRPG/habitica/workflows/Test/badge.svg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
===============

[Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
[Habitica](https://habitica.com) is an open-source habit-building program that treats your life like a role-playing game. Level up as you succeed, lose HP as you fail, and earn money to buy weapons and armor.

**We need more programmers!** Your assistance will be greatly appreciated. The wiki pages below and the additional pages they link to will tell you how to get started on contributing code and where you can go to seek further help or ask questions:
* [Guidance for Blacksmiths](https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.
Expand Down
2 changes: 1 addition & 1 deletion habitica-images
Submodule habitica-images updated 90 files
+ achievements/achievement-cats2x.png
+ backgrounds/background_container_garden.png
+ backgrounds/background_dragons_back.png
+ backgrounds/background_forest_sunset.png
+ backgrounds/background_maypole.png
+ backgrounds/background_potters_studio.png
+ backgrounds/background_wall_flowering_vines.png
+ backgrounds/icons/icon_background_container_garden.png
+ backgrounds/icons/icon_background_dragons_back.png
+ backgrounds/icons/icon_background_forest_sunset.png
+ backgrounds/icons/icon_background_maypole.png
+ backgrounds/icons/icon_background_potters_studio.png
+ backgrounds/icons/icon_background_wall_flowering_vines.png
+ gear/armoire/broad_armor_armoire_pottersApron.png
+ gear/armoire/broad_armor_armoire_smileyShirt.png
+ gear/armoire/eyewear_armoire_roseColoredGlasses.png
+ gear/armoire/head_armoire_pottersBandana.png
+ gear/armoire/shield_armoire_happyThoughts.png
+ gear/armoire/shield_armoire_hattersPocketWatch.png
+ gear/armoire/shield_armoire_thrownVessel.png
+ gear/armoire/shop/shop_armor_armoire_pottersApron.png
+ gear/armoire/shop/shop_armor_armoire_smileyShirt.png
+ gear/armoire/shop/shop_eyewear_armoire_roseColoredGlasses.png
+ gear/armoire/shop/shop_head_armoire_pottersBandana.png
+ gear/armoire/shop/shop_shield_armoire_happyThoughts.png
+ gear/armoire/shop/shop_shield_armoire_hattersPocketWatch.png
+ gear/armoire/shop/shop_shield_armoire_thrownVessel.png
+ gear/armoire/shop/shop_weapon_armoire_optimistsClover.png
+ gear/armoire/shop/shop_weapon_armoire_pottersWheel.png
+ gear/armoire/slim_armor_armoire_pottersApron.png
+ gear/armoire/slim_armor_armoire_smileyShirt.png
+ gear/armoire/weapon_armoire_optimistsClover.png
+ gear/armoire/weapon_armoire_pottersWheel.png
+ gear/events/mystery_202404/head_mystery_202404.png
+ gear/events/mystery_202404/shop_head_mystery_202404.png
+ gear/events/mystery_202404/shop_set_mystery_202404.png
+ gear/events/mystery_202404/shop_weapon_mystery_202404.png
+ gear/events/mystery_202404/weapon_mystery_202404.png
+ gear/events/mystery_202405/back_mystery_202405.png
+ gear/events/mystery_202405/headAccessory_mystery_202405.png
+ gear/events/mystery_202405/shop_back_mystery_202405.png
+ gear/events/mystery_202405/shop_headAccessory_mystery_202405.png
+ gear/events/mystery_202405/shop_set_mystery_202405.png
+ gear/events/spring/broad_armor_special_spring2024Healer.png
+ gear/events/spring/broad_armor_special_spring2024Mage.png
+ gear/events/spring/broad_armor_special_spring2024Rogue.png
+ gear/events/spring/broad_armor_special_spring2024Warrior.png
+ gear/events/spring/head_special_spring2024Healer.png
+ gear/events/spring/head_special_spring2024Mage.png
+ gear/events/spring/head_special_spring2024Rogue.png
+ gear/events/spring/head_special_spring2024Warrior.png
+ gear/events/spring/shield_special_spring2024Healer.png
+ gear/events/spring/shield_special_spring2024Rogue.png
+ gear/events/spring/shield_special_spring2024Warrior.png
+ gear/events/spring/shop/shop_armor_special_spring2024Healer.png
+ gear/events/spring/shop/shop_armor_special_spring2024Mage.png
+ gear/events/spring/shop/shop_armor_special_spring2024Rogue.png
+ gear/events/spring/shop/shop_armor_special_spring2024Warrior.png
+ gear/events/spring/shop/shop_head_special_spring2024Healer.png
+ gear/events/spring/shop/shop_head_special_spring2024Mage.png
+ gear/events/spring/shop/shop_head_special_spring2024Rogue.png
+ gear/events/spring/shop/shop_head_special_spring2024Warrior.png
+ gear/events/spring/shop/shop_shield_special_spring2024Healer.png
+ gear/events/spring/shop/shop_shield_special_spring2024Rogue.png
+ gear/events/spring/shop/shop_shield_special_spring2024Warrior.png
+ gear/events/spring/shop/shop_weapon_special_spring2024Healer.png
+ gear/events/spring/shop/shop_weapon_special_spring2024Mage.png
+ gear/events/spring/shop/shop_weapon_special_spring2024Rogue.png
+ gear/events/spring/shop/shop_weapon_special_spring2024Warrior.png
+ gear/events/spring/slim_armor_special_spring2024Healer.png
+ gear/events/spring/slim_armor_special_spring2024Mage.png
+ gear/events/spring/slim_armor_special_spring2024Rogue.png
+ gear/events/spring/slim_armor_special_spring2024Warrior.png
+ gear/events/spring/weapon_special_spring2024Healer.png
+ gear/events/spring/weapon_special_spring2024Mage.png
+ gear/events/spring/weapon_special_spring2024Rogue.png
+ gear/events/spring/weapon_special_spring2024Warrior.png
+ quests/bosses/quest_fungi.png
+ quests/scrolls/inventory_quest_scroll_fungi.png
+ stable/pets/Pet-BearCub-Fungi.png
+ stable/pets/Pet-Cactus-Fungi.png
+ stable/pets/Pet-Dragon-Fungi.png
+ stable/pets/Pet-FlyingPig-Fungi.png
+ stable/pets/Pet-Fox-Fungi.png
+ stable/pets/Pet-LionCub-Fungi.png
+ stable/pets/Pet-PandaCub-Fungi.png
+ stable/pets/Pet-TigerCub-Fungi.png
+ stable/pets/Pet-Wolf-Fungi.png
+ stable/potions/Pet_HatchingPotion_Fungi.gif
+ stable/potions/Pet_HatchingPotion_Fungi.png
112 changes: 22 additions & 90 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "5.22.3",
"version": "5.24.1",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.22.10",
Expand All @@ -27,7 +27,7 @@
"eslint": "^8.55.0",
"eslint-config-habitrpg": "^6.2.3",
"eslint-plugin-mocha": "^5.0.0",
"express": "^4.18.2",
"express": "^4.19.2",
"express-basic-auth": "^1.2.1",
"express-validator": "^5.2.0",
"glob": "^8.1.0",
Expand Down

0 comments on commit 462ab79

Please sign in to comment.