Commit graph

52 commits

Author SHA1 Message Date
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
Tyler Renelle
73d8e00406 thanksgiving turkey & npcs 2013-11-27 11:58:19 -07:00
Tyler Renelle
d98257812f build 2013-11-20 15:16:07 -08: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
Matteo Pagliazzi
4547417d62 build, export moment & lodash as helpers (to be used in $rootScope) 2013-11-17 13:27:50 +01: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
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
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
Tyler Renelle
1bc87f01e9 mounts: factor food into random drops (40% food, 30% eggs, 40%
pots). This commit needs revisiting
2013-11-10 13:25:52 -08:00
Tyler Renelle
fd4e54ef84 mounts: fix up spritesheets mount system 2013-11-10 13:22:44 -08:00
Tyler Renelle
317f1a9319 5482a83 add minHistLen as a parameter to preenUserHistory (with a
default value of 7)
2013-11-08 13:57:28 -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
54229ee406 contrib: update css to accomodate new contributor only store & equipment (@Shaners could you take a peek at the css positioning issues in backer.css?) 2013-11-07 13:10:41 -08:00
Tyler Renelle
5482a83a00 add preen_history to user cron (see
https://github.com/HabitRPG/habitrpg/issues/1492), to cut back on user
object sizes (and hopefully angular performance) dramatically. Start
writing tests, but they're not complete. @djuretic could you take a peak
at this? My brain is melting
2013-11-05 17:10:31 -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
Matteo Pagliazzi
8503c37fde compile & upgrade browserify for grunt-browserify 2013-11-02 09:55:18 +01:00
Tyler Renelle
f785621da4 grunt for task defaults issue 2013-11-01 13:27:08 -07:00
Tyler Renelle
1bfb6a88fd Merge remote-tracking branch 'shaners/rewrite'
Conflicts:
	dist/spritesheets.css
2013-10-29 23:15:03 -07:00
Tyler Renelle
91c1bd2ddb challenges: remove derby stuff 2013-10-28 09:13:18 -07:00
Shane Lister
c05430aecc Update spritesheets.css 2013-10-27 19:15:33 -07:00
Matteo Pagliazzi
72bf5d7073 Merge branch 'rewrite' of https://github.com/HabitRPG/habitrpg-shared into rewrite 2013-10-27 12:13:26 +01:00
Matteo Pagliazzi
d7416117f9 award ultimate gear achievement 2013-10-27 12:13:06 +01:00
Shaners
8fed3f5c5a Add contributor-only pet - Hydra 2013-10-26 18:17:44 -07:00
Tyler Renelle
04048e9768 [#30] grunt 2013-10-24 12:12:13 -07:00
Tyler Renelle
e84b1975a9 add hair to customizer options & run grunt 2013-10-24 10:56:15 -07:00
Shaners
212a4206c6 Added red hair option. Fixed a few minor pixel grid alignment issues 2013-10-23 23:50:11 -07:00
Matteo Pagliazzi
79e0d5cba2 upgrade browseridy to 2.34.x and grunt build 2013-10-23 18:25:41 +02:00
Tyler Renelle
2ca7b27503 add inline for gems 2013-10-22 19:23:27 -07:00
Tyler Renelle
06e489dfc5 halloween: consolidate customizer button css. was duplicated bw mobile &
web, copy into habitrpg-shared, remove from those projects, remove regex
css selectors (they weren't working), add crazy & monster skins
2013-10-22 16:05:20 -07:00
Tyler Renelle
f9c2fce4aa halloween: male sprites 2013-10-22 14:46:44 -07:00
Tyler Renelle
d7482fedc5 halloween: add Crazy Skin & Halloween Skin for female sprites 2013-10-22 14:32:26 -07:00
Tyler Renelle
b0ebeb8c2c grunt build 2013-10-21 10:25:27 -07:00
meaganoff
46bc1545d1 hopefully fix for apparent ios7 issue 2013-10-20 19:34:53 -05:00
Shaners
a5c7578e6d Adds new skin tones 2013-09-24 21:56:08 -07: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
Matteo Pagliazzi
ae4f3a6481 order css files & rebuild 2013-09-13 21:09:32 +02:00
Tyler Renelle
1e9ef6d2e2 re-build. was getting revive errors for some reason 2013-09-04 15:49:39 -04:00
Matteo Pagliazzi
da70845b94 build 2013-09-04 13:10:44 +02: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
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