Commit graph

1169 commits

Author SHA1 Message Date
Tyler Renelle
9020ca4c17 Merge branch 'master' of github.com:lefnire/habitrpg 2013-02-05 11:54:09 -05:00
Tyler Renelle
dc00b0fb5e fix to 'gender' undefined 2013-02-05 11:51:24 -05:00
Tyler Renelle
f431090e0f forgot to bring in hiding ads 2013-02-05 11:49:17 -05:00
Tyler Renelle
fe544de798 party subscriptions properly working 2013-02-05 11:44:51 -05:00
Stan Lindsey
ee4c660969 Update views/app/index.html 2013-02-05 12:36:59 +00:00
Stan Lindsey
11edb75336 Math.floor instead of rounding
Should fix https://github.com/lefnire/habitrpg/issues/236#issuecomment-13126649
2013-02-05 12:24:19 +00:00
Tyler Renelle
4ac1a84acd kill party with last member, show user avatars in party 2013-02-05 01:46:46 -05:00
Tyler Renelle
6245d0adce setup party model subscriptions (currently very inefficient, and
unsubscribe not being utilized)
2013-02-05 01:37:13 -05:00
Tyler Renelle
a67c82aab5 accessControl basic framework for party system 2013-02-05 01:00:43 -05:00
Tyler Renelle
9723f3c37a don't need public/private paths after all, can check path requests in store accessControl callbacks 2013-02-04 23:32:40 -05:00
Tyler Renelle
6966f6a439 modify everything to accomdate migratino 2013-02-04 21:18:13 -05:00
Tyler Renelle
96338f3169 allow crash server 2013-02-04 21:13:04 -05:00
Tyler Renelle
629ba2df79 fix up migration to only save clean fields 2013-02-04 20:24:40 -05:00
Tyler Renelle
ca907a75df Merge branch 'master' into big-migration 2013-02-04 19:04:41 -05:00
Tyler Renelle
72cefaf787 Merge pull request #304 from Sabin144/master
Fix for #47
2013-02-04 15:59:57 -08:00
Tyler Renelle
6d48885fdf use batchupdate on buyreroll 2013-02-04 18:13:52 -05:00
Tyler Renelle
e8e921c58d Merge branch 'parties'
Conflicts:
	src/app/schema.coffee
2013-02-04 17:44:22 -05:00
Tyler Renelle
c62b2d3e05 disable parties, merge in private, back to old REST, hide "next day" button 2013-02-04 17:43:30 -05:00
Tyler Renelle
927a3d0aa7 starting big migration 2013-02-04 17:30:46 -05:00
Tyler Renelle
57a7edc5d3 rename everything "friends" to "party", since we may use friends for
following/followers feature
2013-02-04 14:10:20 -05:00
Tyler Renelle
5e7187dbcd add count habits mongo script, for the kickstarter blog post 2013-02-04 13:03:25 -05:00
Tyler Renelle
e4565c3f9b double stats-set 2013-02-04 02:55:29 -05:00
Tyler Renelle
8baa4cd8db dailies not resetting on cron 2013-02-04 02:51:59 -05:00
Tyler Renelle
68f5cd1184 typo 2013-02-04 02:38:57 -05:00
Tyler Renelle
6e2035eef6 a super-hack to trick derby into showing notifications. bug fix on
refresh disappearing habits `model.get(path, {getRef:false})`
2013-02-04 02:36:11 -05:00
Tyler Renelle
2111241ffe Merge pull request #303 from Shaners/master
Some colour variations for the pet wolf.
2013-02-03 22:40:21 -08:00
Tyler Renelle
dfc63695c7 conflict: object cloning makes properties unavailable sometimes, but
it fixes subscriptions.
2013-02-04 01:38:53 -05:00
Tyler Renelle
6292b7adce deepclone user.get() so we can modify properties and still notify
model subscriptions
2013-02-04 01:27:30 -05:00
Tyler Renelle
ae32fd4775 disable development racer logging 2013-02-04 01:21:03 -05:00
Tyler Renelle
b9de996b94 fix to itemstore notifiication not showing 2013-02-04 01:20:55 -05:00
Tyler Renelle
fac802cddb back to updating a batch user object manually. interesting thing, batch.obj loses its properties (like batch.obj.stats) unless returned as the value of a function... 2013-02-04 00:50:22 -05:00
Sabin144
72a39a01e1 Update src/app/scoring.coffee 2013-02-04 00:27:55 -05:00
Sabin144
e4d43846f6 Update views/app/index.html 2013-02-04 00:25:46 -05:00
Shane Lister
1562ee8a54 Pet Wolf Variations 2013-02-03 20:00:54 -08:00
Shane Lister
fc1edd0db1 Revert "Pet Wolf Variations"
This reverts commit 8d5e8b60a0.
2013-02-03 19:57:53 -08:00
Shane Lister
8d5e8b60a0 Pet Wolf Variations
Some reskins for the wolf pet.
2013-02-03 19:51:25 -08:00
Stan Lindsey
b7580a9e5a Growl position fixedf 2013-02-03 21:05:06 +00:00
Tyler Renelle
29bb99373e new method of preventing persistence, using model._dontPersist - see 11ad77ac46 2013-02-03 15:27:26 -05:00
Tyler Renelle
5d53ac80fa Merge pull request #294 from Pandoro/new_pixel_art
New pixel art
2013-02-03 09:04:30 -08:00
Alex
474ca9462c As discussed in #107 I added the following:
* The full gimp file, containing all the current character pixel art for both male and female, now with different hair color and skin color.
* A CSS sprite of the above
* I took the liberty to also add @Shaners wolf, with and without black border.
2013-02-03 13:19:19 +01:00
Tyler Renelle
7bfefb07dd don't use userObj, back to user.get() - we'll just intercept commit 2013-02-02 14:40:24 -05:00
Tyler Renelle
4c5b8aacab forgot to start transcation for cron 2013-02-02 13:59:05 -05:00
Tyler Renelle
ba10f7943d merge batch.queue and batch.updateAndQueue to one function set 2013-02-02 13:46:54 -05:00
Tyler Renelle
0d53469de5 underscore on server seems to return objects, not modify the original
- 'gender undefined' bug fix
2013-02-02 12:58:33 -05:00
Tyler Renelle
4e896240ea reset dome with revive and reset (don't want these to be necessary, stop-gap) 2013-02-02 11:40:41 -05:00
Tyler Renelle
438c34dbad temp stop-gap sans notification updates, and you can't use model.set()
manually between new BatchUpdate and batch.commit(). Obviously not
ideal, come back
2013-02-01 15:43:43 -05:00
Tyler Renelle
6e2a700598 fix emulate next day button 2013-02-01 14:16:01 -05:00
Tyler Renelle
86ea99c2dc add "emulate next day" debugging button 2013-02-01 14:05:52 -05:00
Tyler Renelle
53d5ae51c5 cron bug 2013-02-01 13:56:35 -05:00
Tyler Renelle
6e93200fb9 always set preened lists 2013-02-01 13:32:12 -05:00