Sabe Jones
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
Sabe Jones
d782fc6b6a
fix(stats): Better layout for attribute point allocation
2014-01-22 20:34:03 -06:00
Marcelo Sizer
4d834c5c2b
Replace a line for env.t
2014-01-22 22:37:09 -02:00
Luveluen
077e23519c
Update avatar.jade
2014-01-23 00:24:15 +01:00
Luveluen
c4a230d73c
Update avatar.jade
2014-01-23 00:19:42 +01:00
Luveluen
0fb8ec9a8b
Update tavern.jade
...
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
Luveluen
13503986fb
Update index.jade
...
line 39
2014-01-22 23:43:58 +01:00
Luveluen
9f56426472
Update hall.jade
...
line 47!
2014-01-22 23:34:06 +01:00
Luveluen
098247233f
Update group.jade
...
line 133 problem
2014-01-22 23:21:19 +01:00
Luveluen
39eb590299
Update create-group.jade
2014-01-22 22:51:57 +01:00
Luveluen
7540f6acc9
Update challenges.jade
2014-01-22 22:16:54 +01:00
Luveluen
11a558cd20
Update challenge-box.jade
2014-01-22 21:42:48 +01:00
Matteo Pagliazzi
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
Marcelo Sizer
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
Marcelo Sizer
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
Marcelo Sizer
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
Matteo Pagliazzi
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
Matteo Pagliazzi
eec6ead971
Revert "improve(translations): translate death modal"
...
This reverts commit 50333026b6
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi
50333026b6
improve(translations): translate death modal
2014-01-22 17:18:35 +01:00
Matteo Pagliazzi
090c28a35b
improve(translations): translated shared/modals/achievements
2014-01-22 17:08:12 +01:00
Matteo Pagliazzi
a6c67f1781
fix(translations): merge @luveluen pull request, fix some syntax
2014-01-22 16:09:32 +01:00
Luveluen
4f07ab39b0
Update inventory.jade
2014-01-22 12:10:51 +01:00
Sabe Jones
5ddf09fe13
fix(settings): reintroduce space between captions and help bubbles stripped during localization
2014-01-21 19:52:04 -06:00
Tyler Renelle
f16654d235
feat(quests): add canBuy so we can exclude certain items from the
...
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
2014-01-21 14:44:53 -08:00
Tyler Renelle
e48c7277f8
fix(quests): list multiple rewards in dialog
2014-01-21 14:12:09 -08:00
Luveluen
8b97438607
Update stable.jade
2014-01-20 19:44:33 +01:00
Luveluen
e47afa8965
Update stable.jade
2014-01-20 19:41:17 +01:00
Luveluen
c85e3a2107
Update inventory.jade
2014-01-20 19:23:49 +01:00
Luveluen
18eeafafc8
Update inventory.jade
2014-01-20 19:07:50 +01:00
Luveluen
06132f8a48
Update inventory.jade
2014-01-20 18:55:29 +01:00
Matteo Pagliazzi
52decb7ede
fix(translations): @lefnire now everything is ok
2014-01-20 17:51:43 +01:00
Luveluen
fa212b6e93
Update index.jade
2014-01-20 17:50:28 +01:00
Matteo Pagliazzi
fba739535b
fix(translations): correct some variables
2014-01-20 17:25:14 +01:00
Matteo Pagliazzi
d000c70679
fix(translations): revert some views
2014-01-20 17:08:27 +01:00
Matteo Pagliazzi
f85117a422
Merge pull request #2486 from luveluen/develop
...
jade->json
2014-01-20 07:56:54 -08:00
Luveluen
ffff867ba3
Update stable.jade
2014-01-20 16:20:06 +01:00
Luveluen
462f11e48c
Update inventory.jade
2014-01-20 16:08:37 +01:00
Luveluen
c37512baa6
Update index.jade
2014-01-20 14:41:51 +01:00
Luveluen
68041f206c
Update settings.jade
2014-01-19 22:02:55 +01:00
Luveluen
87d528ce50
Update profile.jade
...
fullname -> fullName
2014-01-19 21:46:57 +01:00
Luveluen
bfebb61520
Update profile.jade
2014-01-19 21:40:41 +01:00
Paul Sainsbury
66582b2d05
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 22:24:54 +02:00
Luveluen
46e29e8999
Update settings.jade
2014-01-19 21:16:52 +01:00
Luveluen
4e5323ea2f
Update settings.jade
2014-01-19 21:10:18 +01:00
Luveluen
b48c584f43
Update settings.jade
2014-01-19 21:05:41 +01:00
Luveluen
1f0d91e9c6
Update profile.jade
2014-01-19 21:04:03 +01:00
Luveluen
b9bafc304e
Update settings.jade
2014-01-19 21:03:01 +01:00
Luveluen
00cb57deb6
Update settings.jade
2014-01-19 21:00:11 +01:00
Luveluen
d87a3caae7
Update profile.jade
2014-01-19 20:50:31 +01:00
Luveluen
f748d89fdc
Update profile.jade
2014-01-19 20:11:03 +01:00
Luveluen
e8647c7cbc
Update profile.jade
2014-01-19 20:05:48 +01:00
Luveluen
745fdeb34f
Update profile.jade
2014-01-19 19:59:35 +01:00
Luveluen
21de0b7e74
Update settings.jade
2014-01-19 19:58:04 +01:00
Luveluen
805299a34c
Update profile.jade
2014-01-19 19:55:52 +01:00
Luveluen
b8e18594e9
Update index.jade
2014-01-19 19:50:26 +01:00
Luveluen
6dd0e48887
Update settings.jade
2014-01-19 18:56:39 +01:00
Luveluen
6f19cdaf6c
Update profile.jade
2014-01-19 18:27:48 +01:00
Luveluen
47085de1e1
Update index.jade
2014-01-19 17:29:53 +01:00
Tyler Renelle
a1df41ad81
fix(spells): <ESC> to cancel spell-casting
2014-01-18 14:15:45 -07:00
Sabe Jones
c1fa5a79ab
Fix #2438
...
Bosses damage you for party members' misses, not your own undone Dailies, while you're in the Inn.
2014-01-16 21:09:15 -06:00
Tyler Renelle
e6dc715de6
Merge pull request #2396 from aughr/andrew/consolidate_tests
...
Convert API tests to normal JS
2014-01-16 15:19:21 -08:00
Tyler Renelle
90176444e9
feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason)
2014-01-16 12:47:55 -07:00
Tyler Renelle
41233c7b16
feat(challenges) markdown in challenge-descriptions
2014-01-16 12:28:28 -07:00
Andrew Bloomgarden
77801e458e
Change static module name to habitrpgStatic.
...
The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
2014-01-15 21:33:57 -08:00
Tyler Renelle
518f200a8f
fix( #2375 ) merge in @SabreCat's stats.jade changes "More elegant
...
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07:00
Tyler Renelle
86220f3e0e
Merge pull request #2319 from HabitRPG/sabe/preferences
...
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08:00
Tyler Renelle
003e214080
#2384 add alert on paypal taking a long time to clear
2014-01-15 19:45:07 -07:00
Tyler Renelle
b52ea3f495
Merge pull request #2403 from HabitRPG/sabe/fix
...
Misc UI fixes
2014-01-15 16:24:03 -08:00
Tyler Renelle
cdcf130b6f
Merge pull request #2360 from colegleason/qr-code
...
Made QR code valid JSON. Fixes #2354
2014-01-15 15:45:24 -08:00
Tyler Renelle
0ce10ef339
Merge pull request #2352 from colegleason/quest-scroll
...
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-15 15:39:59 -08:00
Tyler Renelle
e66fdd80ef
feat(perfect-day achievement)
2014-01-15 16:24:23 -07:00
Tyler Renelle
9db6dd9233
Merge pull request #2412 from Aiseant/patch-1
...
Update tavern.jade
2014-01-15 09:43:03 -08:00
Matteo Pagliazzi
2e12ffefc6
revert previous change
2014-01-15 16:56:40 +01:00
Matteo Pagliazzi
178086ef30
fix some translation strings
2014-01-15 16:54:37 +01:00
Aiseant
e9715f36b8
Update tavern.jade
...
Add infos about resting while on Boss quest
2014-01-15 11:37:02 +01:00
Sabe Jones
5521dd0bb1
UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off
2014-01-14 21:07:46 -06:00
Tyler Renelle
128d68f544
show warning that completed to-dos are cleared after 3 days
2014-01-14 17:29:05 -07:00
Matteo Pagliazzi
6b5366b246
Merge pull request #2364 from Sinza-/develop
...
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-14 11:21:31 -08:00
Marcelo Sizer
6cc7d73683
Replace old stats.jade file
2014-01-14 17:06:16 -02:00
Marcelo Sizer
1b1c646e24
Replace old code
2014-01-14 16:22:14 -02:00
Marcelo Sizer
e7307681d3
Replace old code
2014-01-14 16:19:37 -02:00
Marcelo Sizer
20277e623e
Add @paglias suggested fixes
2014-01-14 16:16:40 -02:00
Marcelo Sizer
f40b8c6e64
Fix indentation
2014-01-14 16:01:53 -02:00
Marcelo Sizer
556118c1f0
Add @paglias suggested fixes
2014-01-14 15:57:55 -02:00
Matteo Pagliazzi
4e2005732c
translate some views
2014-01-14 18:50:06 +01:00
Matteo Pagliazzi
6ca81f5b31
fix some translations in jade views @Sinza-
2014-01-14 18:32:40 +01:00
Tyler Renelle
daeb846ffb
profile.jade use some jade magic to compactify the code
2014-01-13 22:15:32 -07:00
Marcelo Sizer
8a8d3f17ca
Fix typo
2014-01-11 16:16:02 -02:00
Marcelo Sizer
8188f173bc
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-11 16:11:45 -02:00
Tyler Renelle
5583f5fb23
Merge pull request #2363 from Sinza-/develop
...
Fix challenge completed not displaying text when someone wins a challenge.
2014-01-11 10:11:33 -08:00
Marcelo Sizer
1ec534a650
Fix typo
2014-01-11 14:36:18 -02:00
Marcelo Sizer
d978eb8702
Fix challenge completed not displaying text when someone wins a challenge.
2014-01-11 14:33:48 -02:00
Cole Gleason
7baf0ee7a1
Made QR code valid JSON. Fixes #2354
2014-01-11 04:19:18 -06:00
Cole Gleason
58803773d2
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-10 15:43:44 -06:00
Bob Steffes
fcf1788357
Update Tavern.jade
...
I changed the name of wiki forum so it didn't display as "LFG Board board" which broke the link.
2014-01-10 08:48:14 -08:00
Tyler Renelle
36d32d6b16
update forum & lfg links
2014-01-09 20:48:36 -07:00
snicker
8f3e47079c
fixes #2316 , challenge icon getting wackified
2014-01-09 16:26:07 -08:00
Sabe Jones
27e9dfa0d5
Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed
2014-01-08 22:19:38 -06:00
Sabe Jones
111651da1e
Fix tier labels no longer providing info on click
2014-01-08 18:49:53 -06:00
Brandon McPhail
77278bcffc
Fixed issue where only the first markdown link in a message would open in a new tab. Now all do.
2014-01-08 15:33:36 -08:00
Tyler Renelle
24b2094f35
Merge pull request #2300 from HabitRPG/sabe/tweak
...
More UI demystification
2014-01-08 14:34:09 -08:00
Tyler Renelle
11dbda6f8c
Merge pull request #2298 from HabitRPG/sabe/preferences
...
New user preference: open new tasks in edit mode
2014-01-08 14:29:57 -08:00
Sabe Jones
0a959b5f92
More UI demystification
2014-01-07 22:56:18 -06:00
Tyler Renelle
f742d3202a
Merge pull request #2296 from SyntaxPickax/develop
...
Fixed UI issues when editing checklists
2014-01-07 20:22:52 -08:00
Tyler Renelle
5501969262
Merge pull request #2255 from colegleason/leave-guild-challenges
...
When a user leaves a group, remove them from all group challenges
2014-01-07 19:57:39 -08:00
Sabe Jones
089ea05cf4
Readability tweak: sentence case for options not on buttons
2014-01-07 20:20:05 -06:00
Sabe Jones
9c545add5e
New user preference: open new tasks in edit mode
2014-01-07 20:14:57 -06:00
Brandon McPhail
07d4fc1184
Fixed UI issues when editing checklists
2014-01-07 11:55:41 -08:00
Tyler Renelle
833d597bfe
fix #2284 remove unecessary chat-message scrollbars
2014-01-07 11:27:29 -07:00
Tyler Renelle
bc451c20bf
Merge remote-tracking branch 'colegleason/task-due' into develop
...
Conflicts:
views/shared/tasks/task.jade
2014-01-07 10:53:27 -07:00
Tyler Renelle
bf594dadd1
Merge pull request #2287 from HabitRPG/sabe/tweak
...
Add 1px margin to task badges so they don't run into each other/icons
2014-01-07 09:50:17 -08:00
Tyler Renelle
154abcefbb
#2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members
2014-01-07 10:46:51 -07:00
snicker
ec236f36d8
Emoji (and markdown =0) support in tags. May want to reduce this to *just* emoji at some point via another directive. Fixes #2164
2014-01-07 07:37:54 -08:00
Sabe Jones
d6e6daa3dc
Add 1px margin to task badges so they don't run into each other and icons
2014-01-07 07:20:43 -06:00
snicker
5becae6170
fixed issue with fixing the other issue so that everything is fixed and nickname autocompletion works again
2014-01-06 23:37:42 -08:00
Cole Gleason
3150b7b31b
use correct granularity when checking if a task is overdue
2014-01-07 00:44:27 -06:00
Tyler Renelle
295815d1a3
typo fix
2014-01-06 21:54:01 -07:00
Tyler Renelle
44280c4a0e
Merge pull request #2272 from Sinza-/envt/tasks
...
Replace hard-coded strings for env.t on folder views/shared/tasks/
2014-01-06 20:44:33 -08:00
Tyler Renelle
3b3b0e6915
#2245 don't show class-tour button unless the class system is enabled
2014-01-06 21:20:27 -07:00
Sabe Jones
459af67fcd
Fix #2277 : make Automatic Allocation checkbox set "task activity" mode
2014-01-06 21:20:54 -06:00
Tyler Renelle
ac1bcd4791
winter: disable gold in restore-values during the WWE event
2014-01-06 18:44:53 -07:00
Tyler Renelle
b3dd1e0a68
bailey: WWE pt 4 (class gear)
2014-01-06 17:44:17 -07:00
Marcelo Sizer
73e9730fe7
Fix replacing typo
2014-01-06 17:47:16 -02:00
Marcelo Sizer
255acd79d2
Replace hard-coded strings for env.t on views/shared/tasks/ folder
2014-01-06 17:36:33 -02:00
Tyler Renelle
bc8da096f4
chat: a few view cleanups
2014-01-05 22:17:21 -07:00
Tyler Renelle
f6e6d115ac
chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob)
2014-01-05 22:12:02 -07:00
Tyler Renelle
95516f709c
hall: one white star for GMs (yeah, GMs are admins). remove sleepy-eye. @sabrecat
2014-01-05 21:04:56 -07:00
Tyler Renelle
5ccd8c4b85
hall: fixed load-more, sort contribs by lvl
2014-01-05 19:58:19 -07:00
Tyler Renelle
eb5a9150ab
hall: use infinite-scroll to load patrons, since there are so many
2014-01-05 19:51:33 -07:00
Tyler Renelle
a5db8628e2
hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers
2014-01-05 19:19:34 -07:00
Tyler Renelle
eeaeb5c006
Merge remote-tracking branch 'DanielHeath/develop' into develop
...
Conflicts:
views/static/front.jade
2014-01-05 16:37:05 -07:00
Tyler Renelle
e23b42f300
#2186 hide task attrs unless allocationMode == 'taskbased'
2014-01-05 15:16:55 -07:00
Tyler Renelle
a6f096d730
#2186 hide task attributes if auto-allocate not enabled
2014-01-05 15:08:10 -07:00
Tyler Renelle
8c319b6079
Merge pull request #2186 from HabitRPG/sabe/tweak3
...
Advanced Options default to being shown
2014-01-05 14:06:42 -08:00
Sabe Jones
7904b8e4db
Clear up some confusion caused by AngularJS number filter
2014-01-05 09:32:20 -06:00
Matteo Pagliazzi
7cfca80e2f
remove unnecessary text tags
2014-01-05 13:23:45 +01:00
Matteo Pagliazzi
ce64affa92
fix gems styling
2014-01-05 12:59:00 +01:00
Cole Gleason
744d8a6780
When a user leaves a group, remove them from all group challenges
2014-01-04 20:05:48 -06:00
Tyler Renelle
3a5eda1e98
Merge remote-tracking branch 'origin/sabe/attributes' into develop
...
Conflicts:
views/shared/footer.jade
2014-01-04 16:02:22 -07:00
Tyler Renelle
c6ab84721f
fix #2205 hide checklist button from challenges
2014-01-04 10:58:12 -07:00
Tyler Renelle
c9e083b602
challenges: add "official habitrpg challenge" option
2014-01-03 13:36:13 -07:00
Tyler Renelle
45b543c1ed
challenges: don't disable notes field when challenge-task
2014-01-03 13:14:56 -07:00
Tyler Renelle
e6e922d00a
add note to custom-day-start property, warning users against using it (@wc8)
2014-01-02 17:16:55 -07:00
Tyler Renelle
eda45d9240
Merge pull request #2174 from Sinza-/develop
...
Replace hard-coded strings with env.t on views/static folder and en/app.json
2014-01-01 22:33:13 -08:00
Tyler Renelle
9b56899d0f
#2217 add note about base-url for api routes
2014-01-01 22:47:38 -07:00
Tyler Renelle
580279eeda
#2217 apiv2 update documentation
2014-01-01 22:26:59 -07:00
Tyler Renelle
548d4f5b78
#2217 swagger-ui: allow authentication for interacting with routes
2014-01-01 21:09:01 -07:00
Tyler Renelle
a2b30dcb1a
#2217 merge apiv2 route definitions with swagger decorations
2014-01-01 20:21:46 -07:00
Tyler Renelle
98361ea94f
#2217 add note about API-docs being a WIP
2014-01-01 16:37:03 -07:00
Tyler Renelle
0edcfac46b
#2217 start adding APIv2 generated documentation via swagger-node-express
2014-01-01 15:33:37 -07:00
Sabe Jones
a9e57a8adf
Merge branch 'develop' into sabe/attributes
2014-01-01 12:42:53 -06:00
Tyler Renelle
0f3202f964
#2200 change-password is showing for facebook-registered users for some reason
2013-12-31 20:00:15 -07:00
Daniel Heath
0ecc013a00
Allow lastpass users to autofill their credentials
2014-01-01 13:52:12 +11:00
Tyler Renelle
dfe6d9ff88
tasks: dbl-click saves a task when previously in edit-mode. @sabrecat
...
@wc8 it used to be it just closes the edit dialog, but I find myself
wanting to dblclick to save each time. Let me know if you think this is
a bad idea
2013-12-31 18:11:20 -07:00
Tyler Renelle
962d509405
checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?)
2013-12-31 14:05:39 -07:00
Tyler Renelle
09eddd3eb2
checklists #2198 click badge to collapse checklist @sabrecat
2013-12-31 14:03:16 -07:00
Tyler Renelle
77c6777506
checklists: collapse individually
2013-12-31 13:50:14 -07:00
Tyler Renelle
1dda9254f3
bailey: notif on task icons & markdown
2013-12-31 09:15:06 -07:00
Tyler Renelle
80e593d49f
new years eve: bailey
2013-12-31 08:43:29 -07:00
Tyler Renelle
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
Tyler Renelle
01ecc616f6
Merge branch 'checklists' into develop
2013-12-31 07:53:34 -07:00
Sabe Jones
9c5f1c2150
Add debug button to hand out levels one at a time
2013-12-30 22:56:01 -06:00
Marcelo Sizer
ff5a42e3df
Replace hard coded strings for env.t on views/shared/ folder.
2013-12-31 00:15:53 -02:00
Sabe Jones
85657f40d3
Fix placement of "Restore Streak" caption on Firefox
2013-12-30 17:25:13 -06:00
Tyler Renelle
4fcee66c3b
checklists: inline by default, add help popover
2013-12-30 14:40:07 -07:00
Tyler Renelle
c7dde3cde1
checklists: add CL up/down keyboard nav
2013-12-30 13:42:19 -07:00
Tyler Renelle
1110338b9b
checklists: handle backspacing an empty CL item
2013-12-30 13:19:42 -07:00
Tyler Renelle
ebc7cf6bcb
checklists: better handling of saveTask, keypress:13, and remove-blur
2013-12-30 12:56:26 -07:00
Tyler Renelle
0fe2804c3c
fix #2184 put dbl-click for task._editing on the correct element
2013-12-30 11:17:19 -07:00
Sabe Jones
a854109fcd
Get attributes layout up-to-date with develop changes
2013-12-30 11:38:27 -06:00
Tyler Renelle
63541ad268
checklists: add inline-checklists user preference, and hide inlines when
...
editing
2013-12-30 10:33:48 -07:00
Tyler Renelle
bb3bec520e
checklists: tmp commit to showcase how inline checklists look on
...
tasks (only for todos for comparison)
2013-12-30 10:33:48 -07:00
Tyler Renelle
968b091ccd
checklists: checklist as <li> instead of <label>, so that inline-editing
...
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
2013-12-30 10:33:48 -07:00
Tyler Renelle
1ace999cb7
Tasks: add double-click to edit, and date-picker-popup for
...
due-dates. Show red dates when overdue (basic)
2013-12-30 10:33:48 -07:00
Tyler Renelle
74c905f1e1
checklists WIP
2013-12-30 10:33:17 -07:00
Tyler Renelle
ea31cc6926
Merge branch 'task-li-notes' into develop
...
Conflicts:
views/shared/tasks/task.jade
2013-12-30 10:31:17 -07:00
Tyler Renelle
6f0046dffc
Revert b4ff7d4 b20a3b7 . Temporarily remove
...
todo-filter. This brings back the big performance issue of always
displaying completed-todos, but fixes #2180 #2189 . See #2180 for
discussion.
2013-12-30 10:19:57 -07:00
Sabe Jones
d3a6191a5e
Merge branch 'develop' into sabe/attributes
2013-12-30 10:25:08 -06:00
Sabe Jones
5538bcc6a9
Advanced Options default to being shown
2013-12-30 08:57:41 -06:00
Sabe Jones
199a74d8a9
Fix #2181 (allocated points showing up in Class Equip Bonus)
2013-12-30 07:33:17 -06:00
Marcelo Sizer
55fbd7d439
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
locales/en/app.json
2013-12-30 10:33:08 -02:00
Sabe Jones
c3aed6fb28
RPG demystification, cont'd
2013-12-29 20:58:35 -06:00
Marcelo Sizer
57ac0239c5
Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all.
2013-12-30 00:14:55 -02:00
Tyler Renelle
50d241e2c8
#2083 add list-item notes at top-level element
2013-12-29 17:34:21 -07:00
Tyler Renelle
fd324fc220
classes: fix class-modal heads. Also, little class title display trick
...
@sabrecat (tiny perf bonus)
2013-12-29 12:21:56 -07:00
Sabe Jones
2f79472439
Some work on demystification of RPG elements
2013-12-29 11:04:31 -06:00
Tyler Renelle
e9cb9b8a9f
task-icons: larger emoji in task text than chat
2013-12-29 01:24:02 -07:00
Tyler Renelle
c14e4c8fec
display profile.stats.class in modal
2013-12-29 00:47:39 -07:00
Tyler Renelle
585f736305
add markdown support for task.text so we can use icons in task
...
titles. @wc8 does this satisfy
https://trello.com/c/FCVdjdUd/102-task-reward-icons sufficiently? @lemoness
2013-12-29 00:46:08 -07:00
Tyler Renelle
d966833782
#1499 ng-if to hide/show task editing (fewer watchers)
2013-12-29 00:14:55 -07:00
Tyler Renelle
b20a3b7381
#1499 add list filter on tasks to not display completed todos at all
...
until "completed" tab clicked
2013-12-29 00:14:46 -07:00
Tyler Renelle
57cd53cfc9
fix #2155 . Since quest.leader is new, doesn't apply to quests started
...
before today. Show abort/begin for all quest members if quest.leader
doesn't exist, otherwise only show those options to the leader
2013-12-28 21:54:25 -07:00
Tyler Renelle
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
Bob Steffes
5c89954b83
Update Request Feature link
...
Link now goes directly to How to Submit a New Request card. Previously it was linking to the Trello board (not the card).
2013-12-27 19:21:30 -08:00
Tyler Renelle
fa2fddb516
winter: add snowball achievement
2013-12-27 09:48:58 -07:00
Sabe Jones
cc5a6de9cb
Initial commit: add allocationMode user preference and form for choosing it
2013-12-27 09:54:48 -06:00
Bob Steffes
ae84ebc47c
Change link to Trello feature request card
...
Instead of linking to the Board it now links directly to the card
2013-12-27 08:50:08 -07:00
Tyler Renelle
e9e2f26a9f
collection quest item icons fix
2013-12-25 21:26:51 -07:00
Tyler Renelle
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
Sabe Jones
f38b8e41af
Final commit for Rebirth feature! Implement achievement and prestige icon
2013-12-25 17:56:55 -06:00
Tyler Renelle
0eedeea47d
fix #2107 , add note about creating empty parties for quests
2013-12-25 12:09:34 -07:00
Tyler Renelle
76da27478a
bosses: update wording to make cron-calculations more obvious
2013-12-25 11:45:29 -07:00
Tyler Renelle
e9b0ccc057
Evil Santa => Trapper Santa
2013-12-25 08:30:55 -07:00
Tyler Renelle
fc4a141d2e
bosses: bailey
2013-12-25 08:24:39 -07:00
Tyler Renelle
44e89d1be7
bosses: misc small bugs
2013-12-25 00:55:38 -07:00
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
Sabe Jones
3b94b18bb6
Implement Rebirth in controllers and API, revise modal per @wc8 feedback
2013-12-24 18:09:32 -06:00
Sabe Jones
cc3632b611
Add Orb of Rebirth to shop, image to modals, tweak modal text
2013-12-24 09:57:04 -06: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
067fbe861c
remove math updates notif now that things have settled down a bit (most
...
updates now should be subtle). @wc8 @sabrecat let me know if you think
this is premature
2013-12-22 11:47:10 -07:00
Sabe Jones
60c622f1c1
Initial commit: unlock notification, new modals
2013-12-22 08:32:39 -06:00
Tyler Renelle
4adb66cc4f
add notif on iOS for math updates
2013-12-21 18:50:18 -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
Tyler Renelle
cdf8c2412f
fix to mathUpdates on usermodel
2013-12-21 15:15:01 -07:00
Tyler Renelle
8280208fae
lvl 10 classes unlock
2013-12-21 15:07:19 -07:00
Tyler Renelle
db5de3ef7b
some classes-math wording updates
2013-12-21 15:05:32 -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
640dd04dd3
add notif re: math updates for classes (@wc8)
2013-12-21 14:55:18 -07:00
Tyler Renelle
f2d58e1c8e
update bailey per @lemoness , update limited-edition end date
2013-12-20 18:52:32 -07:00
Tyler Renelle
9518cd1b51
winter: add salt spell to remove snowball buff
2013-12-20 18:35:50 -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
Tyler Renelle
6e3bb61f6e
temporarily disable stats in party-member modals
2013-12-19 18:23:55 -07:00
Tyler Renelle
9fc5784320
classes: add streaks buff for mages
2013-12-18 10:39:23 -07:00
Tyler Renelle
75acffa073
show stealth buff in stats
2013-12-18 10:23:22 -07:00
Tyler Renelle
06ee34c09b
fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell
2013-12-17 23:08:41 -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
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
Tyler Renelle
03c4a04ff5
classes: better-positioned justin
2013-12-17 17:24:14 -07:00
Tyler Renelle
e0623e6add
classes: remove extra note about inventory
2013-12-17 17:18:59 -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
3b02717271
#2008 #2020 fixes to justin popovers so they don't go funky with sticky.js
2013-12-17 13:47:44 -07:00
Tyler Renelle
d2a460769d
#2008 #2020 use jquery.sticky instead of bootstrap affix
2013-12-17 13:41:13 -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
51c6914b56
tmp
2013-12-17 09:42:00 -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
2b7730b6e3
fix #2007 resotore MPfix restore mp
2013-12-17 09:17:41 -07:00
Tyler Renelle
e9ed847a4e
classes: updating class-selection description to include note about gear being
...
transfered to inventory. It's in the tour, but most people seem to be
missing it... @sabrecat thoughts on this?
2013-12-16 23:52:39 -07:00
Tyler Renelle
2e098ce87b
classes: bailey
2013-12-16 23:33:05 -07:00
