804cced3ff
chore(various): News and sprites
...
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
4f6f0220ad
fix(mounts): Readjusted lion
2015-06-04 11:02:58 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
5cf6127382
fix(mounts): Reposition mounts
...
Changes the remaining mounts revised by Kiwibot re: #4449 .
2015-06-01 18:37:01 -05:00
3de9aed2c4
fix(sprites): Recanvas wolf mounts
...
See #4449
2015-06-01 12:33:13 -05:00
d76ca1c04d
feat(mystery): Programmatic presents
...
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
2015-06-01 12:06:35 -05:00
5127814f9e
chore(grunt): compile sprites
2015-05-29 15:19:51 -05:00
615c3f18a5
Adjust gruntfile regex and recompile
2015-05-26 22:19:45 -05:00
958068c2b0
Rebased to resolve merge conflicts
2015-05-26 00:19:35 -04:00
ed25cffaf7
chore(grunt): compile sprites
2015-05-25 21:10:37 -05:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
2b8414766b
chore(grunt): compile sprites
2015-05-13 11:19:33 -05:00
040e6e0a41
chore(grunt):compile sprites
2015-05-06 19:53:08 -05:00
cad47dc2c0
Fixes #5123
2015-05-02 09:28:55 -05:00
74877f0653
chore(grunt): compile sprites
2015-05-01 19:22:09 -05:00
286eed95a2
chore(grunt): compile sprites
2015-04-21 21:34:39 -05:00
55324e8fa5
chore(grunt): compile sprites
2015-04-15 18:56:51 -05:00
c19ec1387a
chore(grunt): compile sprites
2015-04-14 22:18:37 -05:00
ab2390e8c9
Updated fotify potion art
2015-04-09 09:15:32 -05:00
a24383c1a2
Removed lingering shared file
2015-04-08 13:58:45 -05:00
0f9ce179df
Merge branch 'develop' into Alys-ignore-compiled-js-2015-04-04
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-04-08 13:57:49 -05:00
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
9d3a14b734
chore(grunt): compile sprites
2015-04-07 19:08:00 -05:00
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
e134c36ca2
prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then)
2015-04-05 09:04:59 +10:00
a02c957c59
ignore habitrpg-shared.js (add to .gitignore, delete from repo)
2015-04-04 13:53:36 +10:00
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
ad15351ce0
chore(grunt): compile sprites
2015-04-01 23:48:09 -05:00
bed404cf47
chore(flowers): COMPILE FLOWERS
...
Required root access.
2015-03-31 19:01:04 -05:00
15c72b2ea8
chore(grunt): compile sprites
2015-03-29 16:44:50 -05:00
ed0caee149
remove test code
2015-03-28 05:42:00 +10:00
7a220bee47
update Egg Hunt quest completion message with new content from Leslie
2015-03-28 05:37:42 +10:00
0638e36492
feat(analytics): new "play" variants
2015-03-27 12:52:38 -06:00
ca87a46b04
Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement
2015-03-26 18:30:56 -04:00
334393d33b
Make Key to the Kennels free for Triad Bingoers.
...
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
achievement in lieu of gems.
* Removed Gem cost on inventory page if user has achievement.
* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
achievement.
* Removed Gem costs from buttons if user has achievement.
* Added new copy for Key to the Kennels modal that omits gem prices if the user
has the achievement.
2015-03-26 18:30:56 -04:00
bfebf5d917
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-03-26 17:13:43 -04:00
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
20726e3c0f
Merge pull request #4873 from gisikw/repair_broken_test_suite
...
Repair Broken Test Suite - Full Passing Tests
2015-03-26 14:49:28 +10:00
75ab7427fc
chore(grunt): Eggy eggy sprites
2015-03-25 22:12:55 -05:00
488cd8852b
move invites to quest to batch mode
2015-03-25 18:11:21 +01:00
f41933b7a1
Repair Broken Test Suite - Full Passing Tests
...
* Repair broken e2e test introduced in 8d03cfc
2015-03-24 21:39:03 -04:00
560d51b2e2
feat(tour): esc force closes, but puts justin head in toolbar. clicking
...
justin head brings tour back.
2015-03-24 15:41:44 -06:00
58db06c515
chore(grunt): Compile
2015-03-20 15:53:42 -05:00
84a77695ea
feat(ads): remove ads completely
2015-03-19 11:39:17 -06:00
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
833ba9ec4a
change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness
2015-03-18 19:13:39 +10:00
c47606c5b2
remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment
2015-03-17 07:49:37 +10:00
b0b6864f1c
chore(i18n): update locales
2015-03-16 19:56:35 +01:00
Sabe Jones