3599eaefaf
Merge branch 'develop' into bulk-add-tasks
2015-02-17 22:32:28 -06:00
789575d6fb
Merge branch 'develop' into task-difficulty-context-classes
2015-02-17 22:31:27 -06:00
7e3429c795
Merge pull request #4708 from SabreCat/pet-rocks
...
Pet rocks
2015-02-17 20:50:36 -06:00
87b13d5fc8
chore(grunt): compile sprites
2015-02-17 20:46:40 -06:00
47f3122c2d
chore(news): Pet rocks Bailey
...
Also fixes incorrectly named golden rocks.
2015-02-17 20:39:04 -06:00
0608ac5caa
feat(quest): Pet Rocks
2015-02-17 20:02:06 -06:00
e7c7b3f081
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-02-17 15:27:27 -06:00
0d395295eb
Merge branch 'archery' into develop
2015-02-17 15:27:19 -06:00
78430b1910
Collapsed 3 strings into single string
2015-02-17 15:26:42 -06:00
caaf5c6704
Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery
2015-02-17 15:13:42 -06:00
3a86435655
fixes #4670
...
edited groups.json (again)
sorry last edit
!!!
2015-02-18 05:08:02 +08:00
9f49626156
fixes #4670
...
edit: fixed the linkLFG so it included the entire Guild name
2015-02-18 05:06:13 +08:00
33520fc64d
Fixed groups.json
...
fixes #4702
Cheers
2015-02-18 05:03:34 +08:00
6b0bad186e
Merge pull request #4706 from ojintoad/windows-vagrant-investigations-working
...
Windows vagrant investigations working
2015-02-17 14:45:29 -06:00
7042c97d5d
removing export functionality to move to its own branch
2015-02-17 14:23:55 -06:00
4563d22bf0
minor updates from code review
2015-02-17 14:05:09 -06:00
44b9ac7215
Fixed path to audio files. Closes #4704
2015-02-17 13:53:32 -06:00
d46633b089
added pet colour to feed/evolve notif
2015-02-17 12:54:34 -05:00
6a910637eb
Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery
2015-02-17 10:45:43 -06:00
2e98185c5d
fixes #4670
...
removed target="_blank" from archery link
2015-02-18 00:03:37 +08:00
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
d4397a5403
Merge branch 'develop' of https://github.com/remmz0r/habitrpg into archery
2015-02-17 09:41:06 -06:00
a5ce3f58b1
Removed original user text from veteran achievement
2015-02-17 08:42:43 -06:00
b2aa9f399f
fixes #4670
...
changes Archery links to guild in tavern
2015-02-17 22:40:18 +08:00
1746ec4518
fixes nothing (breaks everything)
2015-02-17 22:37:42 +08:00
6c85cd18a9
Adjusted style of bulk tasks
2015-02-17 08:37:26 -06:00
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
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
48e688d815
Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add
2015-02-17 08:05:36 -06:00
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
f6e549caf0
fixes #4696
...
original user badge not showing
veteran badge also showing now
2015-02-17 21:58:32 +08:00
2ef3848a09
Fixes issue #4670
...
find/replaced archery links with new guild
2015-02-17 21:39:24 +08:00
2de3a5dd55
first draft of bulk add
2015-02-17 00:25:56 -06:00
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
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
b1b478bc74
add task export functionality
2015-02-16 21:21:49 -06:00
feb1e01c4d
Fixed original user code in achievements.jade
2015-02-17 10:48:27 +08:00
a2772e843c
Merge pull request #4697 from SabreCat/valentines
...
End Valentine's event
2015-02-16 18:42:06 -06:00
e0cbeaadc5
chore(grunt): compile sprites
2015-02-16 18:31:00 -06:00
130261dacf
feat(event): End Valentine's
2015-02-16 18:15:09 -06:00
6d26d3e053
Added original user achievement badge
2015-02-16 17:55:18 -06:00
0858b871ff
Closes #4693
2015-02-16 16:04:51 -06:00
9cf4d9086b
be more explicit about priority value vs context class
2015-02-16 15:49:31 -06:00
812599cb77
add difficulty context class to task list items
2015-02-16 15:02:04 -06:00
16140089b0
Compiled sprites for bunny quest
2015-02-15 21:08:14 -06:00
c23f83c5ac
Added new files for bunny quest
2015-02-15 21:05:03 -06:00
6c9a075aae
running grunt is technically unnecessary
2015-02-15 18:17:52 -05:00
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
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
db97c74033
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-02-14 18:19:21 -06:00
Bill Parrott