 Blade Barringer
|
f0e3360c35
|
chore(i18n): update locales
|
2015-08-14 17:52:37 -05:00 |
|
|
Blade Barringer
|
3f941c3534
|
chore(i18n): update locales
|
2015-08-12 22:37:52 -05:00 |
|
|
Blade Barringer
|
60f92a8997
|
chore(i18n): update locales
|
2015-08-11 20:02:59 -05:00 |
|
|
Blade Barringer
|
6861f1460a
|
chore(i18n): update locales
|
2015-08-11 18:50:51 -05:00 |
|
|
Blade Barringer
|
4bdb2a8b84
|
chore(i18n): update locales
|
2015-08-06 08:50:06 -05:00 |
|
|
Blade Barringer
|
cf507df375
|
chore(i18n): update locales
|
2015-08-06 07:38:20 -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
|
f6480faf22
|
chore(i18n): update locales
|
2015-07-03 10:49:35 +02:00 |
|
|
Matteo Pagliazzi
|
782ae4f81c
|
chore(i18n): update locales
|
2015-06-23 10:43:29 +02:00 |
|
|
Matteo Pagliazzi
|
61db64e963
|
chore(i18n): update locales
|
2015-04-03 13:28:45 +02:00 |
|
|
Matteo Pagliazzi
|
695b00b6bb
|
chore(i18n): update locales
|
2015-03-26 17:14:28 -04:00 |
|
|
Matteo Pagliazzi
|
b756e8e462
|
chore(i18n): update locales
|
2015-03-21 11:07:13 +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 |
|