Commit graph

1575 commits

Author SHA1 Message Date
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
Tyler Renelle
e51cf0089e typo test/api.mocha.coffee 2013-03-12 17:52:44 -07:00
Tyler Renelle
bb57eddec1 divide exp gain by 2, temporary hack since people are leveling way too
fast.
2013-03-12 10:05:18 -04:00
Tyler Renelle
a534eec548 [documentation] level 2 unlocks items 2013-03-10 12:21:30 -04:00
Tyler Renelle
c0c4ef141b Merge pull request #613 from kyokutei/master
Splash page rewritten
2013-03-10 09:18:22 -07:00
Tyler Renelle
4d5110c9d3 Merge pull request #627 from toebu/high-level-algo-fix
Changing expModifier and hpModifier algo to be less influenced by level....
2013-03-10 08:46:42 -07:00
Tyler Renelle
72e81b8891 #315 fixes: newValue not accessible at scope, only remove duff history
entries, not all
2013-03-10 11:40:58 -04:00
Tyler Renelle
0332ee7b48 Merge pull request #616 from MrConcept/fix
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
Tobias Leugger
cbbfdaa542 Changing expModifier and hpModifier algo to be less influenced by level. For high lvls (~50), you actually get HP instead of losing them with the current formula. This now doesn't happen anymore (at least for levels up to 100, which is the current max). 2013-03-09 20:14:42 +01:00
Tobias Leugger
9aac271b60 Improving readability of the statements for setting the colour of a task 2013-03-09 20:06:53 +01:00
Tyler Renelle
795aac8fcb Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-09 11:03:57 -05:00
Tyler Renelle
7904cd17b6 Merge branch 'master' into develop 2013-03-09 11:03:35 -05:00
Tyler Renelle
155747bfd0 fix to 401 user not found (can't use @byId) 2013-03-09 10:26:08 -05:00
Daniel Saewitz
9bd4f30375 Merge pull request #623 from arscan/develop
Add Task Delete to API
2013-03-09 06:28:18 -08:00
Daniel Saewitz
188e4ff271 Remove one id from array of typeIds instead of rewriting whole array 2013-03-09 09:14:07 -05:00
Zachary Kain
fd01da4f71 layer shaded box AND check on completed task 2013-03-09 02:10:33 -05:00
Rob Scanlon
2111cca09a Delete task for the API tests 2013-03-09 02:08:50 -05:00
Rob Scanlon
2b8f2f48c1 Delete task for the API 2013-03-09 02:08:20 -05:00
Zachary Kain
fb3cd788df remove body scrollbar, only on task lists 2013-03-09 01:51:39 -05:00
Zachary Kain
e5a893a710 revamp rewards and pets UI. Obv pets is temporary pending new pet system 2013-03-09 01:34:15 -05:00
Zachary Kain
f89037da53 new drag animation, tiny outline & shadow tweaks 2013-03-08 22:26:01 -05:00
Zachary Kain
5c4f400a2a refactor circle and checkmark. maybe better cross-browser 2013-03-08 21:01:04 -05:00
Zachary Kain
17dcb70e04 Merge remote-tracking branch 'upstream/develop' into ui-tweaks 2013-03-08 19:01:25 -05:00
Tyler Renelle
3407565d37 remove console.log(req.headers.origin) 2013-03-08 18:10:26 -05:00
Tyler Renelle
1ef32c771b remove console.log(req.headers.origin) 2013-03-08 18:10:12 -05:00
Tyler Renelle
023f8aeaad Merge branch 'origin-develop' 2013-03-08 18:05:06 -05:00
Tyler Renelle
399e4b9dda strange fix to CORS issue - move CORS middleware to top, respond with
200 if OPTIONS request
2013-03-08 18:04:57 -05:00
Tyler Renelle
1ddd06ce38 remove webkit-agent (thought i already did?) 2013-03-08 15:39:03 -05:00
Tyler Renelle
8cbf777232 allow OPTIONS, req.headers.origin || * 2013-03-08 15:34:37 -05:00
Tyler Renelle
5c7fdc7ff5 Merge branch 'origin-develop' 2013-03-08 14:33:40 -05:00
Tyler Renelle
75c1a38beb add x-api-user and x-api-key to accpeted headers 2013-03-08 14:33:19 -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