Matteo Pagliazzi
|
662c8cd529
|
chore(i18n): update locales
|
2015-04-19 13:28:21 +02:00 |
|
Matteo Pagliazzi
|
820909dd9b
|
chore(i18n): update locales
|
2015-04-08 19:15:03 +02:00 |
|
Matteo Pagliazzi
|
f243617ccf
|
chore(i18n): update locales
|
2015-03-18 20:01:29 +01: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 |
|