2541 commits

Author	SHA1	Message	Date
Blade Barringer	cecb2792e0	Added logic so triad bingo only appears in achievements after mount ... master has been reached	2015-01-16 11:41:36 -06:00
Blade Barringer	cbdd30b25f	Merge branch 'mountmaster' into triad-bingo	2015-01-16 11:40:36 -06:00
Blade Barringer	6a63f55a94	Added logic so muted version of mount master only appears if user has ... achieved beast master	2015-01-16 11:37:20 -06:00
Blade Barringer	ff4c2ade96	Added triadBingo to achievement list	2015-01-16 11:32:41 -06:00
Blade Barringer	10bc7e4eac	Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster	2015-01-16 10:44:52 -06:00
Sabe Jones	0b63e48c6e	feat(quest): T-Rex pet ... Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.	2015-01-15 15:38:51 -06:00
Sabe Jones	17ab1d660f	chore(news): Stress Strike 1 Bailey	2015-01-13 13:29:10 -06:00
Blade Barringer	385fe36a0a	Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster	2015-01-12 21:50:14 -06:00
Blade Barringer	1557907a1c	Updated string names	2015-01-12 13:12:40 -06:00
Blade Barringer	11f20555c4	Corrected stats page to show profile data instead of user data	2015-01-11 17:23:30 -06:00
K. Belardinelli	22446a5ddb	apply active class to special spells too	2015-01-10 11:06:39 -05:00
Blade Barringer	09c3b643bd	Removed comment because bug was fixed	2015-01-10 09:54:49 -06:00
Blade Barringer	1c0520c94d	Removed link to picture of all pets, since it is now inaccurate and ... there is no corresponding one for mounts	2015-01-10 09:38:03 -06:00
K Bell	d6dc2119cb	add active class to spell item when it is selected	2015-01-10 10:36:00 -05:00
Blade Barringer	2b20c52a8d	Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster	2015-01-10 09:25:18 -06:00
Blade Barringer	7f20ca7d8b	Made title dynamic	2015-01-10 08:26:11 -06:00
Blade Barringer	dc37442691	Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat ... Cmd/Ctrl + enter for chat and pms.	2015-01-09 13:51:21 -06:00
Blade Barringer	64bb55e57b	Reworked mixin file to retain gembutton history	2015-01-09 13:48:19 -06:00
Sabe Jones	cda16d5bc0	Merge pull request #4494 from SabreCat/stressbeast ... World boss for Winter Wonderland 2015	2015-01-08 15:51:04 -06:00
Sabe Jones	41d073d181	fix(world-boss): Achievement badge	2015-01-08 15:47:48 -06:00
Sabe Jones	ee339fba4a	feat(event): World boss ... Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!	2015-01-08 15:22:42 -06:00
Tyler Renelle	cba232ef83	feat(presskit): add presskit page cc @lemoness	2015-01-08 13:41:23 -07:00
Blade Barringer	0807e7856c	Merge remote-tracking branch 'upstream/develop' into mountmaster	2015-01-08 11:31:45 -06:00
Matteo Pagliazzi	193b92c16b	fix(cds): max hour is 23 not 24	2015-01-06 23:12:03 +01:00
Blade Barringer	8ba0bb5d88	Changed spellObj to skill to be more semantic, and match the text in the ... rewards column	2015-01-06 15:31:07 -06:00
Blade Barringer	870d9d7e86	Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop	2015-01-06 15:04:47 -06:00
Blade Barringer	9da000ec4e	Changed spell to spellObj in ng-repeat for class spells in order to ... assist with applying an active class to current spell. (would collide with $scope.spell in rootCtrl.js)	2015-01-06 15:03:54 -06:00
Blade Barringer	96b48324f8	Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks ... Fix for truncated dates on task due date. Closes #4482	2015-01-06 14:29:16 -06:00
Blade Barringer	53c466ee7f	Rounds tooltip for exp, health and mana to 2 decimal places	2015-01-06 13:52:22 -06:00
Blade Barringer	e416b03a59	Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop	2015-01-06 09:39:04 -06:00
Blade Barringer	dd4e8d74c7	Fix for truncated dates on task due date. Closes #4482	2015-01-06 09:37:29 -06:00
Sabe Jones	8feffa5431	fix(news): Improve accuracy	2015-01-05 17:31:19 -06:00
Blade Barringer	f0c65be629	Fix to allow for challenges with the same award name. Closes #4479	2015-01-05 17:15:33 -06:00
Sabe Jones	8529c0f1db	chore(news): Bailey	2015-01-05 16:48:58 -06:00
negue	aa6b1e3f81	add remove-watch to markdown-directive	2015-01-05 22:19:05 +01:00
negue	ad8add58d7	Merge pull request #4461 from negue/markdownText ... change markdown ngModel to text attribute	2015-01-05 22:12:06 +01:00
Blade Barringer	cc7b2f70ba	Hide buy gems button if over level 100 in rebirth modal	2015-01-05 13:41:58 -06:00
Blade Barringer	10451d3296	Removed gem cost if lv 100 or higher	2015-01-05 13:38:00 -06:00
Blade Barringer	f3676fcbf4	Added spaces between quantity and gem symbol	2015-01-05 13:33:43 -06:00
Blade Barringer	a72faa5d92	Added ctrl+cmd enter command to pms	2015-01-05 13:21:23 -06:00
Blade Barringer	5deb72c457	Added ability to send chat via cmd/ctrl + enter	2015-01-05 13:17:23 -06:00
Jackson Popkin	b409e589f1	Add tooltip with exact health/exp/mana	2015-01-04 17:26:11 -05:00
Sabe Jones	09f827e9fe	fix(news): Improved plot	2015-01-03 13:18:47 -06:00
Blade Barringer	45c045e853	Corrected which string was being used in achievements	2015-01-02 14:16:40 -06:00
Blade Barringer	68e613c3fc	Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct	2015-01-02 14:11:59 -06:00
Blade Barringer	3c3bbcafb9	Simplified count in stable	2015-01-02 14:11:04 -06:00
Blade Barringer	87d78618d8	Changed keys of the kennel npc to Matt	2015-01-02 13:46:21 -06:00
Blade Barringer	406edcb761	Added releaseBoth script and refactored keys to the kennel modal	2015-01-02 13:33:41 -06:00
Blade Barringer	1049e5e152	Key shows up when you have either 90 pets or 90 mounts. Opens lg modal	2015-01-02 13:08:45 -06:00
Blade Barringer	7f2648eafb	Renamed release scripts	2015-01-02 12:43:40 -06:00