Commit graph

25747 commits

Author SHA1 Message Date
Tyler Renelle
75c1a38beb add x-api-user and x-api-key to accpeted headers 2013-03-08 14:33:19 -05:00
Tyler Renelle
e280be3f62 gut old pet images, now we're using sprites. begin on new items.pets[] structure 2013-03-08 13:01:29 -05:00
Daniel Saewitz
f71e2fbade Working... in progress 2013-03-08 12:55:04 -05:00
Daniel Saewitz
510bcda47c wip 2013-03-08 12:44:21 -05:00
Tyler Renelle
b3247e32d0 add . to player / pet sprite classes 2013-03-08 12:21:59 -05:00
Daniel Saewitz
e555271a70 Merge branch 'pet+player_css' of github.com:Pandoro/habitrpg into inventory 2013-03-08 12:17:43 -05:00
Daniel Saewitz
d17de8c5c9 Enable drops at level 4 2013-03-08 12:16:44 -05:00
Daniel Saewitz
9a06f5d6c3 Add inventory tab 2013-03-07 23:23:18 -05:00
Philip How
b6a7d63c21 changed migration comment 2013-03-08 00:23:08 +00:00
Philip How
24c7677764 Migration script for removing old dailies histories 2013-03-08 00:20:46 +00:00
Philip How
50c5069224 notifications tweak and history fix 2013-03-08 00:10:11 +00:00
kyokutei
84f046024e Updated public/splash.html 2013-03-07 13:08:36 -08:00
Tyler Renelle
354ed148f4 Merge branch 'origin-develop' 2013-03-07 14:31:43 -05:00
Tyler Renelle
1fadb7955a add exp overflow migration 2013-03-07 14:28:24 -05:00
Tyler Renelle
eba727249e add find_unique_user script for lost user accounts (https://github.com/lefnire/habitrpg/wiki/User-ID) 2013-03-07 13:40:04 -05:00
Tyler Renelle
36677c0585 Merge branch 'origin-develop' 2013-03-07 13:16:54 -05:00
Tyler Renelle
05bd0fdd52 semi-colons 2013-03-07 13:16:47 -05:00
Tyler Renelle
63c00a7261 add @MrConcepts normalization migration for busted busted values, and
in preparation for another big algorithm upgrade
2013-03-07 12:53:45 -05:00
Daniel Saewitz
d5b3d89a73 Rename user.stats.tnl to user.stats.toNextLevel 2013-03-06 23:50:19 -05:00
Daniel Saewitz
c9822efbf8 Fix broken tnl test 2013-03-06 23:50:16 -05:00
Tyler Renelle
ac419e7813 add default numbers for restore tool if one isn't provided: #594 2013-03-06 23:50:06 -05:00
Tyler Renelle
5b0dd6f797 Merge pull request #607 from switz/api-alg
@lefnire => Fix broken tnl test
2013-03-06 19:00:18 -08:00
Daniel Saewitz
7cb291c4de Rename user.stats.tnl to user.stats.toNextLevel 2013-03-06 20:39:48 -05:00
Daniel Saewitz
5141aeda78 Fix broken tnl test 2013-03-06 19:59:19 -05:00
Tyler Renelle
75aadf6eb1 add default numbers for restore tool if one isn't provided: #594 2013-03-06 13:32:10 -05:00
Tyler Renelle
db805b6388 Merge pull request #592 from aaron4/patch-1
Added space after each line of text (privacy.html)
2013-03-06 10:11:01 -08:00
Tyler Renelle
467cbfba64 Merge pull request #593 from aaron4/patch-2
Added space after each line of text (terms.html)
2013-03-06 10:09:42 -08:00
Tyler Renelle
1ecebe4cbb Merge branch 'master' into origin-develop 2013-03-06 12:48:48 -05:00
Tyler Renelle
f602f69893 Merge pull request #604 from MrConcept/algos
New Algorithms + fixes
2013-03-06 09:46:14 -08:00
Philip How
0dbf2257d7 New Algorithms + fixes 2013-03-06 17:02:08 +00:00
Tyler Renelle
722b5c7640 Merge pull request #601 from switz/api-alg
Add 'To next level' to user stats on API
2013-03-06 07:19:22 -08:00
Daniel Saewitz
5a1343a3b7 Set maxHealth to 50 2013-03-06 09:11:14 -05:00
Daniel Saewitz
ef7d705059 Add to next level to user stats on API 2013-03-06 08:45:51 -05:00
Zachary Kain
8008b71ecd make everything a bit bigger, better on mobile 2013-03-06 02:16:51 -05:00
Zachary Kain
5ac7403241 add scrollbars 2013-03-06 01:58:07 -05:00
Zachary Kain
81a527e5d6 android mobile bugfixes 2013-03-06 01:29:13 -05:00
Zachary Kain
f0462d022f style Todo tabs, misc stuff 2013-03-06 01:15:45 -05:00
Zachary Kain
456580e352 gut & re-style Task Options, only Rewards tasks & options left to go through 2013-03-06 00:50:39 -05:00
Zachary Kain
84e07a0317 better a11y than display:none 2013-03-06 00:50:39 -05:00
Zachary Kain
174c7a8b9f tweaks, most notably DISABLE CHART BUTAN 2013-03-06 00:50:39 -05:00
Zachary Kain
fd216719c3 allow task text to word-wrap and be padded from element edge 2013-03-06 00:50:39 -05:00
Zachary Kain
ce19fed852 remove responsive from bootstrap includes. Rolling our own! 2013-03-06 00:50:38 -05:00
Tyler Renelle
27ce1b050b try x-requested-with for CORS 2013-03-05 23:05:59 -05:00
Tyler Renelle
bffe0a520e Merge branch 'develop' into zakkain-ui-tweaks 2013-03-05 21:41:19 -05:00
Tyler Renelle
b6564828ce use different rewards selector for items-unlocked popover, wasn't getting it 2013-03-05 21:41:01 -05:00
Tyler Renelle
44714bcc5b comment out webkit-devtools-agent - only for my pesronal use, really 2013-03-05 20:35:13 -05:00
Zachary Kain
a002932210 re-add Lato webfont 2013-03-05 20:29:20 -05:00
Tyler Renelle
7e304afc54 upgrade bootstrap 2013-03-05 20:23:31 -05:00
Zachary Kain
16bba9461c add the bootstrap update 2013-03-05 20:21:17 -05:00
Tyler Renelle
4f6a78c0ae add help popover to difficulty 2013-03-05 20:12:09 -05:00