Marcelo Sizer
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
Marcelo Sizer
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
Marcelo Sizer
8f4016d669
Split main.json
2014-01-26 17:30:41 -02:00
Matteo Pagliazzi
4274090205
fix(translations): fix #2564 and similar ones
2014-01-26 14:48:38 +01:00
deilann
2c0f5fc5d0
removed stray paren
...
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
2014-01-25 13:17:01 -08:00
Cole Gleason
2a91cee0ff
Merge branch 'round-boss' into develop
2014-01-25 13:22:49 -06:00
Cole Gleason
1412570484
revert(party): Round boss health up instead of to nearest integer
...
This reverts commit 626da5681fFixes #2563 .
2014-01-25 13:22:24 -06:00
Dušan Juretić
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
Marcelo Sizer
17c63cdc6e
Replace string for env.t
2014-01-24 20:26:33 -02:00
Matteo Pagliazzi
2eb7ea5e91
Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
...
Refactor translations
2014-01-24 13:53:46 -08:00
Matteo Pagliazzi
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
Cole Gleason
0c935f9c9a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-01-24 15:29:17 -06:00
Cole Gleason
626da5681f
fix(party): Round boss health up instead of to nearest integer
...
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.
Fixes #2504 .
2014-01-24 15:27:30 -06:00
Matteo Pagliazzi
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
Marcelo Sizer
ed71522131
Fix version conflict
2014-01-24 07:28:30 -02:00
Marcelo Sizer
d3d970b87f
Make locked quests purchasable
2014-01-23 23:11:30 -02:00
Marcelo Sizer
fe99bca10f
Fix spacing errors #2536
2014-01-23 21:58:38 -02:00
Marcelo Sizer
9e6a9a3d0e
Don't show information if the quest is locked
2014-01-23 18:26:55 -02:00
Marcelo Sizer
6c68c51ab5
Fix version conflict
2014-01-23 17:26:37 -02:00
Marcelo Sizer
b2d5e2a090
Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest
2014-01-23 15:53:42 -02:00
Matteo Pagliazzi
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
Luveluen
6f3229c679
Update tavern.jade
2014-01-23 10:16:32 +01:00
Luveluen
669789df67
Update index.jade
2014-01-23 09:45:34 +01:00
Luveluen
50f992b63c
Update hall.jade
2014-01-23 09:43:17 +01:00
Luveluen
ab84219835
Update group.jade
2014-01-23 09:40:31 +01:00
Luveluen
ed180692e3
Update create-group.jade
2014-01-23 09:36:32 +01:00
Luveluen
6fb88ee1b5
Update chat-message.jade
2014-01-23 09:35:18 +01:00
Luveluen
34fe364fea
Update chat-box.jade
2014-01-23 09:33:41 +01:00
Luveluen
2282e36bac
Update challenges.jade
2014-01-23 09:31:33 +01:00
Tyler Renelle
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
Tyler Renelle
ae0d758d8f
feat(challenges): add button for csv export
2014-01-22 23:22:21 -08:00
Sabe Jones
d782fc6b6a
fix(stats): Better layout for attribute point allocation
2014-01-22 20:34:03 -06: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
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
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
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
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
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
41233c7b16
feat(challenges) markdown in challenge-descriptions
2014-01-16 12:28:28 -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
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
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
daeb846ffb
profile.jade use some jade magic to compactify the code
2014-01-13 22:15:32 -07: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
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
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
Tyler Renelle
833d597bfe
fix #2284 remove unecessary chat-message scrollbars
2014-01-07 11:27:29 -07: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
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
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
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
c9e083b602
challenges: add "official habitrpg challenge" option
2014-01-03 13:36:13 -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
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
Tyler Renelle
77c6777506
checklists: collapse individually
2013-12-31 13:50:14 -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
4fcee66c3b
checklists: inline by default, add help popover
2013-12-30 14:40:07 -07:00
Tyler Renelle
63541ad268
checklists: add inline-checklists user preference, and hide inlines when
...
editing
2013-12-30 10:33:48 -07:00
Sabe Jones
d3a6191a5e
Merge branch 'develop' into sabe/attributes
2013-12-30 10:25:08 -06:00
Sabe Jones
c3aed6fb28
RPG demystification, cont'd
2013-12-29 20:58:35 -06: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
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
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
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
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
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
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
Tyler Renelle
c51cdd0849
classes: proper handling of items on class-switch, un-equipping items,
...
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
2013-12-06 15:41:58 -07:00
Tyler Renelle
3e5c213694
classes armory: separate gear listings by class type, show selected gear
2013-12-06 09:26:02 -07:00
Sabe Jones
dd8b38ca04
Answer tavern FAQ in resource links
2013-12-06 06:34:54 -06:00
Tyler Renelle
e5c34af7fd
grunt-spritesmith contrib gear habitrpg-shared#69d248f
2013-12-05 15:47:08 -07:00
Tyler Renelle
5fd378ebed
classes: fixes to beard / chin overlap
2013-12-05 11:05:36 -07:00
Tyler Renelle
2563ec5763
classes: beards & mustaches!
2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900
classes: fixes to class-selection & reroll, remove show/hide gear since
...
we're using costumes
2013-12-04 23:53:55 -07:00
Tyler Renelle
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
Tyler Renelle
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0
classes & grunt-spritesmith: death, paws, gems-cleanup
2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
Tyler Renelle
19b6eb73e0
Merge branch 'develop' into classes
...
Conflicts:
public/css/index.styl
src/models/user.js
views/options/profile.jade
views/shared/header/avatar.jade
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
Sabe Jones
37f7a923ea
Fix #1934 (make Reset and Restore options more distinct)
2013-12-02 10:20:38 -06:00
Sabe Jones
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
Bob Steffes
2905a2777e
Fix reposition of markdown formatting after 2 reverts
...
What a mess, but I think it's oK now. Sorry.
2013-11-30 16:37:04 -08:00
Bob Steffes
0dd911f2ba
Revert "Re-modify position of markdown down formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:29:17 -08:00
Bob Steffes
b1e5ee6433
Revert "Reposition Markdown formatting link"
...
This reverts commit 7fdda14cb8
2013-11-30 16:26:35 -08:00
Tyler Renelle
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
Bob Steffes
bb3f0ae7ec
Reposition markdown formatting link (3rd try)
...
This replaces previous 2 commits. z-index has been removed.
2013-11-30 12:07:23 -08:00
Bob Steffes
db7e582c95
Re-modify position of markdown down formatting link
...
I think this one makes more sense than previous PR and it also adjust
spacing of Note. Still interested in feedback (would it make sense to
add to docs.css and call a class or just do it inline?
This is also first time, I've submitted a change to a pull request (and
I'm not sure what's gonna happen). Hopefully github is smart and just
modifies the previous commit (but we'll see).
2013-11-30 10:21:32 -08:00
