Commit graph

251 commits

Author SHA1 Message Date
Tyler Renelle
06113f46e3 grunt browserify 2014-01-17 23:32:08 -07:00
Tyler Renelle
18ccbb51df Merge remote-tracking branch 'colegleason/drops' into develop
Conflicts:
	dist/habitrpg-shared.js
2014-01-15 17:40:07 -07:00
Tyler Renelle
5dac20d9e8 Merge remote-tracking branch 'colegleason/checklist-mp' into develop
Conflicts:
	dist/habitrpg-shared.js
2014-01-15 16:52:13 -07:00
Tyler Renelle
8df7fe65c5 feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if
you perform a perfect day of dailies, you get an achievement PLUS lvl/2
buff to all stats for the next day
2014-01-15 16:26:47 -07:00
Cole Gleason
c967c1c21d Generate new browser code 2014-01-15 00:13:52 -06:00
Cole Gleason
2f51041bf4 fix randomVal to be actually random. Fixes habitrpg/habitrpg#2176 2014-01-14 21:54:54 -06:00
Tyler Renelle
3e290b4734 Revert auto-clearing completed to-dos, instead we'll hide stale completeds from our angular app 2014-01-14 17:59:35 -07:00
Tyler Renelle
d3a076a405 give all tasks a creation date. When to-dos are completed, if they're
sitting in "completed" section for more than 3 days, delete them on
cron. @sabrecat @paglias @colegleason @wc8 heads up. this should help
with the performance issues people are experiencing when they don't know
to clear completeds, but let me know if this you think this is a bad
idea. @wizonesolutions sorry for the delay ;)
2014-01-14 16:49:52 -07:00
Tyler Renelle
9b01ea5072 grunt 2014-01-09 20:49:12 -07:00
Tyler Renelle
cfd475a7c7 grunt 2014-01-09 11:27:54 -07:00
Tyler Renelle
87aa1ab731 Revert "#85 i heart lodash"
This reverts commit 8097dc38d1.
2014-01-08 18:55:46 -07:00
Tyler Renelle
8097dc38d1 #85 i heart lodash 2014-01-08 18:49:13 -07:00
Sabe Jones
a89ef25e23 Rebirth fix: flip owned items to explicit false instead of wiping them out, so limited edition gear can be repurchased 2014-01-08 19:35:54 -06:00
Tyler Renelle
60641524cf Merge pull request #82 from HabitRPG/sabe/preferences
New user preference: open new tasks in edit mode
2014-01-08 14:31:29 -08:00
Tyler Renelle
221574bcb2 #83 ski-sassin offhand pole should match 2nd-best regular offhand 2014-01-08 09:38:24 -07:00
Sabe Jones
7732f4af32 New user preference: open new tasks in edit mode 2014-01-07 20:16:35 -06:00
Tyler Renelle
84637ad336 fix https://github.com/HabitRPG/habitrpg/issues/2276 provide
newly-created tags with an id from the browser
2014-01-07 17:23:47 -07:00
Tyler Renelle
398a919afb Merge pull request #79 from HabitRPG/sabe/fix
Server side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock
2014-01-07 11:55:52 -08:00
Tyler Renelle
939ce14185 https://github.com/HabitRPG/habitrpg/issues/2010 allow wrapping members (don't add ops to them) 2014-01-07 10:43:00 -07:00
Sabe Jones
9d9cf0788f Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:04:50 -06:00
Tyler Renelle
0157afb6b3 spritesmith: try using spritesmith-{TIMESTAMP}.png for image
cache-busting (@paglias good idea)
2014-01-06 22:57:35 -07:00
Tyler Renelle
eff279be5b spritesmith: reposition healer tiaras 2014-01-06 22:28:18 -07:00
Sabe Jones
d2542b05ca Rebirth fix: force Costume preference off so avatar will display new gear prior to Market unlock 2014-01-06 21:30:47 -06:00
Tyler Renelle
2635db9e51 winter: weapons should be 2nd best, not 1st. Some refactoring 2014-01-06 18:24:31 -07:00
Tyler Renelle
4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle
c01d5d79d6 event-items: try a different approach than "unbreakable" (1335750). If they've owned it before (item==false), then they canOwn() again. In those cases, set item to 'event' 2014-01-06 17:13:44 -07:00
Tyler Renelle
1335750804 add unbreakable special items, so we can add special-event gear which users can buy during a certain period of time, but which they can't lose on death. Starting with party-hats 2014-01-06 14:15:21 -07:00
Sabe Jones
cd38cc9fb8 Merge pull request #75 from HabitRPG/sabe/tweak2
Rebirth fixes: deequip pets and mounts, allow stacking at max level
2014-01-05 15:33:02 -08:00
Sabe Jones
d7fd82039f Fix assignment operator bug 2014-01-05 17:31:08 -06:00
Tyler Renelle
63034a587b grunt 2014-01-05 16:17:46 -07:00
Sabe Jones
319689afea Rebirth fixes: deequip pets and mounts, allow stacking at max level 2014-01-05 10:17:18 -06:00
Sabe Jones
ceb7bc20bf Add some value to high Mana pools 2014-01-05 09:14:21 -06:00
Tyler Renelle
2d8dd47414 autoAllocate: more code compactifying (for fun) 2014-01-04 18:11:13 -07:00
Tyler Renelle
2721800f37 autoAllocate: compactify some code (no reason, just for the ninja
feel). Add simulation script to show results for all auto-allocate
methods for levels 1-20
2014-01-04 17:16:45 -07:00
Tyler Renelle
f4f6dcebdc Merge remote-tracking branch 'origin/sabe/attributes' into develop 2014-01-04 15:58:16 -07:00
Tyler Renelle
20376d69c0 don't hide completed todos from challenge progress modals 2014-01-03 14:42:18 -07:00
Tyler Renelle
81ca8d15b5 bring @JasonGross changes back in. Jason, updates should go to
script/content.coffee (dist/habitrpg-shared.js is a compiled file and
gets clobbered)
2014-01-03 14:18:35 -07:00
Tyler Renelle
b0666cb1e3 challenges: don't remove challenge todos on clear-completed 2014-01-03 14:17:02 -07:00
Tyler Renelle
0e6f352e70 Merge pull request #71 from JasonGross/greener->bluer
Tasks get blue when you do them often, and the text for Pickpocket should reflect this
2014-01-02 20:20:11 -08:00
Tyler Renelle
1803bdb2ed fix https://github.com/HabitRPG/habitrpg/issues/2073 2014-01-02 21:09:26 -07:00
Jason Gross
3fbb454886 Tasks get blue when you do them often, not green.
I believe the sequence is red -> yellow -> green -> blue.  The text for 'Pickpocket' now reflects this slightly better, I believe.
2014-01-02 21:25:58 -05:00
Tyler Renelle
93201b5d39 back to normal winter npc sprites 2014-01-02 16:35:49 -07:00
Tyler Renelle
24b99617e6 grunt 2014-01-02 16:31:23 -07:00
Sabe Jones
3df4724999 Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:37 -06:00
Tyler Renelle
b76b275a7c winter: party hat fix, big snowball in inventory (@lemoness). Still
small one in spells list, those are 32x22. I say we just leave it
2013-12-31 08:54:26 -07:00
Tyler Renelle
0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) 2013-12-31 08:47:10 -07:00
Tyler Renelle
549fd7bac0 new year's eve event: party hat, new NPCs 2013-12-31 08:44:01 -07:00
Sabe Jones
4662fe151b Implement "training" over the course of a level, for task-based attribute allocation 2013-12-31 09:05:03 -06:00
Tyler Renelle
19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2013-12-31 07:56:35 -07:00
Sabe Jones
c4a82d4edd Daily derp! Don't return PER when STR is suggested 2013-12-30 23:09:47 -06:00