Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,422 Commits 64 Branches 1,256 Tags
0d395295eb98a3d6f072a6a83b4ddc77b3cda93f
Commit Graph

8422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 0d395295eb Merge branch 'archery' into develop 2015-02-17 15:27:19 -06:00
Blade Barringer 78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Blade Barringer caaf5c6704 Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 15:13:42 -06:00
Bryce Wojtowicz 3a86435655 fixes #4670 
edited groups.json (again)
sorry last edit
!!!
 2015-02-18 05:08:02 +08:00
Bryce Wojtowicz 9f49626156 fixes #4670 
edit: fixed the linkLFG so it included the entire Guild name
 2015-02-18 05:06:13 +08:00
Bryce Wojtowicz 33520fc64d Fixed groups.json 
fixes #4702

Cheers
 2015-02-18 05:03:34 +08:00
Blade Barringer 44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
Blade Barringer 6a910637eb Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 10:45:43 -06:00
remmz0r 2e98185c5d fixes #4670 
removed target="_blank" from archery link
 2015-02-18 00:03:37 +08:00
remmy poos cfabb12b04 fixes #4670 
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
 2015-02-17 23:52:48 +08:00
Blade Barringer d4397a5403 Merge branch 'develop' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 09:41:06 -06:00
Blade Barringer a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
remmy poos b2aa9f399f fixes #4670 
changes Archery links to guild in tavern
 2015-02-17 22:40:18 +08:00
remmy poos 1746ec4518 fixes nothing (breaks everything) 2015-02-17 22:37:42 +08:00
remmy poos 56c7d9ff9a couldn't figure out how to push two unedited files so this is an edit so i can repush correct files 2015-02-17 22:34:59 +08:00
remmy poos 263d136993 fixes #4696 
sorry, a billion things to learn about git
this code -should- work
tested locally
 2015-02-17 22:17:01 +08:00
remmy poos a3aaa0370d Merge branch 'develop' of https://github.com/remmz0r/habitrpg into develop 
Conflicts:
	website/views/shared/profiles/achievements.jade
 2015-02-17 22:03:58 +08:00
remmz0r f6e549caf0 fixes #4696 
original user badge not showing
veteran badge also showing now
 2015-02-17 21:58:32 +08:00
remmy poos 2ef3848a09 Fixes issue #4670 
find/replaced archery links with new guild
 2015-02-17 21:39:24 +08:00
remmz0r 02744e0c17 possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 14:17:08 +08: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