Commit graph

335 commits

Author SHA1 Message Date
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
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
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
fd4e54ef84 mounts: fix up spritesheets mount system 2013-11-10 13:22:44 -08:00
Dušan Juretić
d698858b8a add travis build status to readme 2013-11-09 22:30:24 -03:00
Dušan Juretić
21907a6af4 remove unimplemented tests 2013-11-09 20:57:10 -03:00
Dušan Juretić
20192b1d0a enable all tests again, don't log to console in tests 2013-11-09 20:56:18 -03: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
Shaners
344a5302c0 Resizes some assets where possible to fit into 90 avatar box and adjusts CSS accordingly. Fixes some positioning in shop sprite img and css. 2013-11-08 00:06:09 -08:00
Shaners
5922725e6d Update images for Flying Pig, Lion, and Fox egg. Revised art. 2013-11-08 00:02:35 -08:00
Shaners
e51d3effda Archives unused sprite sheets to keep things cleaner and less confusing. 2013-11-08 00:01:05 -08:00
Shaners
e8a87716bf Rename wolf to wolf-base, add tiger hatching animations at 6x. Note: missing albino tiger. 2013-11-07 23:56:10 -08:00
Shane Lister
c3886d1770 Merge pull request #1 from HabitRPG/contrib
Contrib branch
2013-11-07 22:16:49 -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
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
Matteo Pagliazzi
8503c37fde compile & upgrade browserify for grunt-browserify 2013-11-02 09:55:18 +01:00
Matteo Pagliazzi
669f39a48d upgrade lodash to 2.2.1 2013-11-02 09:53:09 +01:00
Tyler Renelle
f785621da4 grunt for task defaults issue 2013-11-01 13:27:08 -07:00
Tyler Renelle
6d786b43dd add task._id = task.id on taskDefaults 2013-11-01 13:03:27 -07:00
Tyler Renelle
084c7d3001 remove workaround 2013-11-01 13:01:38 -07:00
Tyler Renelle
a374f67549 [#1708] tmp workaround for task not defined 2013-11-01 12:43:57 -07:00
Dušan Juretić
8743e00b62 show how to run tests in readme 2013-10-31 22:07:19 -03:00
Matteo Pagliazzi
8531fb33b2 revert lodash version 2013-10-31 16:39:03 +01:00