Commit Graph

116 Commits

Author SHA1 Message Date
Matteo Pagliazzi fd9fee93e1 change some paths, js file size reduced by around 400kb 2013-09-03 17:08:22 +02:00
Tyler Renelle 76afd47953 build with new changes 2013-09-02 21:40:45 -04:00
Tyler Renelle effa8ab2bd Merge branch 'rewrite' of github.com:HabitRPG/habitrpg-shared into rewrite
Conflicts:
	dist/habitrpg-shared.js
	spritesheets.css
2013-09-02 21:39:57 -04:00
Tyler Renelle 04de115877 don't run drops on the client. they will be wiped on refresh anyway,
only run on the server (we still need a way to notify users when a drop
happened on the server)
2013-09-02 20:51:21 -04:00
Tyler Renelle 4174412b11 small tweaks to user._tmp, and fixing my own icon 2013-09-02 17:35:00 -04:00
Tyler Renelle d7db4a91de Merge pull request #14 from paglias/add-zzz
Add zzz classes and light version
2013-08-30 06:12:29 -07:00
Matteo Pagliazzi bd7adda005 add zzz light version and classes 2013-08-30 10:19:13 +02:00
Tyler Renelle 83a711e796 update readme 2013-08-26 22:33:56 -04:00
Tyler Renelle d29f267425 move browserify step to Grunt instead of Make (for consistency). Build files now in dist/ as dist/habitrpg-shared.js & dist/spritesheets.css 2013-08-26 22:09:02 -04:00
Tyler Renelle 614f734e67 move a bunch of the spritesheets from the website into css/, add a Grunt
step to compile all the spritesheets into a top-level spritesheets.css,
add an archive/ directory for all the old stuff i'm not sure we need?
2013-08-26 21:24:48 -04:00
Tyler Renelle 2e0441e0b6 start reorganizing everything so we can make use of shared
spritesheets. !note! this will break master, and will only work on the rewrite
2013-08-26 20:42:22 -04:00
Tyler Renelle 6fe76b1a32 update images. move from main site here, wont' be maintaining on main
site anymore
2013-08-26 19:42:41 -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 962f8d6442 update build files 2013-08-24 22:09:18 -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 b23057593b ignore .js & .map from (webstorm transpilers), remove habitrpg-shared
recursive repo
2013-08-20 21:27:56 -04:00
Tyler Renelle 2c75f94254 tests: no longer using shouldCron, test cron paths{} instead 2013-08-19 00:31:07 -04:00
Tyler Renelle 18f0755e4e cast user.items[type] to int, this was the "not enough gp" bug 2013-08-18 20:42:27 -04:00
Tyler Renelle b13c909fe7 possible fix to #1330 2013-08-18 20:12:24 -04:00
Tyler Renelle 7aaf42737a upgrade moment, add npm test 2013-08-18 17:21:19 -04:00
Tyler Renelle d7083bd442 woops, can't alert on server! 2013-08-15 00:26:39 -04:00
Tyler Renelle 2ffade083e cast also during purchasing 2013-08-15 00:12:45 -04:00
Tyler Renelle fc3d863feb cast values to their appropriate types when running scoring functions 2013-08-15 00:00:12 -04:00
Tyler Renelle 8ae6e361b8 cleanup corrupt stats too 2013-08-14 22:58:20 -04:00
Tyler Renelle c40ec44644 typo on corrupt task cleanup 2013-08-14 22:51:47 -04:00
Tyler Renelle fe9c56f189 build for previous 2013-08-13 20:27:58 -04:00
Tyler Renelle 81f83be160 safeguard against NaN & null-value tasks 2013-08-13 20:27:42 -04:00
Tyler Renelle 5d223d8546 re-compile habitrpg-shared 2013-08-13 17:42:03 -04:00
Tyler Renelle 0362de7f0f encapsulate items.buyItem better in habitrpg-shared/items.coffee so we can call from API, derby, & mobile app 2013-08-12 23:47:49 -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 c88fa701a5 add revive to algos.coffee, needed by apiv2 & mobile 2013-08-04 23:45:58 -04:00
Tyler Renelle 4df34095aa Merge branch 'develop' 2013-08-04 22:32:41 -04:00
Tyler Renelle 0d2f9c9314 Merge pull request #11 from SabreCat/patch-1
Remove misleading "one day" from egg drop text
2013-07-31 15:34:23 -07:00
Sabe Jones 07907ae28f Remove misleading "one day" from egg drop text
Pouring a potion on an egg hatches the pet instantly. Until such time as that feature is changed, I've removed the "one day" from the relevant string.
2013-07-31 16:19:16 -05:00
Tyler Renelle b94ecf6002 new compile for mobile 2013-07-29 21:40:44 -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 a5eb64f771 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-07-12 16:56:47 -04:00
Tyler Renelle 2bb5ad43e0 require items, algos, helpers locally instead of via index.js 2013-07-12 16:32:28 -04:00
yangit 66f63a5123 recompiled (run make) for browsers. 2013-06-26 10:25:43 +07:00
yangit 68e8819c21 Merge remote-tracking branch 'remotes/upstream/master' 2013-06-26 09:56:29 +07:00
yangit 014f2df5c7 remove buying rewards for health (you can buy for money only) 2013-06-26 09:52:40 +07:00
Tyler Renelle 7bb95795c7 Merge branch 'develop' 2013-06-20 20:39:13 -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
yangit f6750ffc16 fix for confirmation window when buying rewards w\o money. 2013-06-14 15:07:18 +08:00