krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,602 Commits 63 Branches 1,225 Tags
2a7dfe09a077dd979acf61f5b65b2b5382f355cc
Commit Graph

429 Commits

Author SHA1 Message Date
Blade Barringer
2a7dfe09a0 Move user can own quest categories constant to constants module. 2015-11-15 12:27:16 -06:00
Blade Barringer
40cee42e03 Remove unneeded return statement 2015-11-15 11:04:17 -06:00
Blade Barringer
6ec864ea4e Remove unused src files in content directory 2015-11-15 11:03:30 -06:00
Blade Barringer
1a31c26330 Add item list to common constants module 2015-11-15 11:03:17 -06:00
Blade Barringer
411946e487 Modularize mystery sets 2015-11-15 10:08:40 -06:00
Blade Barringer
600f3e4554 Extract classes, events and gearTypes into constants file. 2015-11-15 09:47:06 -06:00
Blade Barringer
b13b2d0f62 Remove coffee content index file 2015-11-15 09:28:26 -06:00
Blade Barringer
e5d99ce271 Convert common files to es2015. 2015-11-15 08:16:55 -06:00
Blade Barringer
5ebead68ab Remove coffee version of i18n 2015-11-11 21:24:21 -06:00
Blade Barringer
774a42d67e Convert coffee files to JS 2015-11-11 20:32:00 -06:00
Sabe Jones
83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-11-11 18:36:25 -05:00
Sabe Jones
eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones
6b3fcd3d11 fix(content): Correct stats for Royal Robes 
...in newtype content file
 2015-11-02 17:34:59 -05:00
Sabe Jones
510080325d fix(content): Correct missing Armoire items 
...in newstyle content files
 2015-11-02 17:33:03 -05:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Sabe Jones
9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Alys
fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09:00
Alys
8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09:00
Blade Barringer
391e09dd33 Fix auto-redirect 2015-10-30 22:28:11 -05:00
Alys
154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys
34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10:00
Alys
161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer
dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Blade Barringer
6ff904bd5a Merge branch 'develop' into czan-develop 2015-10-29 08:40:03 -05:00
Matteo Pagliazzi
01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Carlo Zancanaro
4d6bd38648 Add GET routes for /user/tags and /user/tags/{id} 
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.

This commit also includes tests for the two new routes.
 2015-10-27 13:49:17 +11:00
Sabe Jones
392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Ricardo Mendes
5e3f46d786 Checks user auto-equip preference in buy function 2015-10-19 05:52:46 +00:00
Blade Barringer
dbc9c5a48c Merge pull request #6008 from locks/patch-1 
Typo in comment string
 2015-10-18 15:29:29 -05:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount 
Jack-O'-Lantern mounts
 2015-10-14 16:46:55 -05:00
Sabe Jones
825b316ba8 fix(analytics): Cap progressUp 
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
 2015-10-13 14:27:16 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Blade Barringer
02133600ce Add ios question to content 2015-10-12 07:40:31 -05:00
Alys
20415da586 Merge pull request #6018 from dcecile/develop 
Issue #2606 - Verify/fix indices during sortTask
 2015-10-09 21:30:14 +10:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss 
Fall 2015 World Boss
 2015-10-08 11:15:00 -05:00
Dan Cecile
22284bbc24 Issue #2606 - Verify/fix indices during sortTask 
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
 2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy 
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
 2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards 
Also finishes out written story content.
 2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c fix(world-boss): Pass test 
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
 2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf WIP(world-boss): Initial stats outlay 
Also quest reward sprites, groundwork for world damage, and partial content build.
 2015-10-05 16:59:19 -04:00
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510 
October 2015 backgrounds
 2015-10-05 11:29:44 -05:00
Alys
f035dfd8b9 fix "Advanced Options in tasks start collapsed" when "Open new tasks in edit mode" is on - fixes https://github.com/HabitRPG/habitrpg/issues/5981 2015-10-05 19:37:53 +10:00
Ricardo Mendes
f29f3a6b0e typo 2015-10-04 13:34:22 +01:00
Blade Barringer
393cc71309 Correct gold purchasable quests 2015-10-03 09:21:15 -05:00
Blade Barringer
36d7c59a0c Add backgrounds to content file 2015-10-03 06:49:14 -05:00
Blade Barringer
6dbfbeec81 Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510 2015-10-03 06:40:50 -05:00