Tyler Renelle
9eb94988ba
Merge pull request #338 from Shaners/master
...
New Pet Sprites
2013-02-07 20:08:42 -08:00
Shane Lister
1a74640a97
New Pet Sprites
...
New sprites for pet: tiger, panda, and flying pig.
2013-02-07 20:04:16 -08:00
Tyler Renelle
e42d4e6ba6
half-baked commit to save my progress and show my direction, we may
...
want to rever this
2013-02-07 22:42:59 -05:00
Tyler Renelle
b6398964fe
got most of the character customizations working
2013-02-07 22:28:44 -05:00
Tyler Renelle
b134ec558d
add in popover for customizations (can't get css working properly)
2013-02-07 21:24:04 -05:00
Tyler Renelle
76231aed12
begin integrating spritesheet
2013-02-07 20:53:11 -05:00
Tyler Renelle
6738d0ae56
disable database preening for now
2013-02-07 19:20:56 -05:00
Tyler Renelle
a8882620d5
party subscriptions fixes
2013-02-07 19:19:26 -05:00
Tyler Renelle
e5005400a3
Merge branch 'master' of github.com:lefnire/habitrpg
2013-02-07 17:07:03 -05:00
Tyler Renelle
9b91977f59
set batchupdate.obj if not already set (thanks @SlappyBag!)
2013-02-07 17:06:22 -05:00
Tyler Renelle
1a02707828
Merge pull request #327 from alanthing/nconf
...
Use nconf to load in configuration values
2013-02-07 08:11:13 -08:00
Alan Ivey
537b7e1f1f
Use nconf to load in configuration values
...
A config.json file can be used for all ENV settings, and nconf will still allow using ENV overrides. See https://github.com/flatiron/nconf for syntax, or copy the config.json.example file to config.json.
2013-02-07 07:47:34 -05:00
Tyler Renelle
05df606a85
Merge branch 'master' of github.com:lefnire/habitrpg
2013-02-06 22:56:36 -05:00
Tyler Renelle
4bb155939d
attempt #2 at user obj being null
2013-02-06 22:55:34 -05:00
Tyler Renelle
1be82a4313
Merge pull request #321 from Shaners/master
...
Addition of 4 new Pet Sprites
2013-02-06 18:04:34 -08:00
Shane Lister
1883ee4a28
New Pet Sprites
...
New Pet Sprites for: Fox, Bear Cub, Dragon, and Lion.
2013-02-06 18:00:47 -08:00
Tyler Renelle
f020eb1162
fix to undfeind 'items' (this shouldn't be happening)
2013-02-06 15:19:37 -05:00
Tyler Renelle
1aa047d163
remove debuggging buttons
2013-02-06 15:05:14 -05:00
Tyler Renelle
f54c30bb78
racer #37 still an issue
2013-02-06 14:57:12 -05:00
Tyler Renelle
c82a10a670
don't migrate already-migrated users
2013-02-06 14:30:05 -05:00
Tyler Renelle
906932090f
Merge branch 'parties'
...
Conflicts:
src/app/helpers.coffee
src/app/scoring.coffee
2013-02-06 14:16:52 -05:00
Tyler Renelle
9854bc1a3c
some typo fixes
2013-02-06 14:12:05 -05:00
Tyler Renelle
7764447355
many fixes to party system actions causing dom refresh
2013-02-06 13:59:56 -05:00
Tyler Renelle
0e6d08e16b
add more debug tools, and email me on error
2013-02-06 02:44:42 -05:00
Tyler Renelle
a0c4480c53
cleanup, typos, html tidying
2013-02-06 01:59:02 -05:00
Tyler Renelle
427e2983cf
some setup and comments for unsubscribe, for when we get that fixed in
...
the future
2013-02-06 01:11:12 -05:00
Tyler Renelle
972a7af0ff
various fixes and page-refresh fallbacks
2013-02-06 00:47:08 -05:00
Tyler Renelle
6ce382af51
closure queries fully setup, but they break on page refresh. just
...
regenerate each time for now
2013-02-06 00:15:00 -05:00
Tyler Renelle
d8bc88dcb0
closure access to party and members query, setting up for
...
unsubscription / resubscription
2013-02-05 23:42:30 -05:00
Tyler Renelle
3d881ef373
bug fix on party leader leaving first
2013-02-05 22:27:19 -05:00
Tyler Renelle
77eb2d98e3
lastCron typo
2013-02-05 21:52:06 -05:00
Tyler Renelle
b6e7ebb6ca
proper accessControl testing of server routes, fix REST
2013-02-05 21:28:05 -05:00
Tyler Renelle
3ff08a49d2
fixing up permission system for API tokens & server-requests
2013-02-05 21:09:09 -05:00
Tyler Renelle
7607d162f8
remove all the debugger statements
2013-02-05 20:57:12 -05:00
Tyler Renelle
d3f8e361bf
better party-unlocked message
2013-02-05 20:48:43 -05:00
Tyler Renelle
63dc9c1305
only show party in menu if unlocked
2013-02-05 20:21:26 -05:00
Tyler Renelle
6d9f9367c7
move party suscriptions to separate function so we can re-activate
...
when party change
2013-02-05 20:21:05 -05:00
Tyler Renelle
fbeaabc7c0
sometimes model.session.userId is available, sometimes
...
model.get('_userId'). *sigh*
2013-02-05 19:25:46 -05:00
Tyler Renelle
2169cc6740
trying to subscribe to _party.members to update _partyMembers reference
2013-02-05 19:05:29 -05:00
Tyler Renelle
c1ac873ad5
pretty up the html a bit
2013-02-05 18:52:29 -05:00
Tyler Renelle
0505b3a4d7
typos
2013-02-05 18:23:56 -05:00
Tyler Renelle
98f1e0e690
bunch of model subscription fixes, mostly due to @lackac's racer
...
session fix
2013-02-05 18:12:39 -05:00
Tyler Renelle
966d81b9b8
some @WIP hacks on model subscriptions
2013-02-05 16:11:28 -05:00
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