Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,638 Commits 64 Branches 1,256 Tags
a1e48eadd1e6c30f38ae6d79cfc7bbe0216a2fb3
Commit Graph

1638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer a1e48eadd1 Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954 
Conflicts:
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.png
	dist/spritesmith3.png
	dist/spritesmith4.png
	dist/spritesmith5.png
 2014-12-30 14:47:22 -06:00
Blade Barringer f205a28be0 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-30 11:34:01 -06:00
Blade Barringer 7c027f4c8b Updated compiled habitrpg-shared.js 2014-12-30 11:33:27 -06:00
Saagar Saini 1226c60dd9 Ski-sassin parka description added 2014-12-30 22:32:48 +05:30
Shared 7facfd1b84 Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes 2014-12-30 22:28:46 +05:30
Matteo Pagliazzi 8a8e71394c Update README.md 2014-12-30 16:13:09 +01:00
Blade Barringer 2b7a22b2d2 Changed coverage command so that it would automatically open up the html 
file on finish. Closes #174
 2014-12-30 06:56:51 -06:00
Blade Barringer 486bd72fb0 Merge branch 'develop' into Feriority-coverage 2014-12-30 06:47:13 -06:00
Blade Barringer 5f66738305 Merge branch 'coverage' of https://github.com/Feriority/habitrpg-shared into Feriority-coverage 2014-12-30 06:47:01 -06:00
Blade Barringer 23de3eeff8 Corrected grammar to use a ; in stead of a , 2014-12-30 06:44:10 -06:00
Blade Barringer 3b5a2f925e Removed unused translation string 2014-12-30 06:36:29 -06:00
Blade Barringer 8603c1d451 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-30 06:35:05 -06:00
Matteo Pagliazzi 055f8b2e79 Merge branch 'crookedneighbor-fix-tests' into develop 2014-12-30 11:43:42 +01:00
Matteo Pagliazzi 0e266f917e fix(tests) 2014-12-30 11:43:25 +01:00
Matteo Pagliazzi d054d4418b Merge branch 'fix-tests' of git://github.com/crookedneighbor/habitrpg-shared into crookedneighbor-fix-tests 2014-12-30 11:31:47 +01:00
Blade Barringer 627a9af3b9 Compiled css and images for cyrstal armor (shop). Closes #180 2014-12-29 23:04:30 -06:00
Blade Barringer aca7a039c4 Updated crystal armor 2014-12-29 22:51:06 -06:00
Blade Barringer e2e3b3944b Compiled hydra pet and css. Closes #272 2014-12-29 22:41:08 -06:00
Blade Barringer a80e0322ee Updated hydra pet to use standard pet dimensions 2014-12-29 22:19:24 -06:00
Blade Barringer c7c35e4d64 Merge pull request #420 from crookedneighbor/octo-fix 
Octo fix
 2014-12-29 22:13:24 -06:00
Blade Barringer 63ddd819f7 Compiled spritesheet for octopi 2014-12-29 22:10:11 -06:00
Blade Barringer 2a3f2504f0 Updated image sprites for octopi 2014-12-29 22:07:21 -06:00
Blade Barringer 953302c008 Corrected type 2014-12-29 21:54:13 -06:00
Blade Barringer 5279a81033 Again, user needs to have hp = 0 for revive function to work correctly 2014-12-29 21:46:41 -06:00
Blade Barringer a4d68431d4 User must have 0 HP for revive function to work 2014-12-29 21:40:35 -06:00
Blade Barringer f9c5b3b0ae Updated quest test to only check on item drops if item drops exist (Basi 
list was causing it to fail)
 2014-12-29 21:23:30 -06:00
Matteo Pagliazzi e93754e50b Merge pull request #414 from Verabird/dateformat 
Dateformat
 2014-12-29 21:23:29 +01:00
Alice Harris ba9a10f688 Merge pull request #408 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:46:32 +10:00
Alice Harris 5e168c41ce Merge pull request #305 from Alys/deathGear-Sep10 
prevent off-class items and free items being lost on death
 2014-12-27 08:31:50 +10:00
Alice Harris 9d8a234fe1 update dist/habitrpg-shared.js 2014-12-27 08:02:14 +10:00
Alice Harris 7d74f36466 improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155 2014-12-27 07:28:06 +10:00
Alice Harris 71269a762f reinsert comment that was accidentally removed 2014-12-27 07:28:06 +10:00
Alice Harris 8678e10958 improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925 2014-12-27 07:28:06 +10:00
Alice Harris 27ef50fe26 fix typo in comment characters - sorry for commit spam 2014-12-27 07:28:05 +10:00
Alice Harris ac233a2b04 update death "doesn't break unbreakables" test to match the new code behaviour 2014-12-27 07:28:05 +10:00
Alice Harris 0391d1afc4 add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :) 2014-12-27 07:28:05 +10:00
Alice Harris abc2f59b57 allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss 2014-12-27 07:28:05 +10:00
Alice Harris d7f9760c0f fix typo so that Ryan doesn't make pointed comments at me 2014-12-27 07:28:05 +10:00
Alice Harris 87f51913d0 prevent off-class items and free items being lost on death 2014-12-27 07:28:05 +10:00
Verabird baa528fe7b Add dateFormat phrase for translation 2014-12-26 15:48:20 -05:00
Verabird a3f0d4dea5 Add default values for shortdate and mediumdate formats 2014-12-26 15:48:19 -05:00
Matteo Pagliazzi 971ea8a495 chore(i18n): update locales 2014-12-26 11:33:21 +01:00
Sabe Jones 2cac24ebe9 chore(grunt): grunt full 2014-12-25 18:09:29 -06:00
Sabe Jones 37db763fc2 fix(event): Mystery sprite error 2014-12-25 18:08:14 -06:00
Sabe Jones 6c8f9e39b6 fix(event): Mystery typo 2014-12-25 18:05:04 -06:00
Sabe Jones 620fcd1144 Merge pull request #413 from SabreCat/seasonal 
Winter Wonderland 2015 Cont'd
 2014-12-25 17:48:12 -06:00
Sabe Jones 9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -06:00
Alice Harris 5836436b7b Merge pull request #404 from Alys/develop 
Style Guide for Equipment Descriptions
 2014-12-26 08:26:20 +10:00
Sabe Jones 9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones 41f4ab7b8a feat(event): Implement Seasonal Shop 2014-12-25 14:58:25 -06:00