sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9714 commits 3 branches 0 tags 1.6 GiB
Commit graph

494 commits

Author SHA1 Message Date
Blade Barringer
28c648bb0b Compiled sprites for new backgrounds 2015-02-13 16:22:28 -06:00
Blade Barringer
235cf8cc24 Added new backgrounds 2015-02-13 16:20:49 -06:00
Blade Barringer
368d1b9941 Added instruction about compiling sprites 2015-02-12 21:58:44 -06:00
Blade Barringer
e605acffbe Corrected paths or nodemonignore 2015-02-12 21:45:37 -06:00
Blade Barringer
cb7f382a85 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
 2015-02-12 15:40:12 -06:00
Blade Barringer
51b90afb34 Compiled everything 2015-02-12 13:49:34 -06:00
Blade Barringer
4764d6d416 Mv images to correct place 2015-02-12 13:44:28 -06:00
Blade Barringer
7ec403a828 Remvoeding common/img folder to relink from shared 2015-02-12 13:42:39 -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
df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer
a6b786a8e5 Compiled sprite css 2015-02-12 12:13:23 -06:00
Blade Barringer
3c60e7e079 Corrected paths to common folders in css 2015-02-12 12:10:19 -06:00
Blade Barringer
85bf2aced8 Wrote task to minify and concatenate spritesheet styles 2015-02-10 17:12:17 -06:00
Blade Barringer
557ccc7ec0 Added sprites build to build:prod task 2015-02-09 23:07:28 -06:00
Blade Barringer
4b8b7bc87d Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-09 22:40:15 -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
fe6579937c Editted common readme 2015-02-09 19:06:13 -06:00
Blade Barringer
c8124f28ed Set it so compiled js and sprites are not ignored 2015-02-09 16:04:25 -06:00
Blade Barringer
28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Blade Barringer
5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer
aba56bd174 Moved hair files to correct location 2015-02-04 10:33:25 -06:00
Blade Barringer
5cf46f9f4a Corrected path for coverage 2015-02-04 10:26:54 -06:00
Blade Barringer
286e894e2f Removed package json from common 2015-02-04 10:21:23 -06:00
Blade Barringer
0329f156e9 added watch tasks 2015-02-03 22:07:35 -06:00
Blade Barringer
0f62845fb2 Moved tests into main test folder and corrected path to common files 2015-02-03 21:29:05 -06:00
Blade Barringer
9342e8095a REmoved unused favicon 2015-02-03 21:26:12 -06:00
Blade Barringer
632019c798 REmoved unused compiled file 2015-02-03 21:25:28 -06:00
Blade Barringer
01ab05ea35 Removed license 2015-02-03 21:25:20 -06:00
Blade Barringer
32dc8e112e Removed unused grunt file from common 2015-02-03 21:22:22 -06:00
Blade Barringer
f54b28e7bf Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 21:17:52 -06:00
Blade Barringer
916de09914 Updated images in shared 2015-02-03 19:57:58 -06:00
Blade Barringer
450fdb1486 Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:29:54 -06:00
Blade Barringer
47f05f452e Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 19:26:58 -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
14e5f475ab Moved config back 2015-02-03 16:58:03 -06:00
Blade Barringer
393d614c7f Moved scirpts back in place 2015-02-03 16:56:50 -06:00
Blade Barringer
3e5663bebf Removed files 2015-02-03 16:17:03 -06:00
Blade Barringer
380dab7ae9 Moved audio out of common public folder 2015-02-03 14:04:53 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00
Blade Barringer
5a61f30138 Removed test sprite files 2015-02-02 18:27:39 -06:00
Blade Barringer
f5f1964249 Started organizing common folder 2015-02-01 23:09:07 -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