Commit graph

  • 4a112bb180 add in temp compiled stylus css, full index.css from the website (we need to come up with something better) Tyler Renelle 2013-04-10 15:00:40 -0400
  • 58f6689a33 hack fix for window.exports Tyler Renelle 2013-04-10 15:00:18 -0400
  • 3bc77dad6e update images Tyler Renelle 2013-04-10 14:59:58 -0400
  • 4af8a91793 move external script-loading back down to app.on('render') Tyler Renelle 2013-04-10 11:49:00 -0400
  • f9db24354f Merge branch 'develop' Tyler Renelle 2013-04-09 23:02:19 -0400
  • e9a164d2ad enable websockets! Tyler Renelle 2013-04-09 22:15:04 -0400
  • d2f6597e9f remove jquery-ui as git submodule, add it into public/vendor manually due to large direcotry size with build files Tyler Renelle 2013-04-09 13:43:26 -0400
  • 72ee444608 back to our roots: store vendor files in public/vendor instead of using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use require() to min/concat for performance. Note, previously we had "too many files open" error because we had /vendor tracking git submodules, which includes all files for those projects - now we're downloading manually, which gives us minimum required files from each project's build steps Tyler Renelle 2013-04-09 13:20:59 -0400
  • 6ae8504be0 Adds Dutch Translations. Joshua Appelman 2013-04-09 02:02:34 +0200
  • 9103e6957a Merge branch 'develop' Tyler Renelle 2013-04-08 11:25:01 -0400
  • f6e53a377f some bug-fixes & cleanup on removal of _view.* Tyler Renelle 2013-04-08 11:24:45 -0400
  • 046b075faf Merge branch 'develop' Tyler Renelle 2013-04-07 20:43:29 -0400
  • ba750141cf fix to previous commit Tyler Renelle 2013-04-07 20:43:16 -0400
  • cd477364e2 Merge branch 'develop' Tyler Renelle 2013-04-07 20:39:47 -0400
  • 9222b56777 move task-corruption cleanup to cron, restore missing tasks to list - let's see if this fixes #777 Tyler Renelle 2013-04-07 20:38:28 -0400
  • 6522badaa6 rename _view.* to _* - don't know why I did that whole _view.* thing in the first place, but whatevs Tyler Renelle 2013-04-07 20:29:13 -0400
  • 0191510370 Merge branch 'develop' Tyler Renelle 2013-04-07 20:23:30 -0400
  • c55118a5bc don't deduct GP unless purchase successful (see #233) Tyler Renelle 2013-04-07 20:23:19 -0400
  • 3918eb6731 Merge branch 'develop' Tyler Renelle 2013-04-06 13:17:07 -0400
  • fd86757aa9 Merge pull request #784 from Shaners/develop Tyler Renelle 2013-04-06 10:16:22 -0700
  • 35da5c2a1e Fix to some pixel grid alignment issues Shane Lister 2013-04-06 10:06:37 -0700
  • 69d8d478da Merge branch 'develop' Tyler Renelle 2013-04-06 12:56:28 -0400
  • 1beb50c1fc Merge pull request #779 from Shaners/develop Tyler Renelle 2013-04-06 08:28:29 -0700
  • 4742e4236e Update pets.html Shane Lister 2013-04-05 22:55:34 -0700
  • 70e75b6515 Merge pull request #11 from lefnire/develop Shane Lister 2013-04-05 22:04:17 -0700
  • db4ebe3813 add bs-docs-masthead Tyler Renelle 2013-04-05 14:16:26 -0400
  • 4260361a65 Merge branch 'develop' Tyler Renelle 2013-04-05 13:50:39 -0400
  • 9808b9a9f7 Merge pull request #770 from arscan/valuefix Daniel Saewitz 2013-04-04 17:31:43 -0700
  • 4958690bcb update a test to check for undefined value when making new habit Rob Scanlon 2013-04-04 18:09:06 -0400
  • 234d3725be nix the "remove if empty auth & no more session" cron task Tyler Renelle 2013-04-04 17:38:31 -0400
  • 85432cabdc cap minimum %chance of drop to 1% so users still rewarded for championed habits. Will remove once we have streaks / combos. Also factor in task difficulty Tyler Renelle 2013-04-04 18:01:06 -0400
  • 02a1a0d3b4 cap minimum %chance of drop to 1% so users still rewarded for championed habits. Will remove once we have streaks / combos. Also factor in task difficulty Tyler Renelle 2013-04-04 18:01:06 -0400
  • aba7a67457 Merge branch 'master' into develop Tyler Renelle 2013-04-04 17:44:28 -0400
  • dd736923ca Merge pull request #757 from ThibG/master Tyler Renelle 2013-04-04 14:43:34 -0700
  • a07dbaf9fd nix the "remove if empty auth & no more session" cron task Tyler Renelle 2013-04-04 17:38:31 -0400
  • 3139e51535 fix problem when updating task Rob Scanlon 2013-04-04 17:11:27 -0400
  • 584759bd25 shift some require() statements around, attempt to get things out of app.coffee top-level scope - working towards mem leak fix Tyler Renelle 2013-04-04 16:44:54 -0400
  • 1c2cc06a6e BREAKING CHANGE! this removes list cleanup / re-establishment. In the past, id-lists in refLists were being completely emptied (see #85 & #86). I'm still not sure why (see https://github.com/codeparty/racer/issues/101 or https://github.com/codeparty/derby/issues/237 possibly?). This commit reverts working around that issue, but potentially fixes #769. Going to test this on heroku a bit before merging in Tyler Renelle 2013-04-04 15:36:52 -0400
  • 0abbc98b1c move all view helpers out of their respective files and into helpers.coffee. we need viewHelpers at top-level scope, but nothing else per se - this is preparation for memory leak fixing Tyler Renelle 2013-04-04 16:17:30 -0400
  • 4113eefaf1 Fixes bug when user attempts to create task with no value field Rob Scanlon 2013-04-03 22:51:41 -0400
  • ee281cf352 Merge branch 'develop' Tyler Renelle 2013-04-03 17:18:27 -0400
  • 367ca4a76b redirect about, team, extensions to the community site. remove header Tyler Renelle 2013-04-03 17:15:28 -0400
  • c45885cfac redirect extensions to community site Tyler Renelle 2013-04-03 16:36:43 -0400
  • 6c8bd52a11 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-04-03 16:37:18 -0400
  • 1bdbd93afa redirect extensions to community site Tyler Renelle 2013-04-03 16:36:43 -0400
  • da5b06f916 Merge pull request #760 from yangit/develop Tyler Renelle 2013-04-03 11:32:37 -0700
  • 6369e8e9c0 using eval tests yangit 2013-04-02 22:08:16 +0800
  • 032564334c using eval tests2 yangit 2013-04-02 22:05:36 +0800
  • 8a6fede4fe using eval tests2 yangit 2013-04-02 21:47:37 +0800
  • c9112feaf7 using eval tests yangit 2013-04-02 21:30:53 +0800
  • 2570e5e134 stats tests ok tests splitted into files add.items tests fail yangit 2013-04-01 22:43:26 +0800
  • 96d1dbd430 Fix rewards being movable only once and item tooltips not showing up after that Thibaut Girka 2013-03-31 23:26:10 +0200
  • 41449d349a protocol-agnostic amazon images & hover-script at the end Tyler Renelle 2013-03-31 00:27:47 -0700
  • a189aae8bc Merge branch 'develop' Tyler Renelle 2013-03-31 00:06:40 -0700
  • ce43a7503b no more adsense, switching to amazon affiliates because of https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo Tyler Renelle 2013-03-31 00:06:29 -0700
  • 16643e8b1c Merge branch 'develop' Tyler Renelle 2013-03-30 18:46:15 -0700
  • c9907f9558 move some external script loading into app.on('render') to see if that solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo Tyler Renelle 2013-03-30 18:45:57 -0700
  • d90f594cb8 Merge remote-tracking branch 'origin/pets' into develop Tyler Renelle 2013-03-30 13:08:43 -0700
  • 533deb7c83 Merge pull request #751 from Shaners/pets Tyler Renelle 2013-03-30 09:16:06 -0700
  • b5665cdd7c new line Shane Lister 2013-03-29 22:50:15 -0700
  • 86102ce8e7 More Gem sizes Shane Lister 2013-03-29 22:44:44 -0700
  • 96ce6da743 update habit version to upgrade nodemodules Tyler Renelle 2013-03-29 22:39:56 -0700
  • ea92779ef8 Merge branch 'master' of github.com:lefnire/habitrpg Tyler Renelle 2013-03-29 22:29:09 -0700
  • be83a2c46e Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-03-29 22:28:27 -0700
  • 9b42eb825b small ads & static-bindings cleanup (doesn't fix the ads issue) Tyler Renelle 2013-03-29 21:48:08 -0700
  • acfb76c243 renamed comments Stan Lindsey 2013-03-29 21:38:13 +0000
  • 1444143c7b Merge pull request #748 from switz/translations Tyler Renelle 2013-03-29 11:17:53 -0700
  • 2b59c205a2 Remove translations for now Daniel Saewitz 2013-03-29 14:15:17 -0400
  • d81cbe570b Merge pull request #743 from Shaners/pets Stan Lindsey 2013-03-29 03:50:10 -0700
  • bb2ba07672 Update app.json Stan Lindsey 2013-03-29 10:46:42 +0000
  • e2dc08bae0 Update app.json Stan Lindsey 2013-03-29 10:23:39 +0000
  • f72c8f33ec Added Gem to Sprite Sheet and Egg CSS Shane Lister 2013-03-28 19:04:01 -0700
  • 9ecb53747c Merge pull request #10 from lefnire/pets Shane Lister 2013-03-28 17:04:25 -0700
  • ef12b2adce Incomplete up of EN "translation" Stan Lindsey 2013-03-28 22:29:54 +0000
  • f87ab6866f Merge branch 'master' of github.com:lefnire/habitrpg Tyler Renelle 2013-03-28 08:46:50 -0700
  • b03bf8ea60 Merge branch 'develop' Tyler Renelle 2013-03-28 08:43:25 -0700
  • 51f054e51c show tokens in character modal at all times Tyler Renelle 2013-03-28 08:43:13 -0700
  • 6ba25e40b0 Added Community Link Stan Lindsey 2013-03-28 11:29:02 +0000
  • e0a28514c7 Added Community Link Stan Lindsey 2013-03-28 11:27:52 +0000
  • f57734eda5 Merge branch 'develop' Tyler Renelle 2013-03-28 01:36:29 -0700
  • 3d36a3f531 "new stuff" update Tyler Renelle 2013-03-28 01:36:18 -0700
  • f3c43628c7 Merge branch 'develop' Tyler Renelle 2013-03-28 00:52:22 -0700
  • d2b4072ad6 better wording on buying tokens Tyler Renelle 2013-03-28 00:49:57 -0700
  • 88badc4929 pets: list cost of items in market Tyler Renelle 2013-03-28 00:36:57 -0700
  • a966c2ce65 pets: rename base.name to from "Common" to "Base" for technical reasons Tyler Renelle 2013-03-28 00:34:05 -0700
  • 6d6085e29b Merge branch 'ads' into pets Tyler Renelle 2013-03-28 00:28:59 -0700
  • 157f0400e1 fix tokens migration script Tyler Renelle 2013-03-28 00:25:45 -0700
  • 83bfee0fa3 and include email in apply_tokens Tyler Renelle 2013-03-27 23:23:19 -0700
  • a84d1920bf pets: remove unecessary css Tyler Renelle 2013-03-27 17:57:39 -0700
  • e44304f63a Merge branch 'pets' of github.com:lefnire/habitrpg into pets Tyler Renelle 2013-03-27 17:33:27 -0700
  • fdcf927a47 Merge pull request #739 from Shaners/pets Tyler Renelle 2013-03-27 17:32:50 -0700
  • 0ac25e7686 Last four potions for new pet system Shane Lister 2013-03-27 17:16:49 -0700
  • 264ab6f241 Merge pull request #9 from lefnire/pets Shane Lister 2013-03-27 16:59:59 -0700
  • 30d92a1583 add username to tokens migration Tyler Renelle 2013-03-27 16:02:29 -0700
  • 56eccabe5a apply tokens migration script Tyler Renelle 2013-03-27 14:07:25 -0700
  • b7459517f4 Merge branch 'develop' into pets Tyler Renelle 2013-03-27 13:14:08 -0700
  • 8bad13e5c7 pets: remove <strong> on "hatching potion" Tyler Renelle 2013-03-27 12:32:18 -0700
  • 562634478f pets: easier click on market items Tyler Renelle 2013-03-27 11:59:56 -0700
  • 3a62482a4d pets: bug fixes & rewording Tyler Renelle 2013-03-27 11:57:40 -0700
  • 1ee008aea1 pets: raise egg cost a tad Tyler Renelle 2013-03-27 11:46:10 -0700