Commit Graph

2746 Commits

Author SHA1 Message Date
Tyler Renelle 30da33d2f0 Merge pull request #1424 from lefnire/paglias/inventory
Inventory (no market)
2013-09-04 10:23:36 -07:00
Tyler Renelle 6b338da1f9 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-04 13:14:05 -04:00
Tyler Renelle 41255dcc20 groups: return group members on chat 2013-09-04 13:13:43 -04:00
Tyler Renelle d7c6c15592 some more bailey updates 2013-09-04 13:13:23 -04:00
Matteo Pagliazzi 6b4d3db6bb delete old pets.html 2013-09-04 19:09:48 +02:00
Matteo Pagliazzi ced69cb4d5 working inventory 2013-09-04 19:06:31 +02:00
Matteo Pagliazzi c35395d1ef add .nodemonignore to avoi restarting the server when client-side files change 2013-09-04 17:30:28 +02:00
Matteo Pagliazzi a5e8817c85 initial inventory 2013-09-04 17:13:42 +02:00
Tyler Renelle 53fdca2f5c fix API toNextLvl & maxHealth 2013-09-04 10:19:55 -04:00
Tyler Renelle 6e33878d07 Merge pull request #1420 from lefnire/paglias/optimizations
Optimizations
2013-09-04 07:12:38 -07:00
Matteo Pagliazzi 16bc90acb1 remove moment and lodash, using from habitrpg-shared 2013-09-04 13:15:13 +02:00
Matteo Pagliazzi cb350338ed manage local js with connect-assets 2013-09-04 12:54:15 +02:00
Tyler Renelle f69abe4ca0 Merge pull request #1409 from lefnire/paglias/pets
Stable
2013-09-03 21:49:26 -07:00
Tyler Renelle 4333d055e5 auth bug fixes 2013-09-04 00:20:49 -04:00
Tyler Renelle 8e75ecf7cc show facebook registration error 2013-09-03 23:45:57 -04:00
Tyler Renelle 466c727d4e rewrite: facebook auth bug fixes. still not ideal solution, but it works
for now
2013-09-03 23:40:27 -04:00
Tyler Renelle ceae8bf768 rewrite: start adding facebook auth. note, this isn't going to work properly due to issues outlined in http://stackoverflow.com/questions/14572600/passport-js-restful-auth . gotta figure something out here... 2013-09-03 23:20:31 -04:00
Tyler Renelle e43740e939 update bailey notif 2013-09-03 20:08:49 -04:00
Tyler Renelle 5f2405a3f4 fix to #1401 "add task to empty list" 2013-09-03 19:48:10 -04:00
Tyler Renelle e5bafe7f0b rewrite: 2-week session instead of 1h 2013-09-03 19:22:16 -04:00
Tyler Renelle 16ee1c1d65 misc bug fixes 2013-09-03 19:11:52 -04:00
Tyler Renelle 6cd6c55e87 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-03 18:55:20 -04:00
Tyler Renelle c2829382e8 small bailey pudate 2013-09-03 18:53:50 -04:00
Tyler Renelle eea9b05468 Merge pull request #1413 from lefnire/paglias/new-shared-paths
New path for habitrpg-shared
2013-09-03 09:31:47 -07:00
Matteo Pagliazzi dc96a97fe2 new path for habitrpg-shared 2013-09-03 17:12:17 +02:00
Matteo Pagliazzi b69ce1b5d6 remove tooltip from rare pet 2013-09-03 12:08:54 +02:00
Matteo Pagliazzi e41efa98e4 working stable 2013-09-03 12:05:54 +02:00
Matteo Pagliazzi 3fd290a3e1 non working stable choosePet 2013-09-03 10:32:06 +02:00
Tyler Renelle 3417e3a76b some NPC wording updates 2013-09-02 21:44:00 -04:00
Tyler Renelle 80fd023012 use cookieSession so we can launch in production mode 2013-09-02 21:38:05 -04:00
Tyler Renelle d70c2c4040 coming soon notes 2013-09-02 20:16:08 -04:00
Tyler Renelle 393e40b763 rewrite: re-sync changes on page reload 2013-09-02 19:38:08 -04:00
Tyler Renelle 62a10d4b28 cleanup 2013-09-02 19:03:45 -04:00
Tyler Renelle 4790e8442a fix up general bailey notifs 2013-09-02 17:31:44 -04:00
Tyler Renelle 7f68fd017a rewrite: add big update notification, small bug fixes 2013-09-02 17:15:12 -04:00
Tyler Renelle 36e6772967 temp fix to #1388 2013-09-02 16:19:49 -04:00
Tyler Renelle 5fd095165d temp fix to #1388 2013-09-02 15:54:32 -04:00
Tyler Renelle 687da68d52 rewrite: add read-only inventory. fix empty pet issue, it was the wrong
casting type UserSchema.items.eggs.type
2013-09-02 14:26:59 -04:00
Tyler Renelle 8482439617 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-02 12:05:46 -04:00
Tyler Renelle 67975aa581 Merge pull request #1385 from paglias/enable-rest-rewrite
Enable resting on rewrite
2013-09-02 09:05:20 -07:00
Matteo Pagliazzi ddd312d530 enable rest 2013-09-02 15:47:44 +02:00
Tyler Renelle b470abb441 small static-pages tweaks 2013-09-02 01:20:43 -04:00
Tyler Renelle fe794b7344 Merge pull request #1384 from ezinaz/angular_rewrite
Updated README with Windows installation details
2013-09-01 22:17:14 -07:00
Tyler Renelle ef9e1f3444 rewrite: push login modal to the front page, don't allow anonymous
usage.
2013-09-02 01:08:28 -04:00
ezinaz ebc5b63537 Updated README with Windows installation details
Good for getting Windows developers up and running quickly
2013-09-01 21:11:44 -07:00
Tyler Renelle 3bd6771687 fix "already pending invite" 2013-09-01 23:07:50 -04:00
Tyler Renelle 834e2438b9 add a search option on guilds page 2013-09-01 22:32:32 -04:00
Tyler Renelle 34d5e364fa remove unecessary amazon stuff 2013-09-01 22:14:07 -04:00
Tyler Renelle 4862968925 groups: proper joining & leaving groups 2013-09-01 22:08:01 -04:00
Tyler Renelle f5f6c957de groups: try to update GroupsCtrl scope to notify of joined / left
groups, not working
2013-09-01 21:31:38 -04:00