 Blade Barringer
|
23f1dd59c5
|
Converted shared to common for controllers
|
2015-01-25 15:26:37 -06:00 |
|
|
Blade Barringer
|
6472e04bd0
|
Changed shared to common for payments
|
2015-01-25 15:22:04 -06:00 |
|
|
Blade Barringer
|
af4f51857b
|
Changed models to use common instead of shared
|
2015-01-25 15:10:15 -06:00 |
|
|
Blade Barringer
|
c5c0125c49
|
Converted routes to use common instead of habitrpg-shared
|
2015-01-25 15:08:03 -06:00 |
|
|
Blade Barringer
|
1290581f39
|
Converted some files to use common instead of habitrpg-shared
|
2015-01-25 15:05:15 -06:00 |
|
|
Blade Barringer
|
001d5560b3
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-01-25 14:58:20 -06:00 |
|
|
Alice Harris
|
9ab86b536f
|
adjusted comments
|
2015-01-24 16:46:18 +10:00 |
|
|
Alice Harris
|
a95522e165
|
create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795
|
2015-01-24 16:16:05 +10:00 |
|
|
Blade Barringer
|
dfb43af003
|
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
|
2015-01-23 15:30:28 -06:00 |
|
|
Blade Barringer
|
4588be29ee
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
|
2015-01-23 15:29:56 -06:00 |
|
|
Blade Barringer
|
72bc1cf40c
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
|
2015-01-23 15:29:36 -06:00 |
|
|
Blade Barringer
|
318dd506af
|
Added watts theme string
|
2015-01-23 15:29:00 -06:00 |
|
|
Matteo Pagliazzi
|
e8f6091764
|
chore(i118n): update locales
|
2015-01-23 21:01:24 +01:00 |
|
|
Sabe Jones
|
ec114d6a3e
|
chore(news): Victory Bailey
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
|
2015-01-23 10:20:50 -06:00 |
|
|
Blade Barringer
|
042f2fbceb
|
Merge pull request #4498 from crookedneighbor/see-mp
See mp on stats page
|
2015-01-22 11:57:15 -06:00 |
|
|
Blade Barringer
|
37c7bd8df1
|
Removed shared form package and bower
|
2015-01-21 11:00:27 -06:00 |
|
|
Blade Barringer
|
db5082e0d7
|
Added shared dependencies to package.json
|
2015-01-21 10:41:08 -06:00 |
|
|
Blade Barringer
|
590eded44a
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
.gitignore
.travis.yml
|
2015-01-21 10:37:08 -06:00 |
|
|
Blade Barringer
|
c91b0cd34a
|
Moved folders into common directory
|
2015-01-21 10:34:04 -06:00 |
|
|
Sabe Jones
|
9d7fc1efbb
|
chore(news): Stress Strike 3 Bailey
|
2015-01-21 10:17:19 -06:00 |
|
|
Blade Barringer
|
5c8450ba1a
|
Corrected triad bingo achievement for users that already had it
|
2015-01-20 19:26:29 -06:00 |
|
|
Blade Barringer
|
32ed4dace7
|
Fixed triad bingo achievement not being awarded to people who already
had it
|
2015-01-20 19:24:46 -06:00 |
|
|
Blade Barringer
|
5246257f62
|
Merge pull request #4550 from HabitRPG/bailey-20150120
Bailey 20150120 & Mount Master
|
2015-01-20 17:06:14 -06:00 |
|
|
Blade Barringer
|
76373ed816
|
Merge pull request #447 from HabitRPG/bailey-20150120
Bailey 20150120 & Mount Master
|
2015-01-20 17:06:02 -06:00 |
|
|
Blade Barringer
|
c73fb9eb31
|
Added in missing p tag
|
2015-01-20 16:44:49 -06:00 |
|
|
Blade Barringer
|
d4ab70b174
|
Removed errant comma
|
2015-01-20 16:41:36 -06:00 |
|
|
Blade Barringer
|
e95b238041
|
Gave credit to badge creators
|
2015-01-20 16:33:18 -06:00 |
|
|
Blade Barringer
|
cc65ea1346
|
Lemoness removed from items she didn't work on
|
2015-01-20 16:32:30 -06:00 |
|
|
Blade Barringer
|
de1c0240f6
|
Restored changelog
|
2015-01-20 16:22:29 -06:00 |
|
|
Blade Barringer
|
b0bb3adf53
|
removed quest line text
|
2015-01-20 16:09:43 -06:00 |
|
|
Blade Barringer
|
7842bbe22e
|
Added stressbeast strike news
|
2015-01-20 15:58:00 -06:00 |
|
|
Blade Barringer
|
ebd5bbd19b
|
Added new info to Bailey announcement
|
2015-01-20 14:37:17 -06:00 |
|
|
Matteo Pagliazzi
|
925bfe8af4
|
fix(emails): parse json
|
2015-01-20 20:59:43 +01:00 |
|
|
Matteo Pagliazzi
|
9d22e65e19
|
fix(flags-emails): allow arrays in FLAG_REPORT_EMAIL
|
2015-01-20 18:33:49 +01:00 |
|
|
Matteo Pagliazzi
|
065227fa8c
|
fix(flags-emails): allow arrays in tnxEmails
|
2015-01-20 18:29:46 +01:00 |
|
|
negue
|
cb566a9679
|
Merge pull request #441 from negue/markdown
markdown timeoutTime attribute
|
2015-01-20 17:57:23 +01:00 |
|
|
Blade Barringer
|
cc6cb3785e
|
Merge branch 'mountmaster' into bailey-20150120
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
|
2015-01-20 10:39:45 -06:00 |
|
|
Blade Barringer
|
07fec4a205
|
Merge branch 'mountmaster' into bailey-20150120
|
2015-01-20 10:30:40 -06:00 |
|
|
Sabe Jones
|
f0d4135d54
|
Merge pull request #4546 from SabreCat/stressbeast
World boss desperation move
|
2015-01-19 23:17:32 -06:00 |
|
|
Sabe Jones
|
6a6a4e5924
|
Merge pull request #446 from SabreCat/stressbeast
World boss desperation move
|
2015-01-19 23:17:26 -06:00 |
|
|
Sabe Jones
|
da2d59734c
|
fix(world-boss): simplify desperation stats
|
2015-01-19 23:00:00 -06:00 |
|
|
Sabe Jones
|
0137dd7209
|
fix(world-boss): Need markModified
|
2015-01-19 22:36:10 -06:00 |
|
|
Sabe Jones
|
0a0a3f78cf
|
fix(world-boss): Desperation logic
|
2015-01-19 22:14:09 -06:00 |
|
|
Blade Barringer
|
3189ab92af
|
Wrote error message for when trying to send gems to self from balance
|
2015-01-19 22:13:21 -06:00 |
|
|
Sabe Jones
|
3ee965d8d2
|
feat(world-boss): Desperation move
|
2015-01-19 21:48:58 -06:00 |
|
|
Sabe Jones
|
7925935ff5
|
feat(world-boss): Desperation move
|
2015-01-19 21:47:27 -06:00 |
|
|
Blade Barringer
|
42e1020c60
|
Added back in showCompleted=false to display tags
|
2015-01-19 18:50:54 -06:00 |
|
|
Tyler Renelle
|
899de5fc25
|
grunt
|
2015-01-19 16:14:21 -07:00 |
|
|
Blade Barringer
|
c3c144223a
|
Merge branch 'develop' into mountmaster
|
2015-01-19 14:47:17 -06:00 |
|
|
Matteo Pagliazzi
|
b26d5ee732
|
Merge pull request #4540 from crookedneighbor/add-ngsanitize
Added ng-sanitize
|
2015-01-19 21:37:43 +01:00 |
|