Commit graph

271 commits

Author SHA1 Message Date
Tyler Renelle
9250b8b2b5 some more fixes on "nextItem" 2013-02-08 12:50:37 -05:00
Tyler Renelle
1bcd4a3fbd some more half-backed changes for the new customization engine 2013-02-08 01:04:38 -05: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
1aa047d163 remove debuggging buttons 2013-02-06 15:05:14 -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
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
972a7af0ff various fixes and page-refresh fallbacks 2013-02-06 00:47:08 -05:00
Tyler Renelle
63dc9c1305 only show party in menu if unlocked 2013-02-05 20:21:26 -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
c1ac873ad5 pretty up the html a bit 2013-02-05 18:52:29 -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
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
72cefaf787 Merge pull request #304 from Sabin144/master
Fix for #47
2013-02-04 15:59:57 -08: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
57a7edc5d3 rename everything "friends" to "party", since we may use friends for
following/followers feature
2013-02-04 14:10:20 -05:00
Sabin144
e4d43846f6 Update views/app/index.html 2013-02-04 00:25:46 -05:00
Tyler Renelle
86ea99c2dc add "emulate next day" debugging button 2013-02-01 14:05:52 -05:00
Zachary Kain
791a19893c change the logic dictating change in bar size from if parties enabled to having party members 2013-01-30 22:25:20 -05:00
Tyler Renelle
7a478ab6cd fix to username, apply to main user 2013-01-30 21:22:38 -05:00
Tyler Renelle
d2c5506234 show friend modal for non logged in user 2013-01-30 20:54:34 -05:00
Tyler Renelle
a6ac1b0ce8 view.fn on specific user paths, getting errors otherwise 2013-01-30 18:57:46 -05:00
Tyler Renelle
e8ac4dcf86 unlock the party system at level 3, view.fn 'userName' 2013-01-30 18:22:52 -05:00
Tyler Renelle
c4526b3a37 fixes to html to include friend stuff 2013-01-30 17:49:21 -05:00
Tyler Renelle
fcadcb000f convert armor model.fn to a view.fn, so we can use on party too 2013-01-30 17:41:06 -05:00
Tyler Renelle
519dcf256e reactive model fucntion seems to bust the app, may need to send to use
model.subscribe on get '/' and redirect on friend-add
2013-01-30 17:14:55 -05:00
Tyler Renelle
57ab186a62 begin party subscription & view 2013-01-30 16:52:31 -05:00
Tyler Renelle
b896865865 v1 api using api token 2013-01-30 16:01:16 -05:00
Tyler Renelle
52b2532b5a armorset (v1 or v2) settings for females 2013-01-30 13:29:59 -05:00
Tyler Renelle
0e01160ee4 add setting for male / female 2013-01-30 13:25:10 -05:00
Tyler Renelle
466256f793 lotsa changes! renaming male/female icons, fix tnl & current armor
refresh bug, model function for current armor (female pending)
2013-01-30 13:03:10 -05:00
Tyler Renelle
371b532e70 remove mailing list alert 2013-01-30 12:19:10 -05:00
Tyler Renelle
bb4fa87f4a use data-targets instead of hrefs for modal links. fixes mobile 2013-01-29 00:50:36 -05:00
Tyler Renelle
4fae8f05a4 move flash error down below header 2013-01-28 23:56:44 -05:00
Tyler Renelle
d7e28ea07f some tweaks to last merge 2013-01-28 20:09:57 -05:00
Tyler Renelle
c2cd3d8498 Merge pull request #227 from SlappyBag/master
Static Header & Popups
2013-01-28 17:06:50 -08:00
Stan Lindsey
da3c0f1a2d All popups on left 2013-01-26 13:15:57 +00:00
Tobias Leugger
b697e7bdf1 Getting rid of the completedList and completedIds, instead only
using the 'completed' attribute of the todo task. This fixes some
issues were a task was at the same time in the todoIds and
completedIds.
2013-01-26 11:33:51 +01:00
Tyler Renelle
d4c2d274ba list item typo 2013-01-23 19:49:40 -05:00
Tyler Renelle
9051f2e40c more links 2013-01-23 19:39:32 -05:00
Tyler Renelle
e0d3df831b new footer links 2013-01-23 15:09:30 -05:00