Commit graph

315 commits

Author SHA1 Message Date
Tyler Renelle
f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
2013-12-24 23:30:48 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Tyler Renelle
f538a91538 bosses: no models, performance improvements 2013-12-23 14:17:08 -07:00
Tyler Renelle
ae403a55a5 quests: add abort feature 2013-12-23 02:56:55 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Tyler Renelle
61245e31b8 update justin guide re: todos adding 1MP 2013-12-21 18:50:18 -07:00
Tyler Renelle
82f24c2b5e Merge pull request #2077 from bobbyroberts99/patch-1
Add wiki glossary to tavern
2013-12-21 14:39:43 -08:00
Tyler Renelle
226b90b74d add headers for equipment / costume panes (@sabrecat) 2013-12-21 15:29:55 -07:00
Bob Steffes
8578c33c07 Add wiki glossary to tavern
My local repo is behind and ahead so I'm submitting from GitHub. Not sure how to fix, so if there a bunch of old commits, please ignore. This is the only active one I've got going.
2013-12-21 13:57:02 -08:00
Tyler Renelle
f2d58e1c8e update bailey per @lemoness , update limited-edition end date 2013-12-20 18:52:32 -07:00
Tyler Renelle
6cb90093d0 winter: bailey notif, show winter colors as limited-edition 2013-12-20 11:03:43 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
f4fca98bd1 fix #2058 double-task deletion 2013-12-19 21:45:52 -07:00
Sabe Jones
c43d784834 Add mention of Health refill to Fortify 2013-12-17 22:14:15 -06:00
Tyler Renelle
7195d53442 fix #2033 gems need to be div, not span 2013-12-17 19:39:11 -07:00
Tyler Renelle
41cc6ff3bc fix #2032 - add button to show classes tour, mention 10pt/day mp regen 2013-12-17 19:22:21 -07:00
Tyler Renelle
03c4a04ff5 classes: better-positioned justin 2013-12-17 17:24:14 -07:00
Tyler Renelle
2efc0972d6 cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment 2013-12-17 16:51:27 -07:00
Tyler Renelle
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle
94dc0a0c5b fix #2004 don't show party invitations when it's an empty object
{} (remember, {} is truthy)
2013-12-17 12:12:28 -07:00
Tyler Renelle
e13da00a54 fix #2009 how about a compromise. change button to "change and
reroll" (it's right next to your class name, so "change what?" should be
obvious)
2013-12-17 09:26:15 -07:00
Tyler Renelle
949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00
Tyler Renelle
3b4fca506a separate unlock for facial-hair / hair 2013-12-16 13:46:54 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
a1590f7f3e classes: update some classes wording 2013-12-16 13:03:33 -07:00
Tyler Renelle
8082d8ae30 add unlock set for hairs, beards, mustaches 2013-12-16 12:15:59 -07:00
Tyler Renelle
7c2e803475 classes: charge gems for class-change 2013-12-16 11:47:55 -07:00
Tyler Renelle
91e1287d06 APIv2: some finalization of APIv2. Add new routes, re-rigg
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
2013-12-15 16:53:06 -07:00
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration
fixes. Rest=>Sleep fixes
2013-12-15 10:57:53 -07:00
Tyler Renelle
ae4ca337c8 Merge pull request #1949 from bobbyroberts99/develop
Reposition Markdown formatting link
2013-12-14 21:21:45 -08:00
Tyler Renelle
d1a34f570d customizations: migrate skins for more PCs, start building out migration 2013-12-14 16:12:41 -07:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of
user.preferences.shirt
2013-12-14 00:35:03 -07:00
Tyler Renelle
549add08ed classes: 2gems / new hair,beard,stache 2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since
we dynamically swap it sometimes)
2013-12-12 20:03:32 -07:00
Tyler Renelle
b5a4177719 separate saddle out to it's own market section 2013-12-12 18:38:05 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
Sabe Jones
847f090b7a Remove "yet" from no-food message
Fix pet peeve :trombone:
2013-12-08 21:25:34 -06:00
Tyler Renelle
b6fceaca1b fix some tavern links 2013-12-08 19:55:49 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
2013-12-08 18:17:53 -07:00
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify
button, remove reroll from store)
2013-12-08 09:46:30 -07:00
Tyler Renelle
714dad6e91 classes: small bug fixes 2013-12-07 20:41:48 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes
Conflicts:
	views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
Tyler Renelle
79e8b2f4a5 Revert "mounts: temporarily remove mounts code from views. merging to master so"
This reverts commit d245c87f29.
2013-12-07 11:34:53 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00