Commit graph

  • 3026cc2132 [#37] grunt-spritesmith: achievements Tyler Renelle 2013-12-04 15:56:55 -0700
  • 53bbb20ba6 [#37] class: misc cleanup (moving / deletions) Tyler Renelle 2013-12-04 15:25:21 -0700
  • 9c135482a2 [#37] classes: move m/f => broad/slim, add those body-types in, fix hair positioning Tyler Renelle 2013-12-04 15:09:11 -0700
  • decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) Tyler Renelle 2013-12-04 17:08:55 -0700
  • 88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 Tyler Renelle 2013-12-04 16:52:06 -0700
  • 8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup Tyler Renelle 2013-12-04 16:02:08 -0700
  • 55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 Tyler Renelle 2013-12-04 15:09:56 -0700
  • 350e3681d7 classes: grunt-spritesmith fixes Tyler Renelle 2013-12-03 17:39:43 -0700
  • 6c927414d1 grunt-spritesmith: eggs, food, hatchingPotions, gems #37 Tyler Renelle 2013-12-03 18:43:08 -0700
  • 49b45bc626 Merge @Shaners eggs with food sprites Tyler Renelle 2013-12-03 18:21:25 -0700
  • e204bed2d9 Merge @Shaners eggs with food sprites Tyler Renelle 2013-12-03 18:21:25 -0700
  • 4bbf0cfae8 Merge remote-tracking branch 'Shaners/contrib' into classes Tyler Renelle 2013-12-03 18:16:33 -0700
  • 9409f5ee7f grunt-spritesmith eggs #37 Tyler Renelle 2013-12-03 18:11:50 -0700
  • 5c97887d0d Merge branch 'master' into classes Tyler Renelle 2013-12-03 18:10:08 -0700
  • 0ffc836120 mounts: mounts & food sprites & css Tyler Renelle 2013-11-14 12:54:33 -0800
  • dbd7aaf4c4 classes: spritesmith add pets Tyler Renelle 2013-12-03 17:07:56 -0700
  • 5ebf3a7802 classes: spritesmith wip #37 Tyler Renelle 2013-12-03 16:49:54 -0700
  • c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) Tyler Renelle 2013-12-03 16:10:39 -0700
  • 091600d7fc classes: add _statsComputed property, and sample user.stats.buffs.stealth handling (@SabreCat @danielthebard) Tyler Renelle 2013-12-02 19:14:29 -0700
  • 19b6eb73e0 Merge branch 'develop' into classes Tyler Renelle 2013-12-01 19:51:36 -0700
  • a28327410e Updated Beginner's Tour Xatres 2013-12-02 19:01:17 -0500
  • aa133cc5c6 removes line on li elements in markdown, fixes #1951 Nick Gordon 2013-12-02 15:37:09 -0800
  • dab22ec051 Small formatting fix to Advanced Options Sabe Jones 2013-12-02 11:10:58 -0600
  • 37f7a923ea Fix #1934 (make Reset and Restore options more distinct) Sabe Jones 2013-12-02 10:20:38 -0600
  • f662b3af18 Merge branch 'master' into classes Tyler Renelle 2013-12-01 19:24:20 -0700
  • 45b87288f0 Change "reroll" to "Fortify" in Gems popover text Sabe Jones 2013-12-01 15:03:03 -0600
  • 9fad649c64 Added comment about further changes that will be needed BlackEdder 2013-12-01 18:46:53 +0000
  • af80548a34 Partial fix to #1938 (New name and location for Re-Roll) Sabe Jones 2013-12-01 11:58:03 -0600
  • 30a5b349f8 Fix #1909 (keep stack selected after selling item) Sabe Jones 2013-12-01 10:16:21 -0600
  • 2905a2777e Fix reposition of markdown formatting after 2 reverts Bob Steffes 2013-11-30 16:37:04 -0800
  • 0dd911f2ba Revert "Re-modify position of markdown down formatting link" Bob Steffes 2013-11-30 16:29:17 -0800
  • b1e5ee6433 Revert "Reposition Markdown formatting link" Bob Steffes 2013-11-30 16:26:35 -0800
  • 91c141140d classes: armory WIP Tyler Renelle 2013-11-30 14:55:39 -0700
  • 9976610652 classes: armory WIP Tyler Renelle 2013-11-30 14:55:25 -0700
  • 1000796ddd Merge pull request #1946 from theyliveforever/develop Tyler Renelle 2013-11-30 13:22:49 -0800
  • bb3f0ae7ec Reposition markdown formatting link (3rd try) Bob Steffes 2013-11-30 12:07:23 -0800
  • 0d0080ace4 Merge pull request #47 from HabitRPG/sabe/classes Tyler Renelle 2013-11-30 11:29:07 -0800
  • db7e582c95 Re-modify position of markdown down formatting link Bob Steffes 2013-11-30 10:21:32 -0800
  • 7200ab16f4 thanksgiving: back to normal Tyler Renelle 2013-11-30 10:25:51 -0700
  • 7fdda14cb8 Reposition Markdown formatting link Bob Steffes 2013-11-30 08:07:20 -0800
  • 2cd35472fc Update app.json Andrea 2013-11-30 00:07:39 -0200
  • 5d0b925a4c fix tests for 282e105 . May be temporary, unless we verify that 282e105 was the fix for https://github.com/HabitRPG/habitrpg/issues/1057 Tyler Renelle 2013-11-29 17:21:22 -0700
  • 282e105ea3 [https://github.com/HabitRPG/habitrpg/issues/1057] don't exit-early when attempting to detect if they've switched timezones. Also, don't need to sanitize user.lastCron in shared, do it in Mongoose Tyler Renelle 2013-11-29 17:15:41 -0700
  • bf7f7b6583 [#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart) Tyler Renelle 2013-11-29 16:47:08 -0700
  • b2a4d215a8 Draft of names, descriptions, stats, and costs for class-based equipment. Sabe Jones 2013-11-29 17:31:43 -0600
  • 9bb4e2c272 update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45 Nick Gordon 2013-11-29 09:06:13 -0800
  • e7373b173d JP translation fixes Nicole Foster 2013-11-28 15:05:08 -0500
  • 20d7651a66 Some JP translations Nicole Foster 2013-11-26 23:44:50 -0500
  • 671c130512 Merge pull request #45 from snicker/master snicker 2013-11-28 13:45:40 -0800
  • 9b0eea6624 grunted Nick Gordon 2013-11-28 13:42:29 -0800
  • f977bd5171 I don't know much about coffeescript, but this build should pass now Nick Gordon 2013-11-28 12:46:49 -0800
  • 10ab2a9374 Calculate chance to drop using a slowly increasing function BlackEdder 2013-11-28 18:06:48 +0000
  • 328a9d28dc suggested fix for adding "special" pets so that the list does not have to be duplicated multiple times. the user model can be updated in habitrpg to pull from here instead of hard coding it Nick Gordon 2013-11-27 22:50:19 -0800
  • 5b610bfc5c small fix for sanity Nick Gordon 2013-11-27 22:48:48 -0800
  • 62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller Nick Gordon 2013-11-27 21:22:15 -0800
  • 1d03fee4e3 change reference to images directory for emoji, fixes #1935 Nick Gordon 2013-11-27 20:46:18 -0800
  • cd7d490ae3 fix #1937 (missing justin npc) @SabreCat Tyler Renelle 2013-11-27 18:51:38 -0700
  • 7e5eda10d9 Merge pull request #44 from snicker/master Tyler Renelle 2013-11-27 16:46:05 -0800
  • 63e44062b4 thanksgiving: newstuff too Tyler Renelle 2013-11-27 11:59:07 -0700
  • 73d8e00406 thanksgiving turkey & npcs Tyler Renelle 2013-11-26 17:39:44 -0700
  • 7c20988c41 Merge branch 'thanksgiving' into develop Tyler Renelle 2013-11-27 11:53:18 -0700
  • db5befb570 thanksgiving turkey & npcs Tyler Renelle 2013-11-26 17:40:05 -0700
  • 962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop Tyler Renelle 2013-11-27 11:28:31 -0700
  • 20cb03f93c adding emoji images Nick Gordon 2013-11-27 10:23:04 -0800
  • caaebe01a2 re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!) Tyler Renelle 2013-11-27 10:53:47 -0700
  • 68bb5993c9 Merge pull request #1925 from bobbyroberts99/patch-1 Tyler Renelle 2013-11-27 08:26:18 -0800
  • 44401a9162 add emoji.js file to tests, fix travis build Matteo Pagliazzi 2013-11-27 16:28:09 +0100
  • bdf32325f6 remove emoji css from manifest and move into index.styl Matteo Pagliazzi 2013-11-27 16:19:56 +0100
  • d3eed2282c fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it Matteo Pagliazzi 2013-11-27 16:08:34 +0100
  • a196cc0586 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2013-11-27 15:59:02 +0100
  • 4dbd2fd2f6 pointed to new repository with minifiable code for emoji parsing Nick Gordon 2013-11-27 06:19:45 -0800
  • 13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 Nick Gordon 2013-11-26 21:49:53 -0800
  • 29f0597178 Update Contributing.md Bob Steffes 2013-11-26 20:03:52 -0800
  • 4af9d97c33 Update CONTRIBUTING.md Adrien Lemaire 2013-11-27 11:54:00 +1100
  • aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change Tyler Renelle 2013-11-26 17:09:13 -0700
  • 878c9756d1 add CONTRIBUTING.md, which will automatically add a "read this before submitting a ticket" kinda thing to issues. Tyler Renelle 2013-11-26 16:57:50 -0700
  • 86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles Nick Gordon 2013-11-26 14:56:24 -0800
  • 2b128f71f4 [#1532] add better validation on preferences.dayStart, and a migration to cleanup corrupt ones Tyler Renelle 2013-11-26 15:18:20 -0700
  • a4fb0b42ad well, this wasn't the fix i was thinking of for #1893, but it works and I don't know why I didn't do it in the first place Nick Gordon 2013-11-26 12:06:48 -0800
  • 15f3907f00 fix for #1920 Nick Gordon 2013-11-26 11:51:21 -0800
  • 860a084c69 fix for multiple guilds creation Matteo Pagliazzi 2013-11-26 20:16:10 +0100
  • 878bfc7f46 removing sensitive user data from export Nick Gordon 2013-11-26 06:48:18 -0800
  • 91a0b09470 Fix a few typos/inaccuracies in English app.json Sabe Jones 2013-11-25 22:10:50 -0600
  • d1240473dd use bindonce for days of the week, thanks @snicker! Matteo Pagliazzi 2013-11-25 17:38:07 +0100
  • c4e8de2ee0 fix language switching Matteo Pagliazzi 2013-11-25 17:34:41 +0100
  • a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work Matteo Pagliazzi 2013-11-25 17:30:35 +0100
  • 4ab26ee821 Merge branch 's7export' into develop Nick Gordon 2013-11-25 08:12:53 -0800
  • c0a02eeef8 support for xml and json export of all user data Nick Gordon 2013-11-25 08:06:27 -0800
  • 2e8fc8d248 use script tag not eval to execute moment language code Matteo Pagliazzi 2013-11-25 17:04:07 +0100
  • 17c97308f3 stable, pets row 100% width Matteo Pagliazzi 2013-11-25 16:50:51 +0100
  • b4d910c9cb typo Matteo Pagliazzi 2013-11-24 21:47:07 +0100
  • d1698460e0 add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too Matteo Pagliazzi 2013-11-24 21:45:24 +0100
  • 780b0a3593 Change Markdown help link to point at HabitRPG wiki Sabe Jones 2013-11-24 13:13:21 -0600
  • f4323ddc24 markdown links in chat will now open in a blank window. * added target attribute for the markdown directive to specify. default behavior is _self. Nick Gordon 2013-11-24 10:32:51 -0800
  • 6736da36d4 use jade class syntax Matteo Pagliazzi 2013-11-24 17:49:25 +0100
  • fa2fb8e3fb open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function Matteo Pagliazzi 2013-11-24 17:49:12 +0100
  • f7908ddbcb Correct and clarify some details on contributor rewards Sabe Jones 2013-11-24 09:50:21 -0600
  • c51a34730d Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off. Sabe Jones 2013-11-24 08:53:48 -0600
  • 9086ccffcd Consistent formatting of markdown hint in group edit fields Sabe Jones 2013-11-24 07:41:41 -0600
  • 2101fe255f Place link to Markdown help prominently in Tavern chat (fix #1906) Sabe Jones 2013-11-24 07:35:12 -0600