928f7cfdd7
Merge remote-tracking branch 'origin/sabe/rebirth' into develop
...
Conflicts:
src/models/user.js
views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
4fcee66c3b
checklists: inline by default, add help popover
2013-12-30 14:40:07 -07:00
63541ad268
checklists: add inline-checklists user preference, and hide inlines when
...
editing
2013-12-30 10:33:48 -07:00
74c905f1e1
checklists WIP
2013-12-30 10:33:17 -07:00
9a32cfd7e1
Remove extraneous techy characters from boss fight and spellcasting chat notifications
2013-12-30 08:46:40 -06:00
c7e93f7793
remove console.log
2013-12-30 12:28:30 +01:00
34319bdcd3
improved multiple files translations
2013-12-30 12:23:23 +01:00
cb07bc9229
allow multiple files for translations
2013-12-30 12:16:42 +01:00
2f4fd2faca
fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know
...
if you need it in other locations
2013-12-29 17:13:39 -07:00
46f772581d
Merge pull request #2153 from HabitRPG/sabe/tweak3
...
Don't need angle brackets anymore for party cast notifications
2013-12-28 21:14:48 -08:00
8ed891db83
Merge pull request #1984 from SyntaxPickax/patch-2
...
Fixed challenge prize logic to avoid double paying
2013-12-28 21:09:48 -08:00
d3a4d35d5d
quest: when new user joins party, invite to pending-invite quests. When
...
user in quest leaves party, knock user from group.quest.members & quest
from user.party.quest
2013-12-28 21:50:27 -07:00
47c4b1dbe5
Don't need angle brackets anymore for party cast notifications
2013-12-28 17:46:18 -06:00
ea0b5b9291
quest: add quest leader. only quest-leader can begin/abort. Abort
...
restores quest scroll to leader. Bug fixes on clearing quest
data (completion, abort, etc)
2013-12-28 16:36:16 -07:00
1d6679298d
server: move config => utils, send headers along with error. Trying to
...
find out if some of these errors are mobile / not my own apps. Some
requests are malformed, but hitting apiv2's batch-api, i don't see how
this could be happening since both web and mobile are built to use apiv2
properly, unless a 3rd-party is trying to use apiv2 batch-api, but that
seems unlikely
2013-12-28 14:52:21 -07:00
827d04e4dc
APIv2: send response for user.ops
2013-12-28 12:06:24 -07:00
f8b7d313da
typo on req.body.notes
2013-12-27 15:39:49 -07:00
2332b15a55
add more details to errorHandler email
2013-12-27 12:22:26 -07:00
c5ca9cf41b
fix #2142 - show boss damage as Math.abs()
2013-12-27 10:50:23 -07:00
e6e961f991
#2135 remove connect-domain commented-out examples
2013-12-26 22:39:40 -07:00
1b8cba1945
#2135 use domain-middleware to handle top-level error-handling so we can
...
email admins UUIDs
2013-12-26 22:38:52 -07:00
2a63dfe687
quests: temporary fix to users who have left a party mid-quest
2013-12-26 15:39:09 -07:00
aa3767afd9
admin: calculate 2gem bonus *after* the manual gem update from admin
2013-12-26 09:58:33 -07:00
4e811d632e
bosses: temp defensive code against progress not being defined
2013-12-26 09:58:33 -07:00
fc83ef73ac
admin: add section in admin page for manually granting gems and
...
disabling ads. @sabrecat @wc8 @lemoness @bobbyroberts99 @redphoenix - no pressure,
just in case you see tavern cries that i don't see.apology-gems and restore-streaks
2013-12-25 20:33:21 -07:00
f38b8e41af
Final commit for Rebirth feature! Implement achievement and prestige icon
2013-12-25 17:56:55 -06:00
8aacb37e2c
API: safe-guarding against POSTing to create 3rd-party tasks with no {type} value
2013-12-25 10:59:52 -07:00
44e89d1be7
bosses: misc small bugs
2013-12-25 00:55:38 -07:00
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
f2f1d6621e
rename user.party.tally => user.party.progress
2013-12-24 21:57:56 -07:00
094989db13
quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements
2013-12-24 17:24:09 -07:00
3b94b18bb6
Implement Rebirth in controllers and API, revise modal per @wc8 feedback
2013-12-24 18:09:32 -06:00
f538a91538
bosses: no models, performance improvements
2013-12-23 14:17:08 -07:00
ae403a55a5
quests: add abort feature
2013-12-23 02:56:55 -07:00
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
ecb354e2cc
Quests: initial Bosses WIP - invite, accept, reject, etc
2013-12-22 17:46:54 -07:00
faeeecdf04
add GET /api/v2/content which lists all item definitions @magicmicky
2013-12-22 12:09:44 -07:00
60c622f1c1
Initial commit: unlock notification, new modals
2013-12-22 08:32:39 -06:00
cdf8c2412f
fix to mathUpdates on usermodel
2013-12-21 15:15:01 -07:00
c511c832bf
winter: add snowball achievement in model
2013-12-20 19:55:40 -07:00
9518cd1b51
winter: add salt spell to remove snowball buff
2013-12-20 18:35:50 -07:00
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
41c80b9433
fix #2061 "on the party" => "for the party"
2013-12-19 18:13:33 -07:00
9fc5784320
classes: add streaks buff for mages
2013-12-18 10:39:23 -07:00
06ee34c09b
fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell
2013-12-17 23:08:41 -07:00
d03a996946
classes: very simple "buffs applied" icon next to level, add chat message
...
for party / member casts (@wc8 @sabrecat)
2013-12-17 19:16:31 -07:00
87f4a1d204
#2017 add ability to opt out of classes entirely (@wc8)
2013-12-17 16:44:46 -07:00
ceea1b5909
#2008 add option to disable sticky header
2013-12-17 14:04:38 -07:00
a661c18013
apiv1: add login/register back into apiv1
2013-12-17 12:08:50 -07:00
122822e088
challenges: fix TypeError: undefined is not a function
2013-12-16 23:00:03 -07:00
Tyler Renelle