Commit graph

25741 commits

Author SHA1 Message Date
Matteo Pagliazzi
110986951b fix #1647 2013-10-27 10:18:23 +01:00
Shane Lister
d2af7a442a Add Contributor Only Pet Choice
This PR https://github.com/HabitRPG/habitrpg-shared/pull/33 should completed before this one.
2013-10-26 19:56:18 -07:00
Shaners
8fed3f5c5a Add contributor-only pet - Hydra 2013-10-26 18:17:44 -07:00
Matteo Pagliazzi
d336c65633 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-26 18:16:38 +02:00
Matteo Pagliazzi
6b23530caa fix typo 2013-10-26 18:16:16 +02:00
Tyler Renelle
49cce86e60 Merge pull request #32 from Shaners/rewrite
Fix for female red hair missing pixels
2013-10-25 10:32:15 -07:00
Shaners
32101e5ffc Fix for female red hair missing pixels 2013-10-24 23:35:11 -07:00
Tyler Renelle
5d14a1811f Merge pull request #1637 from ozymandiasthegreat/manual-due-date
Manual due date
2013-10-24 12:45:42 -07:00
Matteo Pagliazzi
29f5eb5293 remove self from group after sending invite, fix #1509 2013-10-24 21:38:25 +02:00
Tyler Renelle
04048e9768 [#30] grunt 2013-10-24 12:12:13 -07:00
Tyler Renelle
0f621fe00b Merge pull request #30 from HabitRPG/paglias/reeset-lastdrop
Reset lastDrop to zero when day ends
2013-10-24 12:05:38 -07:00
Tyler Renelle
ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Tyler Renelle
e84b1975a9 add hair to customizer options & run grunt 2013-10-24 10:56:15 -07:00
Tyler Renelle
c15ab8d413 Merge pull request #31 from Shaners/rewrite
New Red Hair Option
2013-10-24 10:10:37 -07:00
Tyler Renelle
c7c8338316 Merge pull request #1642 from Shaners/develop
Adds red hair option for web.
2013-10-24 10:10:27 -07:00
Matteo Pagliazzi
1f8915f5de add api.deleteTag to batch update operations 2013-10-24 18:21:34 +02:00
Matteo Pagliazzi
211433858c correctly remove tag from task 2013-10-24 17:50:35 +02:00
Matteo Pagliazzi
715e4e42a5 remove console.log 2013-10-24 17:50:24 +02:00
Matteo Pagliazzi
3a45e72138 fix group chat syncing 2013-10-24 14:44:08 +02:00
Shaners
5fa398780f Adds red hair option for web. 2013-10-24 00:03:09 -07:00
Shaners
212a4206c6 Added red hair option. Fixed a few minor pixel grid alignment issues 2013-10-23 23:50:11 -07:00
J. Ozymandias Fallick
22b429242f Merge remote-tracking branch 'upstream/develop' into manual-due-date 2013-10-23 14:34:36 -04:00
Tyler Renelle
b23ce8426b fix to editing profile: "TypeError: Cannot call method 'toString' of undefined" 2013-10-23 10:25:43 -07:00
Matteo Pagliazzi
fe52731393 fix small error on startup 2013-10-23 18:49:14 +02:00
Matteo Pagliazzi
79e0d5cba2 upgrade browseridy to 2.34.x and grunt build 2013-10-23 18:25:41 +02:00
Matteo Pagliazzi
9285a3e44b add streak achievements 2013-10-23 18:01:35 +02:00
Matteo Pagliazzi
20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Matteo Pagliazzi
f56b76b5ae Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-23 16:38:37 +02:00
Matteo Pagliazzi
0c7ba32c6b fix #1635 2013-10-23 16:38:05 +02:00
Tyler Renelle
9397c13960 add an "oh-shit" backtrack migration 2013-10-22 20:56:13 -07:00
Tyler Renelle
5c4c4ae252 typo in donate page 2013-10-22 20:55:55 -07:00
Tyler Renelle
619a15b316 gem icon for unlock-set as well 2013-10-22 19:33:55 -07:00
Tyler Renelle
2ca7b27503 add inline for gems 2013-10-22 19:23:27 -07:00
Tyler Renelle
077850b172 halloween: explicit gems instead of 'G' 2013-10-22 19:22:32 -07:00
Tyler Renelle
44cb797063 migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean 2013-10-22 18:50:50 -07:00
Tyler Renelle
c40697761b halloween: fix to transient skin set 2013-10-22 18:16:23 -07:00
Tyler Renelle
f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle
e7886e00b4 halloween: highlght limited skins, add description about limited, rename
to "rainbow" and "spooky" @lemoness
2013-10-22 17:56:46 -07:00
Tyler Renelle
b90aadf7ab update bailey notif 2013-10-22 16:52:54 -07:00
Tyler Renelle
2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle
b3853800a3 remove Ultra Mega Update (since we've been live for a long time). Add
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
2013-10-22 16:28:13 -07:00
Tyler Renelle
a1959a9beb halloween: use halloween npcs habitrpg-shared@0ffd265 2013-10-22 16:20:37 -07:00
Tyler Renelle
0ffd26509c halloween: add halloween NPCs (thanks to @lemoness) 2013-10-22 16:20:18 -07:00
Tyler Renelle
534a761875 remove customizer css, moved to habitrg-shared@06e489d 2013-10-22 16:19:54 -07:00
Tyler Renelle
06e489dfc5 halloween: consolidate customizer button css. was duplicated bw mobile &
web, copy into habitrpg-shared, remove from those projects, remove regex
css selectors (they weren't working), add crazy & monster skins
2013-10-22 16:05:20 -07:00
Tyler Renelle
9c06537e50 halloween: fix pixel adjustments on male & female sprites' arms 2013-10-22 15:01:23 -07:00
Tyler Renelle
b36e9a51c1 halloween: male_sprites give monster & pumpkin ears & head-cap (they got
copied over from female without modification @lemoness)
2013-10-22 14:52:49 -07:00
Tyler Renelle
ec50c7d0ec halloween fix to 401 error 2013-10-22 14:46:58 -07:00
Tyler Renelle
f9c2fce4aa halloween: male sprites 2013-10-22 14:46:44 -07:00
Tyler Renelle
2c1d8e1688 halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe) 2013-10-22 14:32:51 -07:00