Commit Graph

22726 Commits

Author SHA1 Message Date
Tyler Renelle 3a64c1104a add pets count on character popover. also, static bindings wherever
possible - saves CPU
2013-04-15 02:27:38 -04:00
Tyler Renelle 9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -04:00
Tyler Renelle 2f50518579 remove debugger; 2013-04-14 21:48:21 -04:00
Tyler Renelle fb6e83758b rest: test _user.flags.rest is true explicitly 2013-04-14 21:47:43 -04:00
Tyler Renelle 0de27373ad rest bug - lastCron must be set before "return if resting", otherwise
when they unrest they'll get piled by all the days they missed
2013-04-14 21:44:30 -04:00
Tyler Renelle 0342e9a4e7 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-14 14:34:21 -04:00
Tyler Renelle 6e0b82e081 move Rest checkbox out of avatar into settings for now, we'll put back
once we've added the tavern art
2013-04-14 14:33:50 -04:00
Tyler Renelle 10da9a502f Merge pull request #811 from wizonesolutions/587-taskstate
Use user's current day for completed/uncompleted.
2013-04-12 14:35:43 -07:00
Kevin Kaland f6f397dcb0 Use user's current day for completed/uncompleted.
References #587.
2013-04-12 23:20:30 +02:00
Tyler Renelle 299eaa8a14 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-12 16:38:41 -04:00
Tyler Renelle 88d2eee519 start adding tests for user.put 2013-04-12 16:38:07 -04:00
Tyler Renelle cb34cb22b7 begin refactoring PUT /user & POST /user/tasks 2013-04-12 12:49:15 -04:00
Tyler Renelle 5fe344edc6 mass update-user function (PUT /user) which piggy-backs on PUT /tasks to mass-update tasks, including task.del (see mobile 961b86a) 2013-04-12 12:49:07 -04:00
Tyler Renelle 4c08fa4e15 Merge pull request #808 from switz/rest
@lefnire => Initial 'Rest' support
2013-04-11 15:48:37 -07:00
Daniel Saewitz 9917173429 Rest 2013-04-11 18:22:06 -04:00
Tyler Renelle fa4da2a9e8 depend on lefnire/derby#habitrpg, which makes sure to use
lefnire/racer#habitrpg in turn
2013-04-11 13:03:30 -04:00
Tyler Renelle 3b3d4d243a better wasCorrupted test 2013-04-11 11:49:55 -04:00
Tyler Renelle 81eb2afd9d some more comments on corrupt tasks 2013-04-11 11:39:54 -04:00
Tyler Renelle 9a8f0d799f Merge branch 'develop' 2013-04-11 11:34:04 -04:00
Tyler Renelle 8ed72ae2aa back to transction for corruptTasks 2013-04-11 11:33:50 -04:00
Tyler Renelle 0680822c19 remoeve character.coffee self-reference 2013-04-11 11:30:40 -04:00
Tyler Renelle 62fe2de5c5 Merge branch 'develop' 2013-04-10 19:31:21 -04:00
Tyler Renelle 83649c6734 fix clear-completed 2013-04-10 19:24:33 -04:00
Tyler Renelle 570f376421 more fixes to task corruption 2013-04-10 19:24:27 -04:00
Tyler Renelle b736713624 alright, i give up. put the full restore/cleanup function back in.
refLists...
2013-04-10 18:32:38 -04:00
Tyler Renelle 761aeef8cf move task corruption cleanup back to server to solve #803. This might
pose a problem for #769, but it seems that websockets / nginx version
was the real culprit there.
2013-04-10 17:30:50 -04:00
Tyler Renelle 51f60a1e71 some exclusions from index.css 2013-04-10 16:18:40 -04:00
Tyler Renelle 8391c01992 add equipped to helpers 2013-04-10 15:40:35 -04:00
Tyler Renelle ad3d4fad05 modify css to work with mobile img directory 2013-04-10 15:06:44 -04:00
Tyler Renelle 4a112bb180 add in temp compiled stylus css, full index.css from the website (we
need to come up with something better)
2013-04-10 15:00:40 -04:00
Tyler Renelle 58f6689a33 hack fix for window.exports 2013-04-10 15:00:18 -04:00
Tyler Renelle 3bc77dad6e update images 2013-04-10 14:59:58 -04:00
Tyler Renelle 4af8a91793 move external script-loading back down to app.on('render') 2013-04-10 11:49:00 -04:00
Tyler Renelle f9db24354f Merge branch 'develop' 2013-04-09 23:02:19 -04:00
Tyler Renelle e9a164d2ad enable websockets! 2013-04-09 22:15:04 -04:00
Tyler Renelle d2f6597e9f remove jquery-ui as git submodule, add it into public/vendor manually due to large direcotry size with build files 2013-04-09 13:45:09 -04:00
Tyler Renelle 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
2013-04-09 13:21:20 -04:00
Joshua Appelman 6ae8504be0 Adds Dutch Translations.
These are a ridumentary first pass, as according to
https://github.com/lefnire/habitrpg/wiki/Translations the localization
implementation is still in a state of flux. Hopefully these can serve
a temporary use in the meanwhile.
2013-04-09 02:04:41 +02:00
Tyler Renelle 9103e6957a Merge branch 'develop' 2013-04-08 11:25:01 -04:00
Tyler Renelle f6e53a377f some bug-fixes & cleanup on removal of _view.* 2013-04-08 11:24:45 -04:00
Tyler Renelle 046b075faf Merge branch 'develop' 2013-04-07 20:43:29 -04:00
Tyler Renelle ba750141cf fix to previous commit 2013-04-07 20:43:16 -04:00
Tyler Renelle cd477364e2 Merge branch 'develop' 2013-04-07 20:39:47 -04:00
Tyler Renelle 9222b56777 move task-corruption cleanup to cron, restore missing tasks to list -
let's see if this fixes #777
2013-04-07 20:38:28 -04:00
Tyler Renelle 6522badaa6 rename _view.* to _* - don't know why I did that whole _view.* thing
in the first place, but whatevs
2013-04-07 20:29:13 -04:00
Tyler Renelle 0191510370 Merge branch 'develop' 2013-04-07 20:23:30 -04:00
Tyler Renelle c55118a5bc don't deduct GP unless purchase successful (see #233) 2013-04-07 20:23:19 -04:00
Tyler Renelle 3918eb6731 Merge branch 'develop' 2013-04-06 13:17:07 -04:00
Tyler Renelle fd86757aa9 Merge pull request #784 from Shaners/develop
Fix to some pixel grid alignment issues
2013-04-06 10:16:22 -07:00
Shane Lister 35da5c2a1e Fix to some pixel grid alignment issues 2013-04-06 10:06:37 -07:00