Matteo Pagliazzi
|
2937c13f6b
|
chore(i18n): update locales
|
2015-03-29 22:30:53 +02:00 |
|
Matteo Pagliazzi
|
6e4818cf62
|
chore(i18n): update locales
|
2015-03-25 16:53:56 +01:00 |
|
Matteo Pagliazzi
|
b756e8e462
|
chore(i18n): update locales
|
2015-03-21 11:07:13 +01:00 |
|
Matteo Pagliazzi
|
fa2c44a9c7
|
chore(i18n): update locales
|
2015-03-20 17:13:53 +01:00 |
|
Matteo Pagliazzi
|
4c3e7f897e
|
chore(i18n): update locales
|
2015-03-19 20:21:04 +01:00 |
|
Matteo Pagliazzi
|
f243617ccf
|
chore(i18n): update locales
|
2015-03-18 20:01:29 +01:00 |
|
Matteo Pagliazzi
|
6d163ecb5d
|
chore(i18n): update locales
|
2015-03-18 12:13:36 +01:00 |
|
Matteo Pagliazzi
|
b0b6864f1c
|
chore(i18n): update locales
|
2015-03-16 19:56:35 +01:00 |
|
Matteo Pagliazzi
|
8bc5ed83cb
|
chore(i18n): update locales
|
2015-03-12 16:26:45 +01:00 |
|
Matteo Pagliazzi
|
14d6a59e96
|
chore(i18n): update locales
|
2015-02-23 21:53:50 +01:00 |
|
Matteo Pagliazzi
|
37433ee1aa
|
chore(i18n): update locales
|
2015-02-18 17:41:31 +01:00 |
|
Matteo Pagliazzi
|
34d8a910e3
|
chore(i18n): update locales
|
2015-02-14 17:56:11 +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
|
45d1fb4c6e
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/dist/scripts/habitrpg-shared.js
|
2015-02-09 22:18:22 -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
|
4588be29ee
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
|
2015-01-23 15:29:56 -06:00 |
|
Blade Barringer
|
c91b0cd34a
|
Moved folders into common directory
|
2015-01-21 10:34:04 -06:00 |
|