Blade Barringer
|
71473a93ad
|
chore(i18n): update locales
|
2015-11-17 21:38:32 -06:00 |
|
Blade Barringer
|
54c5741fca
|
chore(i18n): update locales
|
2015-10-01 22:44:53 -05:00 |
|
Blade Barringer
|
cbea9f4200
|
chore(i18n): update locales
|
2015-08-29 07:38:54 -05:00 |
|
Blade Barringer
|
4bdb2a8b84
|
chore(i18n): update locales
|
2015-08-06 08:50:06 -05:00 |
|
Blade Barringer
|
4598d3d445
|
chore(i18n): update locales
|
2015-07-31 09:05:58 -05:00 |
|
Blade Barringer
|
09070a71b5
|
chore(i18n): update locales
|
2015-07-31 09:00:26 -05:00 |
|
Blade Barringer
|
b565b04a69
|
chore(i18n): update locales
|
2015-07-31 08:48:30 -05:00 |
|
Blade Barringer
|
a7de79a496
|
chore(i18n): update locales
|
2015-07-31 08:28:21 -05:00 |
|
Blade Barringer
|
a888a120d9
|
chore(i18n): update locales
|
2015-07-30 23:25:04 -05:00 |
|
Blade Barringer
|
25fc92d59e
|
chore(i18n): update locales
|
2015-07-30 22:49:22 -05:00 |
|
Matteo Pagliazzi
|
d6547682be
|
chore(i18n): update locales
|
2015-05-17 15:54:18 +02:00 |
|
Matteo Pagliazzi
|
b639896ae6
|
chore(i18n): update locales
|
2015-05-13 19:47:59 +02:00 |
|
Matteo Pagliazzi
|
85b547196e
|
chore(i18n): update locales
|
2015-02-28 18:23:17 +01:00 |
|
Matteo Pagliazzi
|
14d6a59e96
|
chore(i18n): update locales
|
2015-02-23 21:53:50 +01: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
|
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 |
|