 Blade Barringer
|
0ccf07a4e0
|
Compile sprites
|
2015-10-08 17:32:34 -05:00 |
|
|
Blade Barringer
|
ccd77090f4
|
Fix css template for sprites
|
2015-10-08 17:31:32 -05:00 |
|
|
Sabe Jones
|
58801f5025
|
fix(world-boss): Don't repeat explanation
|
2015-10-08 13:17:49 -04: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 |
|
|
Sabe Jones
|
1d4536fc47
|
fix(sprites): Remove errant blob
|
2015-10-08 10:59:44 -05:00 |
|
|
Sabe Jones
|
c45736fc6f
|
Merge pull request #6024 from crookedneighbor/fix_world_dmg
Fix world dmg
|
2015-10-08 10:19:38 -05:00 |
|
|
Blade Barringer
|
36d471ddff
|
Correct module exports
|
2015-10-08 08:42:42 -05:00 |
|
|
Blade Barringer
|
5e10b8f4c9
|
Correct assinging of tavernQuest object when boss damage is calculated
|
2015-10-08 08:32:40 -05:00 |
|
|
Blade Barringer
|
9e88d17a78
|
Adjust tavern export to send over only quest object
|
2015-10-08 07:45:25 -05:00 |
|
|
Sabe Jones
|
aba3908170
|
chore(gulp): Compile sprites
|
2015-10-07 15:15:21 -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 |
|
|
Blade Barringer
|
2683b2b0a0
|
Use var to declare mongoose
|
2015-10-03 20:55:28 -05:00 |
|
|
Blade Barringer
|
62b15c4f48
|
Simplify background tests
|
2015-10-03 11:54:58 -05:00 |
|
|
Blade Barringer
|
cc579b97a3
|
Increase converage around egg content
|
2015-10-03 11:42:23 -05:00 |
|
|
Blade Barringer
|
04d3bf0f19
|
Refactor faq tests
|
2015-10-03 11:19:27 -05:00 |
|
|
Blade Barringer
|
b82123e1a2
|
Update food tests
|
2015-10-03 11:11:16 -05:00 |
|
|
Blade Barringer
|
7e080d5423
|
Expand hatching potions test
|
2015-10-03 11:08:03 -05:00 |
|
|
Blade Barringer
|
95a17f6fbb
|
Expand user defaults test
|
2015-10-03 11:04:04 -05:00 |
|
|
Blade Barringer
|
4b46a0e9fc
|
Convert other globals to exported functions
|
2015-10-03 10:48:42 -05:00 |
|
|
Blade Barringer
|
f9ee70e912
|
Increase max buffer for content tests
|
2015-10-03 10:47:26 -05:00 |
|
|
Blade Barringer
|
d4843d958d
|
Remove unneded function
|
2015-10-03 10:31:20 -05:00 |
|
|
Blade Barringer
|
8987645725
|
Export constants instead of putting them on global scope
|
2015-10-03 10:26:10 -05:00 |
|
|
Blade Barringer
|
3f6be30ebc
|
Simplify spell tests and test more attributes
|
2015-10-03 10:21:52 -05:00 |
|
|
Blade Barringer
|
6fdfe6c3bf
|
Correct spelling of canBuy
|
2015-10-03 09:59:40 -05:00 |
|
|
Blade Barringer
|
a492649f71
|
Simplify gear tests and test more items
|
2015-10-03 09:59:10 -05:00 |
|
|
Blade Barringer
|
8eadecdc1a
|
Improve testing around armor
|
2015-10-03 09:34:56 -05:00 |
|
|
Blade Barringer
|
393cc71309
|
Correct gold purchasable quests
|
2015-10-03 09:21:15 -05:00 |
|
|
Blade Barringer
|
495a3d3125
|
Add additional tests for quests
|
2015-10-03 09:21:06 -05:00 |
|
|
Blade Barringer
|
53a51ca3db
|
Create helper function for testing items in object
|
2015-10-03 09:00:06 -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 |
|
|
Blade Barringer
|
928e8478f7
|
Add coffeescript back in
|
2015-10-03 06:39:10 -05:00 |
|
|
Blade Barringer
|
655d8de7c8
|
chore(i18n): update locales
|
2015-10-02 22:28:12 -05:00 |
|
|
Blade Barringer
|
7a9bdfc9bf
|
Correct base sets
|
2015-10-02 22:26:51 -05:00 |
|
|
Sabe Jones
|
56419aee25
|
feat(content): October 2015 backgrounds
|
2015-10-02 16:13:11 -04:00 |
|
|
Blade Barringer
|
36cbca380e
|
Corrected order of backgrounds
|
2015-10-02 14:45:06 -05:00 |
|
|
Blade Barringer
|
bf7d6dddcc
|
chore(i18n): update locales
|
2015-10-02 11:41:57 -05:00 |
|
|
Blade Barringer
|
c6c159a44c
|
Add midnight shield back in
|
2015-10-02 11:40:42 -05:00 |
|
|
Blade Barringer
|
eb5e77cbb2
|
Fix locales for healAll
|
2015-10-02 10:34:54 -05:00 |
|
|
Blade Barringer
|
97ad1a8bb2
|
chore(i18n): update locales
|
2015-10-02 10:31:27 -05:00 |
|
|
Blade Barringer
|
339ab9e507
|
correct key to use mispelled version :/
|
2015-10-02 10:11:20 -05:00 |
|
|
Blade Barringer
|
5a7662db09
|
Merge pull request #5976 from crookedneighbor/refactor-content
Refactor Content Files
|
2015-10-02 08:55:10 -05:00 |
|
|
Blade Barringer
|
a6453fec71
|
Merge pull request #6000 from Gondulf/develop
Issue #5928 - Replaced 'link' with actual URL in faq.json
|
2015-10-02 08:40:13 -05:00 |
|
|
Damien Gourbiere
|
17eff9ed84
|
Issue #5928 - Replaced 'link' with actual URL in faq.json
|
2015-10-02 08:56:25 -04:00 |
|