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
8403 commits 3 branches 0 tags 1.6 GiB
Commit graph

8403 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
remmz0r
7a08ff360f possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 13:36:12 +08:00
remmz0r
feb1e01c4d Fixed original user code in achievements.jade 2015-02-17 10:48:27 +08:00
Sabe Jones
a2772e843c Merge pull request #4697 from SabreCat/valentines 
End Valentine's event
 2015-02-16 18:42:06 -06:00
Sabe Jones
e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
6d26d3e053 Added original user achievement badge 2015-02-16 17:55:18 -06:00
Blade Barringer
0858b871ff Closes #4693 2015-02-16 16:04:51 -06:00
Blade Barringer
16140089b0 Compiled sprites for bunny quest 2015-02-15 21:08:14 -06:00
Blade Barringer
c23f83c5ac Added new files for bunny quest 2015-02-15 21:05:03 -06:00
Blade Barringer
db97c74033 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-02-14 18:19:21 -06:00
Blade Barringer
60b73af22e Removed gulp and some duplicate dependencies 2015-02-14 18:19:06 -06:00
Matteo Pagliazzi
34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
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
5d35d7dc86 Merge pull request #4680 from crookedneighbor/config-grunt 
Config grunt
 2015-02-13 10:21:05 -06:00
Blade Barringer
84ce4bb5d8 Corrected path to config.json 2015-02-13 09:45:18 -06:00
Blade Barringer
7cf8745375 Corrected gruntfile to use process.env.NODE_ENV 2015-02-13 09:43:28 -06:00
Blade Barringer
ca50c31bc0 Adjusted grunt command so it behaves differently on production and 
development
 2015-02-13 09:31:56 -06:00
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