 Tyler Renelle
|
883d63aaaf
|
[#1426] final touches to bailey notifs.
|
2013-09-06 01:05:23 -04:00 |
|
|
Tyler Renelle
|
4ea6a8e57f
|
[#1439] target='_blank' on links
|
2013-09-06 00:39:29 -04:00 |
|
|
Tyler Renelle
|
56d44887d4
|
[#1439] add highlight back in for chat. use ngSanitize linky to add links in chat
|
2013-09-06 00:36:05 -04:00 |
|
|
Tyler Renelle
|
ef69309b0c
|
[#1431] add temporary server-based pet-purchasing mechanism. Lotsa cleanup /
refactoring to be had here
|
2013-09-06 00:28:18 -04:00 |
|
|
Tyler Renelle
|
812ba3a339
|
[#1430] fix guild gems (math error)
|
2013-09-05 23:28:30 -04:00 |
|
|
Tyler Renelle
|
9da6ddc7c7
|
Merge pull request #1431 from lefnire/paglias/market
Market (not working)
|
2013-09-05 20:18:57 -07:00 |
|
|
Tyler Renelle
|
1359de0a90
|
[#1398] add facebook registration
|
2013-09-05 23:14:25 -04:00 |
|
|
Tyler Renelle
|
ab756a8634
|
#1422 force ssl
|
2013-09-05 22:53:35 -04:00 |
|
|
Tyler Renelle
|
86552c9296
|
Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite
|
2013-09-05 22:33:41 -04:00 |
|
|
Tyler Renelle
|
336c147dcb
|
#1398 some more hackery to handling facebook auth. I really don't like
this client-side return approach, but it's probably the only thing we
can do sans a stateful server, which we're trying to avoi
|
2013-09-05 22:33:31 -04:00 |
|
|
Tyler Renelle
|
d1aec6636d
|
Merge pull request #1435 from Shaners/patch-1
Update game-pane.styl
|
2013-09-05 09:19:44 -07:00 |
|
|
Shane Lister
|
66182d9cdc
|
Update game-pane.styl
This had been bugging me...
Adds a 5px space between chat labels and chat text. Untested so probably should double check it first.
|
2013-09-05 09:17:41 -07:00 |
|
|
Matteo Pagliazzi
|
9c6d4deb85
|
minor fix
|
2013-09-05 16:07:19 +02:00 |
|
|
Matteo Pagliazzi
|
bb4c0d2d69
|
non working market
|
2013-09-05 15:35:34 +02:00 |
|
|
Matteo Pagliazzi
|
f7d1159e06
|
fix inventory bugs
|
2013-09-05 14:26:35 +02:00 |
|
|
Tyler Renelle
|
512e891dc3
|
add cerberus to pets
|
2013-09-04 23:03:20 -04:00 |
|
|
Tyler Renelle
|
9a99cd430d
|
rewrite: save task.tags
|
2013-09-04 17:54:07 -04:00 |
|
|
Tyler Renelle
|
2f3da075f8
|
revive button name conflict! We gotta do somethign about shared/helpers
exposed to the view
|
2013-09-04 15:50:26 -04:00 |
|
|
Tyler Renelle
|
7c6174e218
|
Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite
|
2013-09-04 13:23:58 -04:00 |
|
|
Tyler Renelle
|
30da33d2f0
|
Merge pull request #1424 from lefnire/paglias/inventory
Inventory (no market)
|
2013-09-04 10:23:36 -07:00 |
|
|
Tyler Renelle
|
2d53844984
|
add note about populate + match in chatc
|
2013-09-04 13:22:22 -04: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 |
|