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
847f090b7a
Remove "yet" from no-food message
...
Fix pet peeve :trombone:
2013-12-08 21:25:34 -06:00
b6fceaca1b
fix some tavern links
2013-12-08 19:55:49 -07:00
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
c524972aa2
Merge pull request #1952 from HabitRPG/sabe/tweak
...
Tweaks from Sabe
2013-12-08 08:50:37 -08:00
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
714dad6e91
classes: small bug fixes
2013-12-07 20:41:48 -07:00
f8f8a1334b
Merge branch 'develop' into classes
...
Conflicts:
views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
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
59f8727cbf
classes: small tweaks
2013-12-07 11:31:11 -07:00
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
3e5c213694
classes armory: separate gear listings by class type, show selected gear
2013-12-06 09:26:02 -07:00
dd8b38ca04
Answer tavern FAQ in resource links
2013-12-06 06:34:54 -06:00
e5c34af7fd
grunt-spritesmith contrib gear habitrpg-shared#69d248f
2013-12-05 15:47:08 -07:00
5fd378ebed
classes: fixes to beard / chin overlap
2013-12-05 11:05:36 -07:00
2563ec5763
classes: beards & mustaches!
2013-12-05 03:31:02 -07:00
dde0655900
classes: fixes to class-selection & reroll, remove show/hide gear since
...
we're using costumes
2013-12-04 23:53:55 -07:00
5fea978e6b
costumes: add costume support in inventory
2013-12-04 22:50:20 -07:00
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
8803df46c0
classes & grunt-spritesmith: death, paws, gems-cleanup
2013-12-04 16:02:08 -07:00
55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
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
37f7a923ea
Fix #1934 (make Reset and Restore options more distinct)
2013-12-02 10:20:38 -06:00
af80548a34
Partial fix to #1938 (New name and location for Re-Roll)
2013-12-01 11:58:03 -06:00
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
962b854f87
Merge remote-tracking branch 'origin/sabe_tweak' into develop
...
Conflicts:
views/options/social/tavern.jade
2013-11-27 11:28:31 -07:00
aca122d6de
fix up CONTRIBUTING.md, update "submit bugs" links with this change
2013-11-26 17:09:13 -07:00
a4fb0b42ad
well, this wasn't the fix i was thinking of for #1893 , but it works and I don't know why I didn't do it in the first place
2013-11-26 12:06:48 -08:00
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
f4323ddc24
markdown links in chat will now open in a blank window.
...
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
2013-11-24 10:32:51 -08:00
6736da36d4
use jade class syntax
2013-11-24 17:49:25 +01:00
f7908ddbcb
Correct and clarify some details on contributor rewards
2013-11-24 09:50:21 -06:00
c51a34730d
Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off.
2013-11-24 08:53:48 -06:00
9086ccffcd
Consistent formatting of markdown hint in group edit fields
2013-11-24 07:41:41 -06:00
2101fe255f
Place link to Markdown help prominently in Tavern chat ( fix #1906 )
2013-11-24 07:35:12 -06:00
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
b793d2b753
fix for https://github.com/HabitRPG/habitrpg/issues/1900
2013-11-23 16:45:14 -08:00
83e3a6aff2
classes WIP
2013-11-23 16:59:41 -07:00
4453ac9fb8
removed comments from testing.
2013-11-23 11:14:16 -08:00
52145a479e
testing completed, committing test results in comments
2013-11-23 10:55:56 -08:00
40de2f3bf0
manual testing of bindonce commencing -____-
2013-11-23 09:26:39 -08:00
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
2a7adf7285
reverting more bindonce changes...
...
* challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29
* NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives
2013-11-22 22:44:02 -08:00
f26cb2abf3
making it nicer to be in chat if someone decides to post spammy crap or huge images
2013-11-22 21:15:28 -08:00
b431336463
more optimizations with bindonce, replacing ngIf with boIf.
...
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
2013-11-22 15:16:24 -08:00
0d19c0de21
Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if
2013-11-22 14:40:44 -08:00
2350e3d359
initial load of bindonce, implementation for chat. performance has improved noticibly, but I think we need to do this in a few other places
2013-11-22 14:23:47 -08:00
efe2ff5d70
super awesome mega-fix with unintended awesome collateral-fixes
...
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
2013-11-22 10:38:40 -08:00
Tyler Renelle