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

8584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
9dfd96b84f Moved and configured config.json to be in root of directory 2015-02-13 09:24:16 -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
Tyler Renelle
a8cb0fd4e9 Merge pull request #4663 from HabitRPG/common-convert 
HabitRPG-Shared Migration
 2015-02-12 20:09:43 -07: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
36dc1b42aa Compiled files 2015-02-12 15:24:02 -06:00
Blade Barringer
1714b8b004 Added halloween sprites 2015-02-12 15:15:43 -06:00
Blade Barringer
51b90afb34 Compiled everything 2015-02-12 13:49:34 -06:00
Blade Barringer
ba473598fa Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:44:50 -06:00
Blade Barringer
4764d6d416 Mv images to correct place 2015-02-12 13:44:28 -06:00
Blade Barringer
d58cfb5687 Added images back in from develop 2015-02-12 13:43:39 -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
477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer
df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Matteo Pagliazzi
89e73954ae item store -> market in bailey 2015-02-12 20:03:04 +01:00
Matteo Pagliazzi
ddf09e9c40 chore(i18n): update locales 2015-02-12 19:31:06 +01:00
Matteo Pagliazzi
f255f56820 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2015-02-12 19:29:46 +01:00
Matteo Pagliazzi
84dd6ec310 Merge pull request #466 from SabreCat/valentines 
Valentine's Day
 2015-02-12 19:29:26 +01:00
Matteo Pagliazzi
de4e0606dc Merge pull request #4672 from SabreCat/valentines 
Valentine's Day
 2015-02-12 19:29:20 +01:00
Matteo Pagliazzi
b3463c83f8 chore(i18n): update locales 2015-02-12 19:27:58 +01: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
a6a0282c82 Corrected common image paths 2015-02-12 12:05:38 -06:00
Blade Barringer
85817b2b4e Corrected path to habitrpg logo 2015-02-12 11:50:55 -06:00
Sabe Jones
e28651f645 chore(grunt): grunt full 2015-02-12 07:54:34 -06:00
Sabe Jones
de21ec8cf5 fix(event): Card notif display 2015-02-12 07:52:52 -06:00
Sabe Jones
37ae50a77a fix(event): Correct card notifs 2015-02-12 07:45:47 -06:00
Sabe Jones
4bdace64fc feat(event): Card notifs 2015-02-12 07:39:42 -06:00
Sabe Jones
a5052b1f51 feat(event): Card notifs 2015-02-12 07:39:10 -06:00
Sabe Jones
dd1809cd78 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into valentines 2015-02-12 07:24:01 -06:00
Sabe Jones
894b3bf15e Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into valentines 2015-02-12 07:21:18 -06:00
Blade Barringer
9f6d74b2bd Removed compile sprites from prod build step 2015-02-11 16:15:28 -06:00
Blade Barringer
be59a676c5 Moved somg devdependencies to production 2015-02-11 15:36:25 -06:00
Sabe Jones
9a44ab76ec fix(event): Line breakage II 2015-02-10 20:56:46 -06:00
Sabe Jones
281e3fdbb5 fix(event): Line breakage II 2015-02-10 20:56:19 -06:00
Sabe Jones
358b421330 fix(event): Line breakage 2015-02-10 20:51:49 -06:00
Sabe Jones
9fddb08aeb fix(event): Localize poems 2015-02-10 20:47:40 -06:00
Sabe Jones
432eee750f fix(event): Valentine's strings 2015-02-10 20:46:31 -06:00
Sabe Jones
8fb84a0410 feat(event): Valentine's cards 2015-02-10 20:30:47 -06:00
Sabe Jones
6a6a4a0e57 feat(event): Valentine's cards 2015-02-10 20:30:20 -06:00
Blade Barringer
85bf2aced8 Wrote task to minify and concatenate spritesheet styles 2015-02-10 17:12:17 -06:00
Blade Barringer
6e82557df8 Put bower install first in postinall, since Grunt copies files from it 2015-02-10 16:51:48 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
Blade Barringer
bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer
feae63051f Checked out develop's src 2015-02-10 16:03:59 -06:00
Blade Barringer
e243887563 Deleted website/src 2015-02-10 16:03:11 -06:00
Matteo Pagliazzi
9c6fc78a2f invite friend to guild: pass guild name 2015-02-10 22:07:36 +01:00
Matteo Pagliazzi
be27646143 correctly fetch group.type 2015-02-10 21:53:26 +01:00