Commit graph

25741 commits

Author SHA1 Message Date
Daniel Saewitz
f9ab61178b Cleanup 2013-03-16 15:17:55 -04:00
Daniel Saewitz
1a1144b3cc If the user selects an already selected pet, deselect it 2013-03-16 15:10:50 -04:00
Daniel Saewitz
6d34fa8953 Highlight active pet 2013-03-16 15:09:16 -04:00
Daniel Saewitz
419351494c Clean up helpers + choose Pet 2013-03-16 14:58:09 -04:00
Tyler Renelle
14a892043a add some api comments (just so i can visually separate the functions
for now)
2013-03-16 11:50:02 -04:00
Daniel Saewitz
2ffe0aecf9 FeedEgg 2013-03-16 11:18:27 -04:00
Tyler Renelle
48cbe7c383 Merge branch 'master' into develop
Conflicts:
	views/app/settings.html
2013-03-15 18:40:21 -04:00
Tyler Renelle
545e5fc2a4 allow manually unlocking party system 2013-03-15 18:39:39 -04:00
Tyler Renelle
14babdbf24 remove snark 2013-03-15 18:26:56 -04:00
Tyler Renelle
4ec94e4ed8 remove snark 2013-03-15 18:26:40 -04:00
Tyler Renelle
368748b67a add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:59:15 -04:00
Tyler Renelle
7a7c96ca57 add change for mutlipel subdomain GA tracking 2013-03-15 17:59:10 -04:00
Tyler Renelle
6c61c0f7db add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:58:37 -04:00
Tyler Renelle
566f1aa230 add change for mutlipel subdomain GA tracking 2013-03-15 17:47:42 -04:00
Tyler Renelle
37901ef4f4 move settings and API into tabs 2013-03-15 17:31:07 -04:00
Tyler Renelle
281502499b add toggle header to settings dialog 2013-03-15 17:31:03 -04:00
Tyler Renelle
325d906708 begin adding toggle-header 2013-03-15 17:30:59 -04:00
Tyler Renelle
054cf03614 update comment 2013-03-15 17:30:55 -04:00
Tyler Renelle
b7425f4964 move party stats to a modal 2013-03-15 17:30:50 -04:00
Tyler Renelle
174a0d2362 cleaner view.fn "tnl" 2013-03-15 17:30:46 -04:00
Tyler Renelle
7f93b525c0 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
Tyler Renelle
3fa6aaceed add 'show helm' option 2013-03-15 17:20:15 -04:00
Tyler Renelle
f2faf8c968 add 'show helm' option 2013-03-15 17:20:01 -04:00
Tyler Renelle
a363062fc0 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-15 16:58:21 -04:00
Tyler Renelle
12274e2f34 move settings and API into tabs 2013-03-15 16:58:07 -04:00
Tyler Renelle
ae96dc8ddb add toggle header to settings dialog 2013-03-15 16:53:39 -04:00
Tyler Renelle
823f524d57 begin adding toggle-header 2013-03-15 16:47:48 -04:00
Tyler Renelle
60fc0c9e78 Merge pull request #662 from zakkain/ui-tweaks
Firefox Critical Hotfix
2013-03-15 09:27:49 -07:00
Tyler Renelle
d8918790e5 update comment 2013-03-15 12:27:22 -04:00
Tyler Renelle
a7de94f180 move party stats to a modal 2013-03-15 12:24:30 -04:00
Zachary Kain
f8a8a5e492 Merge branch 'develop' of github.com:lefnire/habitrpg into ui-tweaks 2013-03-15 12:23:47 -04:00
Zachary Kain
eeec3cf1bc FIX Firefox task hover checkbox bug 2013-03-15 12:21:27 -04:00
Zachary Kain
916ac57917 FIX Firefox outline freakout on tasks 2013-03-15 12:18:57 -04:00
Zachary Kain
a4efbe34df Merge branch 'master' of github.com:lefnire/habitrpg into ui-tweaks 2013-03-15 12:09:35 -04:00
Tyler Renelle
b76b1a33f5 cleaner view.fn "tnl" 2013-03-15 12:06:38 -04:00
Tyler Renelle
d2837afbd4 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
Tyler Renelle
2f372124b3 start moving javascript loading functionality back to <Scripts:> so we
can utilize CDNs
2013-03-15 11:15:35 -04:00
Tyler Renelle
565c9004ca Merge branch 'master' into develop 2013-03-15 10:41:57 -04:00
Tyler Renelle
1e5ec6f176 Merge pull request #660 from Shaners/master
Pet Egg Sprite Sheet and CSS
2013-03-15 07:40:22 -07:00
Shane Lister
644a23cc57 Pet Egg Sprite Sheet and CSS 2013-03-14 21:57:08 -07:00
Shane Lister
b3a031bee5 Merge pull request #3 from lefnire/master
Update this branch
2013-03-14 18:14:38 -07:00
Tyler Renelle
646deb2cdd protocol-agnostic fonts 2013-03-14 15:51:29 -04:00
Tyler Renelle
3f251c4b32 Merge pull request #624 from zakkain/ui-tweaks
Time to update the dev preview again!
2013-03-14 11:38:06 -07:00
Tyler Renelle
905719725e use Unroll-Me/derby#master 2013-03-14 14:17:10 -04:00
Daniel Saewitz
f991e2a965 Persist 2013-03-13 13:01:39 -04:00
Daniel Saewitz
3d5e3c7743 Fix modals 2013-03-13 11:47:37 -04:00
Daniel Saewitz
4485d226e8 1% chance on every score to get an item 2013-03-13 11:37:06 -04:00
Daniel Saewitz
c83da2ae79 Merge branch 'develop' of github.com:lefnire/habitrpg into inventory 2013-03-13 06:15:17 -04:00
Tyler Renelle
e51cf0089e typo test/api.mocha.coffee 2013-03-12 17:52:44 -07:00
Tyler Renelle
f98a303475 move more scoring functionality into shared. on the web side, we'll
run the batch user object through thse functions, clone at the end,
then set, commit()
2013-03-12 18:10:16 -04:00