sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9172 commits 3 branches 0 tags 1.6 GiB
Commit graph

321 commits

Author SHA1 Message Date
Alys
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
Matteo Pagliazzi
9a76552072 chore(i18n): update locales 2015-04-04 12:36:55 +02:00
Alys
a02c957c59 ignore habitrpg-shared.js (add to .gitignore, delete from repo) 2015-04-04 13:53:36 +10:00
Alys
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
Tyler Renelle
6b52e00b37 Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2 
Static page redesign
 2015-04-03 13:53:59 -06:00
Alys
f432bc1f17 Merge pull request #4919 from TheHollidayInn/spells-level-with-exp 
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
 2015-04-04 00:29:41 +10:00
Alys
43fdf939cc add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop 2015-04-03 23:00:15 +10:00
Matteo Pagliazzi
61db64e963 chore(i18n): update locales 2015-04-03 13:28:45 +02:00
Alys
dcb13a3ed6 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-03 11:21:04 +10:00
Tyler Renelle
26f1d6bb39 feat(static): secondary statics reflect front. merge front.old into features 2015-04-02 17:41:38 -06:00
Sabe Jones
ad15351ce0 chore(grunt): compile sprites 2015-04-01 23:48:09 -05:00
Sabe Jones
b263ba3099 fix(seasonal): Sneaky floral 
Srsly, just don't say it.
 2015-04-01 23:19:54 -05:00
Sabe Jones
f0e7f0464c fix(seasonal): NO FLOWERS 
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
 2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Matteo Pagliazzi
6aea352309 chore(i18n): update locales 2015-04-01 18:07:14 +02:00
Sabe Jones
6e1024d8ed fix(flowers): FLOWERS ON FLOWERS 2015-03-31 20:17:01 -05:00
Sabe Jones
bed404cf47 chore(flowers): COMPILE FLOWERS 
Required root access.
 2015-03-31 19:01:04 -05:00
Sabe Jones
740ddefd76 fix(flowers): AND FIXES 2015-03-31 18:55:07 -05:00
Sabe Jones
1cc3c5539f feat(flowers): AND SLIMES 
AND BACKGROUNDS
 2015-03-31 18:41:50 -05:00
Sabe Jones
2acef4d42b feat(flowers): FLOWERS 2015-03-31 18:30:22 -05:00
Alys
5506d5a39e make Tools of the Trade weaker 2015-03-31 20:52:11 +10:00
Alys
605300fdbb make skills that buff their own stat be calculated from the unbuffed stat - affects earth, defensiveStance, valorousPresence, intimidate, toolsOfTrade, protectAura 2015-03-31 03:13:33 +10:00
TheHollidayInn
0ed3937d8f Added exp sync for Backstab 2015-03-30 11:43:06 -05:00
Sabe Jones
7d9728f2ff Merge pull request #4939 from SabreCat/spring-customize 
Spring customizations
 2015-03-29 16:52:09 -05:00
Sabe Jones
15c72b2ea8 chore(grunt): compile sprites 2015-03-29 16:44:50 -05:00
Sabe Jones
6cefe5c9e4 fix(customize): More hair 2015-03-29 16:39:48 -05:00
Matteo Pagliazzi
2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Alice Harris
1432d2a61a Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/script/content.coffee
	common/script/index.coffee
 2015-03-28 12:40:46 +10:00
Alice Harris
ed0caee149 remove test code 2015-03-28 05:42:00 +10:00
Alice Harris
7a220bee47 update Egg Hunt quest completion message with new content from Leslie 2015-03-28 05:37:42 +10:00
Tyler Renelle
0638e36492 feat(analytics): new "play" variants 2015-03-27 12:52:38 -06:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges 
Added hide and error message when a user tries to create a challenge for...
 2015-03-27 19:21:51 +10:00
Kevin Gisi
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
Kevin Gisi
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
Matteo Pagliazzi
695b00b6bb chore(i18n): update locales 2015-03-26 17:14:28 -04:00
Matteo Pagliazzi
bfebf5d917 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-03-26 17:13:43 -04:00
Tyler Renelle
e46789c303 feat(analytics): track cron count 2015-03-26 17:11:33 -04:00
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
Alys
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
Sabe Jones
75ab7427fc chore(grunt): Eggy eggy sprites 2015-03-25 22:12:55 -05:00
Sabe Jones
4f89f68797 fix(mounts): Eggy eggy basket 2015-03-25 22:10:51 -05:00
Sabe Jones
77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones
354872decb feat(March): Eggy eggy cont'd 2015-03-25 20:46:27 -05:00
Sabe Jones
b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Matteo Pagliazzi
488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Matteo Pagliazzi
6e4818cf62 chore(i18n): update locales 2015-03-25 16:53:56 +01:00
Alys
e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10:00
Kevin Gisi
f41933b7a1 Repair Broken Test Suite - Full Passing Tests 
* Repair broken e2e test introduced in 8d03cfc (copywriting change was not
  reflected in the spec)

* Updated i18n.coffee code to be more cautious (it expected the 'en' locale
  would always be available, but provides appropriate error handling as-is).

* Extended timeout duration for protractor, as registration was slightly above
  30s.

* Added karma-mocha-reporter as a dev dependency to ensure test visibility.
 2015-03-24 21:39:03 -04:00
Tyler Renelle
10ce0a622b fix(tour): updated tour steps copy 2015-03-24 18:07:40 -06:00
Tyler Renelle
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
Matteo Pagliazzi
4c3ad2f705 chore(i18n): update locales 2015-03-24 22:09:48 +01:00
Daniel Hammond
d537a7fee4 Tweaked copy on "enter a message" text for private message button popup. 
Added placeholder text for empty private message box.
 2015-03-24 00:10:44 -04:00
kholliday
e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday
9a157eea8c Added tooltip for when a task is empty 2015-03-23 19:36:37 -05:00
Daniel Hammond
d3b92a0a6c Added a tooltip to make it clear to the user to type something in! 2015-03-22 12:37:32 -04:00
Alice Harris
160b19eb70 remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately) 2015-03-22 17:50:22 +10:00
Matteo Pagliazzi
b756e8e462 chore(i18n): update locales 2015-03-21 11:07:13 +01:00
Sabe Jones
58db06c515 chore(grunt): Compile 2015-03-20 15:53:42 -05:00
Sabe Jones
f065feb6cb fix(mouse): Missing ears 2015-03-20 15:50:22 -05:00
Sabe Jones
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones
e2b1083088 fix(spring): Tweaks 2015-03-20 15:19:37 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Matteo Pagliazzi
fa2c44a9c7 chore(i18n): update locales 2015-03-20 17:13:53 +01:00
Sabe Jones
7065b400bc feat(surveys): Close out survey 2015-03-19 21:44:42 -05:00
Tyler Renelle
1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Alys
5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource 
Instant party source
 2015-03-20 06:46:38 +10:00
Tyler Renelle
152853a877 feat(tour): update habits step wording @lemoness 2015-03-19 14:28:05 -06:00
Matteo Pagliazzi
4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Alice Harris
c880c525b4 add missing closing li and ul tag, remove excess b tags to make life easier for translators 2015-03-20 00:27:54 +10:00
Matteo Pagliazzi
f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01:00
Matteo Pagliazzi
0be58eb403 fix(i18n): remove empty strings as they break transifex 2015-03-18 19:57:00 +01:00
Matteo Pagliazzi
75d1a766e5 chore(i18n): update locales 2015-03-18 19:37:26 +01:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Matteo Pagliazzi
6d163ecb5d chore(i18n): update locales 2015-03-18 12:13:36 +01:00
Alice Harris
4868a6facb replace non-ascii punctuation with ascii versions (... and ' and -) 2015-03-18 19:30:00 +10:00
Alice Harris
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
Sabe Jones
607286afa5 fix(quest): Typo 2015-03-17 21:59:08 -05:00
Sabe Jones
4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones
b118d45bb3 fix(string): Missing comma 2015-03-17 21:28:50 -05:00
Sabe Jones
4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alice Harris
fcc0b67426 updated survey badge message (Leslie made a trello card to close the survey on the 19th) 2015-03-17 14:03:25 +10:00
Alice Harris
c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Matteo Pagliazzi
b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Tyler Renelle
9d5889c428 fix(interactive-tour): remove old unused strings 2015-03-16 12:38:22 -06:00
Matteo Pagliazzi
0d42a71517 chore(i18n): update locales 2015-03-16 15:33:42 +01:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond
a46c5c0225 We shouldn't need the "refresh to see changes" now. 2015-03-15 20:52:50 -04:00
George Millo
293f41d087 %w"" syntax is native Ruby, not Rails 2015-03-15 14:48:36 +01:00
Matteo Pagliazzi
475ee0160b chore(i18n): update locales 2015-03-15 13:39:23 +01:00
Bill Parrott
45287f3e4d merge upstream and fix leveling loop 2015-03-14 21:32:27 -05:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Sabe Jones
6aedfa7209 chore(grunt): compile sprites 2015-03-14 11:18:36 -05:00
Sabe Jones
1120d334c3 feat(pie): Add pie 2015-03-14 11:11:20 -05:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop 
Added confirmation before deleting messages and moved buttons to top of ...
 2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button 
Added dequip ability per ticket: 3730
 2015-03-14 21:36:57 +10:00
Alice Harris
0ceceaac1f compile javascript 2015-03-14 19:38:58 +10:00
Alice Harris
2f072d8e96 Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2 
Conflicts:
	common/script/index.coffee
 2015-03-14 18:54:18 +10:00
Verabird
627b07ef86 Rebalance stealth diminishing returns again 2015-03-13 16:45:00 -04:00
Matteo Pagliazzi
dba7d3b522 chore(i18n): update locales 2015-03-13 18:40:11 +01:00
Verabird
fbeb83e836 Rescale stealth to strengthen 2015-03-13 11:38:34 -04:00
Verabird
180d87e9c7 removed commented out old stealth code 2015-03-13 10:53:29 -04:00
Verabird
4a0f165af8 Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys 2015-03-13 10:53:29 -04:00
Bill Parrott
df0bf3136f move max level tweaks to rebalancing branch 2015-03-13 07:48:14 -05:00
Kathryn Norris
9d92bd384c Removed popover from delete messages button. (for #4848) 2015-03-13 05:05:54 -07:00
Kathryn Norris
47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
Alice Harris
f58e7ef931 compile habitrpg-shared.js 2015-03-13 20:58:43 +10:00
Alice Harris
6cf815ba22 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-03-13 20:23:28 +10:00
Matteo Pagliazzi
8bc5ed83cb chore(i18n): update locales 2015-03-12 16:26:45 +01:00
Alice Harris
9ac0ef0202 explain when survey participants will get their badge 2015-03-12 07:34:01 +10:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Tyler Renelle
de67f44e1f Merge pull request #4713 from HabitRPG/lefnire/interactive-tour 
Interactive Tour
 2015-03-10 19:23:01 -06:00
Sabe Jones
9cfa27f089 feat(surveys): Survey achievement 
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
 2015-03-10 18:39:00 -05:00
Alice Harris
3bd0b57efa add semi-colon at end of line; remove apostrophe from comment 2015-03-11 09:29:44 +10:00
Alys
63c57cce5d Merge pull request #4785 from AAorris/develop 
Allow for client notifications to user settings
 2015-03-11 08:20:51 +10:00
Tyler Renelle
16e996c971 fix(interactive-tour): "Buy the Training Sword" 2015-03-10 15:40:19 -06:00
Tyler Renelle
63a6af6e0a fix(interactive-tour): small updates per 
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
 2015-03-10 15:40:19 -06:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Blade Barringer
9c43a7da22 chore(grunt compile:sprites) 2015-03-09 16:34:55 -05:00
Blade Barringer
60a62a282e fix(sprite) Added correctly sized image for iron knight. Closes #4824 2015-03-09 16:33:31 -05:00
Blade Barringer
9e6c268a97 chore(grunt compile:sprites) 2015-03-09 13:42:35 -05:00
Blade Barringer
e918aa158d feat(mystery items) March subscriber sprites added 2015-03-09 13:42:21 -05:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
Blade Barringer
c23730fdbf Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing 2015-03-06 07:47:10 -06:00
kholliday
f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Sabe Jones
27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones
21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Aaron Morris
f3bd5330a9 Updating to more awesome translation. 2015-03-02 21:52:50 -05:00
Aaron Morris
5f739fb078 Updating example translation 
No harm done doing this before pushing it officially through transifex, right?
 2015-03-02 21:15:44 -05:00
Aaron Morris
d9b10a4373 making strings translatable 
not translating the body keys though...
 2015-03-02 21:13:18 -05:00
Aaron Morris
ec15f239c6 removing extraneous lines 
Not sure about translations yet...
 2015-03-02 21:00:50 -05:00
Aaron Morris
b484dd3208 Allow for client notifications to user settings 
Added functionality on successful user changes (see userNotifications
object in userServices.js)

On this commit, it will tell the user "Party order updated" when the
sorting settings change.
 2015-03-02 09:00:37 -05:00
Matteo Pagliazzi
85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Sabe Jones
3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Sabe Jones
7d943d9007 fix(mystery): Last missing sprite 2015-02-24 20:40:32 -06:00
Sabe Jones
f5f21718ae fix(mystery): Missing sprites 2015-02-24 20:33:02 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer
016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer
6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Matteo Pagliazzi
14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +01:00
Matteo Pagliazzi
4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer
a2eda6c91a Merge pull request #4733 from remmz0r/gemDisplay 
Gem Display Text in Modals (new) - Fixes #4645
 2015-02-22 13:17:47 -05:00
Blade Barringer
5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Blade Barringer
f355672b3b Merge pull request #4703 from scribblypanda/issue2825 
added pet colour to feed/evolve notif
 2015-02-22 12:12:23 -05:00
Bryce Wojtowicz
0931d52d56 Edit: fixed tabs instead of spaces issue 2015-02-22 13:39:19 +08:00
Bryce Wojtowicz
44478d3792 Fixes #4645 
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
 2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00