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

176 Commits

Author SHA1 Message Date
Tyler Renelle 3204418af1 Revert #4291 
This reverts commit a1ea6869b7.
 2014-11-29 09:16:44 -07:00
Steffen Breiler 64a76566a0 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
 2014-11-27 22:52:03 +01:00
Matteo Pagliazzi c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi 43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Tyler Renelle d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00
Sabe Jones bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Alice Harris f80da293ce fix bug that was causing empty pet paws to appear for rare mounts 2014-11-10 06:00:01 +10:00
Tyler Renelle 89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Alice Harris 0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop 
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
 2014-11-01 10:25:38 +10:00
Tyler Renelle 39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06:00
Alice Harris 8a1973ae2f fix bug where quest Pets were being used instead of quest Mounts 2014-10-06 13:20:01 +10:00
Alice Harris 0c377343d5 fix bug where dropEggs were used for both types of mounts (instead of 'source') 2014-10-06 13:18:39 +10:00
Alice Harris d24b4ad141 add fix for hiding Plain Eggs on mounts page 2014-10-06 11:37:40 +10:00
Alice Harris ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop 
Conflicts:
	views/options/inventory/stable.jade
 2014-10-06 11:36:32 +10:00
Tyler Renelle 0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle 94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Alice Harris d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
lynnyliz 9886d2c177 added paw prints under Rare Pets (currently there are none on the site) 2014-08-22 21:31:53 -04:00
lynnyliz a351745a86 added mounts page organization to reflect pets page organization 2014-08-22 21:26:05 -04:00
Tyler Renelle a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Tyler Renelle c66c5ec83b feat(quests): seahorse quest 2014-07-07 15:02:19 -06:00
Tyler Renelle d6d2be9a00 perf(inventory): bindonce for inventory listings, #3486 2014-07-01 12:42:26 -06:00
Tyler Renelle de2ba36274 fix(dilatory): typo 2014-06-30 20:47:02 -06:00
Tyler Renelle 9f1035c317 feat(dilatory): scene damage + boss def/str. bug fixes, tests 2014-06-25 14:12:30 -06:00
Matteo Pagliazzi 57e1013ada fix(i18n): stable 2014-06-16 21:52:25 +02:00
Tyler Renelle 8d49a4d032 perf(pets): render food as bindonce (angular 1.3), see #3558 2014-06-11 15:58:46 -06:00
Tyler Renelle cb7324ccdb refactor(pets): render pets server-side 2014-06-11 14:17:47 -06:00
Tyler Renelle df1867ef4d refactor(pets): render mounts server-side for better perf 2014-06-11 13:58:51 -06:00
Tyler Renelle f85d6b2978 feat(quests): add octopus quest 2014-06-09 14:33:08 -06:00
Tyler Renelle efc9a6e715 fix(pets): if !Content.hatchingPotions[x], use string passed for 
displayname. Fixes #3575
 2014-06-08 11:11:34 -06:00
Yafinee ff612555ea #3054 - When feeding/saddling, ineligible pets should not get the green bubble 2014-05-21 19:54:20 +00:00
Tyler Renelle 598c6a43f1 refactor(quests): cleaner buyable quest eggs html 2014-05-14 10:09:18 -06:00
Tyler Renelle 8506db9849 feat(rat): add rat quest 2014-05-14 08:54:24 -06:00
deilann d801ece19d adding flag, allowing free rebirth purchase, adding modal 2014-05-11 08:01:15 -07:00
Matteo Pagliazzi 9b43502669 fix(i18n): pet and mounts 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi dce4dd3ad6 fix(i18n): translate class names in equipment 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi 95d5759042 fix(i18n): use right strings 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi 1f8722cb57 fix(i18n): use strings 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi 6930b693e0 fix(i18n): better strings for items 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi 21efe44d4d fix(i18n): use strings 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi 626352e04b improve(i18n): use strings for gear items and potion 2014-05-06 20:04:09 +02:00
Tyler Renelle 5296a584de Merge pull request #3155 from benmanley/notif-restyle 
Consolidate notifications into one menu
 2014-04-16 11:40:20 -06:00
benmanley 7f3f80aa4a Replace bootstrap classes in submenus 2014-04-15 23:40:21 +01:00
Tyler Renelle 8505e81764 feat(eggQuest): add supporting ng-if for egg quest, so you can't feed 
eggs. temporary, we should make something more robust like
"canFeed:false". Also, uses jade mixins to DRY the egg stuff
 2014-04-06 21:31:06 -06:00
Tyler Renelle 8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Tyler Renelle a30d491b62 fix(april-fools): matt boch 2014-03-31 20:55:53 -06:00
Tyler Renelle 71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06:00