Alice Harris
|
2f072d8e96
|
Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2
Conflicts:
common/script/index.coffee
|
2015-03-14 18:54:18 +10:00 |
|
Verabird
|
627b07ef86
|
Rebalance stealth diminishing returns again
|
2015-03-13 16:45:00 -04:00 |
|
Verabird
|
fbeb83e836
|
Rescale stealth to strengthen
|
2015-03-13 11:38:34 -04:00 |
|
Verabird
|
4a0f165af8
|
Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys
|
2015-03-13 10:53:29 -04:00 |
|
Alice Harris
|
6cf815ba22
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
Conflicts:
common/dist/scripts/habitrpg-shared.js
|
2015-03-13 20:23:28 +10:00 |
|
Tyler Renelle
|
812493fec5
|
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
|
2015-03-10 15:40:18 -06:00 |
|
Blade Barringer
|
c23730fdbf
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing
|
2015-03-06 07:47:10 -06:00 |
|
Sabe Jones
|
21fd8061cf
|
feat(backgrounds): March BGs
|
2015-03-03 21:42:15 -06:00 |
|
Sabe Jones
|
d4f8acd0ef
|
feat(mystery): February 2015
|
2015-02-24 20:15:31 -06:00 |
|
Sabe Jones
|
0608ac5caa
|
feat(quest): Pet Rocks
|
2015-02-17 20:02:06 -06:00 |
|
Blade Barringer
|
9ddb5e35fb
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/dist/sprites/habitrpg-shared.css
common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
|
2015-02-12 13:42:11 -06:00 |
|
Blade Barringer
|
6f4fbfeaeb
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/img/sprites/spritesmith/npcs/npc_ian.png
common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
|
2015-02-03 19:26:14 -06:00 |
|
Blade Barringer
|
88be8f3274
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
common/img/sprites/spritesmith/npcs/npc_justin_broken.png
common/img/sprites/spritesmith/npcs/npc_matt_broken.png
img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
img/sprites/spritesmith/npcs/npc_bailey_broken.png
img/sprites/spritesmith/npcs/npc_justin_broken.png
img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
|
2015-02-01 14:07:18 -06:00 |
|
Blade Barringer
|
c91b0cd34a
|
Moved folders into common directory
|
2015-01-21 10:34:04 -06:00 |
|