Commit Graph

255 Commits

Author SHA1 Message Date
Tyler Renelle 5ebf3a7802 classes: spritesmith wip #37 2013-12-03 16:49:54 -07:00
Tyler Renelle c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) 2013-12-03 16:32:20 -07:00
Tyler Renelle 091600d7fc classes: add _statsComputed property, and sample
`user.stats.buffs.stealth` handling (@SabreCat @danielthebard)
2013-12-02 19:14:29 -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 0d0080ace4 Merge pull request #47 from HabitRPG/sabe/classes
Draft of names, descriptions, stats, and costs for class-based equipment
2013-11-30 11:29:07 -08:00
Tyler Renelle 5d0b925a4c fix tests for 282e105 . May be temporary, unless we verify that 282e105
was the fix for https://github.com/HabitRPG/habitrpg/issues/1057
2013-11-29 17:21:22 -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
Sabe Jones b2a4d215a8 Draft of names, descriptions, stats, and costs for class-based equipment. 2013-11-29 17:31:43 -06:00
snicker 671c130512 Merge pull request #45 from snicker/master
suggested fix for adding "special" pets
2013-11-28 13:45:40 -08:00
Nick Gordon 9b0eea6624 grunted 2013-11-28 13:42:29 -08: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 cd7d490ae3 fix #1937 (missing justin npc) @SabreCat 2013-11-27 18:56:03 -07:00
Tyler Renelle 7e5eda10d9 Merge pull request #44 from snicker/master
adding emoji images
2013-11-27 16:46:05 -08:00
Tyler Renelle 73d8e00406 thanksgiving turkey & npcs 2013-11-27 11:58:19 -07:00
Nick Gordon 20cb03f93c adding emoji images 2013-11-27 10:23:04 -08:00
Dušan Juretić b9abc31edb added test for countPets 2013-11-23 23:57:16 -03:00
Dušan Juretić b89cce001f fix readme: use npm test to run tests 2013-11-23 23:33:24 -03:00
Tyler Renelle 3d93f63216 classes: multi-class items WIP 2013-11-23 17:00:55 -07:00
Tyler Renelle 71d832f263 Merge pull request #43 from DanielTheBard/classes
Updated Abilities
2013-11-23 12:52:48 -08:00
Daniel the Bard c2810a4074 Merge branch 'classes' of https://github.com/DanielTheBard/habitrpg-shared into classes
Conflicts:
	script/items.coffee
2013-11-23 14:27:50 -05:00
Daniel the Bard fc39169b7a Updated Abilities
Not sure how balanced they are. Will probably require some play-testing. I'm sure we'll make adjustments as we go along.
Also built this on the assumption of maybe starting with maybe 30mp, and gaining 2 mp per point of INT?
2013-11-23 14:03:30 -05:00
Daniel the Bard 2544c13045 Class Abilities Updated 2013-11-23 13:41:42 -05:00
Tyler Renelle 1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Tyler Renelle d98257812f build 2013-11-20 15:16:07 -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 7c5818c876 build 2013-11-17 22:34:49 +01:00
Tyler Renelle df3f38d7fb Merge pull request #42 from HabitRPG/sabe_tweak
Change "HP" to "Health" and clarify Potion type
2013-11-17 12:21:26 -08:00
Sabe Jones 4fbc31d1e6 Change "HP" to "Health" and clarify Potion type 2013-11-17 09:55:04 -06: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
djuretic 24f0e58396 Merge pull request #41 from djuretic/master
Use egg.text instead of egg.name & fix unit tests
2013-11-16 04:29:58 -08:00
Dušan Juretić 80afa45b2b revert to using egg.name 2013-11-16 09:26:15 -03:00
Dušan Juretić 2879b050a0 use egg.text instead of egg.name, fix unit tests 2013-11-15 23:18:16 -03:00
Tyler Renelle ecd7a32974 Merge pull request #40 from therufs/fix-rarity
Fix drop ratios
2013-11-14 20:37:02 -08:00
Ruthan c9aeb65d55 Rebalance potion ratios (version 2) 2013-11-14 20:52:24 -05:00
Ruthan ccd39036b6 Fix drop ratios 2013-11-14 20:22:39 -05:00
Tyler Renelle 30b19b5e7d pets: add adjectives (@SabreCat) 2013-11-14 14:05:44 -08:00
Tyler Renelle 9863ca0ce5 Merge branch 'mounts' 2013-11-14 12:41:47 -08:00
Tyler Renelle bf8c0dd9dc mounts: remove food temporarily. merging to master so we can run schema
migration and start with item translations. This commit will be reverted
when mounts is fully merged
2013-11-14 12:40:08 -08:00
Tyler Renelle a52eaee62f mounts: simpler, cleaner breakdown of potion rarity 2013-11-14 12:37:34 -08:00
Tyler Renelle ba548ed67b mounts: more item DRY-ing and cleanup 2013-11-14 12:12:49 -08:00
Tyler Renelle d124968273 mounts: add egg.mountText so "cub" text doesn't show up for mounts 2013-11-14 11:49:37 -08:00
Dušan Juretić 97606ddbb0 fix preen user history test 2013-11-12 22:55:15 -03:00
Tyler Renelle f675198eb8 Merge pull request #39 from djuretic/travis_status
Add Travis build status to Readme
2013-11-11 18:46:33 -08:00
Tyler Renelle 69d9ebe5d3 mounts: some item-def DRYing, provide defaults rather than requiring defined 2013-11-10 19:38:06 -08:00
Tyler Renelle d1cc6a3dd7 mounts: fix spritesheets for rare mounts to work with mount system 2013-11-10 14:36:02 -08:00