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
Blade Barringer
48e688d815
Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add
2015-02-17 08:05:36 -06: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
Bill Parrott
2de3a5dd55
first draft of bulk add
2015-02-17 00:25:56 -06: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
Bill Parrott
b1b478bc74
add task export functionality
2015-02-16 21:21:49 -06: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
Bill Parrott
9cf4d9086b
be more explicit about priority value vs context class
2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77
add difficulty context class to task list items
2015-02-16 15:02:04 -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
Todd Ogin
6c9a075aae
running grunt is technically unnecessary
2015-02-15 18:17:52 -05:00
Todd Ogin
65c6d5fc9d
Restores postinstall hook to use local modules
...
Adds grunt to vagrant.sh to mimic postinstall hook
2015-02-15 12:38:48 -05:00
Todd Ogin
1c317b01b4
Removes custom bower directories
...
Updates Vagrantfile with correct symlink configuration option
Switches bower/grunt in postinstall script to use the globals
Changes phantomjs to an npm package install
adds --no-bin-link to npm install
2015-02-15 09:30:07 -05: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
