Commit Graph

44 Commits

Author SHA1 Message Date
Tyler Renelle 9c135482a2 [#37] classes: move m/f => broad/slim, add those body-types in, fix hair positioning 2013-12-04 20:00:50 -07:00
Tyler Renelle f662b3af18 Merge branch 'master' into classes
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
2013-12-01 19:24:40 -07:00
Tyler Renelle 9976610652 classes: armory WIP 2013-11-30 16:32:09 -07:00
Tyler Renelle 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
2013-11-29 17:15:41 -07:00
Tyler Renelle bf7f7b6583 [#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart) 2013-11-29 16:47:08 -07:00
Nick Gordon f977bd5171 I don't know much about coffeescript, but this build should pass now 2013-11-28 12:46:49 -08:00
Nick Gordon 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 2013-11-27 22:50:19 -08:00
Tyler Renelle 1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Matteo Pagliazzi 7e437e405d fix for countPets, working when originalCount is 0 2013-11-20 21:37:40 +01:00
Matteo Pagliazzi ec1681fce4 add countPets helper 2013-11-18 16:07:23 +01:00
Matteo Pagliazzi 4547417d62 build, export moment & lodash as helpers (to be used in $rootScope) 2013-11-17 13:27:50 +01:00
Matteo Pagliazzi 3a2edb6539 remove relative date & upgrade & export moment 2013-11-17 13:24:36 +01:00
Tyler Renelle d747559429 mounts: rewrite item definitions as objects, rather than arrays, to
support UserSchema overhaul. Add items.food & items.mounts
2013-11-10 13:25:13 -08:00
Tyler Renelle 761887da18 contrib: move equipped() helper to items.coffee, use a more robust
method of determining which item is available in the store, and which
items i can legally equip. It's a bit wild, I think we should find a
different approach
2013-11-07 13:11:35 -08:00
Tyler Renelle f0cc17bfaf Merge remote-tracking branch 'djuretic/rewrite' 2013-11-05 14:54:48 -08:00
Tyler Renelle 8e38aa1332 better task defaults, since we may not be able to use Mongoose
TaskSchema (see http://goo.gl/a5irq4)
2013-11-02 11:11:28 -07:00
Tyler Renelle 6d786b43dd add task._id = task.id on taskDefaults 2013-11-01 13:03:27 -07:00
Tyler Renelle 91c1bd2ddb challenges: remove derby stuff 2013-10-28 09:13:18 -07:00
Dušan Juretić ecc8ff740e add lastDrop to helpers.newUser 2013-10-27 16:23:02 -03:00
Dušan Juretić 939bca1eb9 add silver leading zero 2013-09-23 23:30:13 -03:00
Dušan Juretić c60f6f1c23 corrected rounding of gold & silver calculations 2013-09-23 23:03:11 -03:00
Tyler Renelle fc23bdb7c8 fixes to dotSet & dotGet which allow getting / setting deep paths that don't exist 2013-09-17 13:45:30 -04:00
Tyler Renelle 516f947d9b fail-safe dotSet for now until I can figure out what's triggering the error 2013-09-03 22:03:36 -04:00
Tyler Renelle 6a3b2fc1a1 add potion & reroll to itemstore, add taskDefaults helper 2013-08-25 14:53:45 -04:00
Tyler Renelle bff1b50e42 build browser scripts 2013-08-25 09:07:58 -04:00
Tyler Renelle 9af5d2d29b no more 'new' deafult lastCron, set it to +new Date() 2013-08-24 19:07:42 -04:00
Tyler Renelle 6aa9483a0b cron: add timezone calculation into the midst. Note: this requires user.preferences.timezoneOffset exist on the user, otherwise it will default to the script-runner timezone (which works fine if user or browser) 2013-08-20 21:40:39 -04:00
Tyler Renelle 9e1341f0e6 derbyUserToAPI - allow pass in user as object, not scope 2013-08-12 20:40:59 -04:00
Tyler Renelle 65881a178e fix to "set undefined path", _.each exits early if it receives false :(
:( :(
2013-08-12 13:18:05 -04:00
Tyler Renelle cafcde01ec bug fixes: don't allow dotSet/Get on undefined paths, remove @hydrate
from derbyUserToAPI()
2013-08-11 12:18:58 -04:00
Tyler Renelle 6b56067668 add some derby-specific routes that are required by the new api, upgrade
lodash so we can use _.transofrm
2013-08-10 23:30:17 -04:00
Tyler Renelle dab72e5865 cap items to maximum in their array, in case the user manually entered
a number larger than the max allowed item in the "restore" modal
2013-07-24 16:45:48 -04:00
Tyler Renelle 2bb5ad43e0 require items, algos, helpers locally instead of via index.js 2013-07-12 16:32:28 -04:00
Tyler Renelle 6bf0305ea4 fixed the empty helpers issue. it was circular dependencies - algos
dep'd helpers, helpers dep'd algos. Since one came first, it didn't
have the other - so it was an empty object. maybe this top-level
index.js combinging ./script/* files isn't such a good idea, because I
think manual requires from within a file will resolve circular
dependencies @yangit
2013-06-18 21:40:43 -04:00
Tyler Renelle 6998fb70f3 export all scripts into top-level index.js, so that coffeeify includes
can import these properly. Hopefully this fixes the empty helpers bug.
@yangit I'll merge this into master once I'm sure it works
2013-06-18 18:21:27 -04:00
Tyler Renelle 06a2989d3b Revert "change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea"
This reverts commit 6ca82b2443.
2013-06-04 12:51:33 -04:00
Tyler Renelle 6ca82b2443 change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea 2013-06-04 12:41:50 -04:00
Tyler Renelle ac74cb0d74 challenges: new party invitation setup 2013-05-28 17:32:31 +01:00
Tyler Renelle 41da6c2162 pull in taskClasses changes for the website challenges branch 2013-05-26 15:22:49 +01:00
Tyler Renelle 51a80b6626 some bug-fixes on shouldDo() for today-check 2013-05-25 18:26:07 +01:00
Tyler Renelle 30f4f091a4 add newUser to helpers, will be needed when creating new users on mobile 2013-05-24 11:31:32 +01:00
yangit ef9ec0cc22 Coffeeify plugin for browserify to compile .coffee into browser.js. 2013-05-24 13:29:04 +08:00
Tyler Renelle ad9c1940a9 re-jig all algos.coffee. add in changes I made in the recent past, put cron back in (why was this removed altogether??), fix some bugs 2013-05-19 23:22:37 +01:00
Tyler Renelle d42ac5d53c helpers.coffee now working with the website 2013-05-19 18:52:13 +01:00