Nick Gordon
aa91d21189
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-23 17:39:19 -08:00
Nick Gordon
38225896f4
fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left
2013-11-23 17:37:20 -08:00
Tyler Renelle
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
Nick Gordon
b793d2b753
fix for https://github.com/HabitRPG/habitrpg/issues/1900
2013-11-23 16:45:14 -08:00
Nick Gordon
2604d8e21e
fix for https://github.com/HabitRPG/habitrpg/issues/1903
2013-11-23 16:20:34 -08:00
Tyler Renelle
3d93f63216
classes: multi-class items WIP
2013-11-23 17:00:55 -07:00
Tyler Renelle
83e3a6aff2
classes WIP
2013-11-23 16:59:41 -07:00
Adrien Lemaire
a1d9026052
Merge pull request #1901 from Fandekasp/header_colors
...
add npc color, update leader background
2013-11-23 15:50:20 -08:00
Adrien Lemaire
47cf0eb07d
add npc color, update leader background
2013-11-24 10:49:33 +11:00
Tyler Renelle
33c2c1db2d
Merge pull request #1888 from HabitRPG/sabe_tweak
...
Fix matters of colons
2013-11-23 14:45:45 -08:00
Tyler Renelle
c5a42cbf5a
Merge pull request #1899 from Fandekasp/header_colors
...
change avatars lvl colors
2013-11-23 13:12:36 -08:00
Tyler Renelle
71d832f263
Merge pull request #43 from DanielTheBard/classes
...
Updated Abilities
2013-11-23 12:52:48 -08:00
Daniel the Bard
c2810a4074
Merge branch 'classes' of https://github.com/DanielTheBard/habitrpg-shared into classes
...
Conflicts:
script/items.coffee
2013-11-23 14:27:50 -05:00
Nick Gordon
4453ac9fb8
removed comments from testing.
2013-11-23 11:14:16 -08:00
Daniel the Bard
fc39169b7a
Updated Abilities
...
Not sure how balanced they are. Will probably require some play-testing. I'm sure we'll make adjustments as we go along.
Also built this on the assumption of maybe starting with maybe 30mp, and gaining 2 mp per point of INT?
2013-11-23 14:03:30 -05:00
Nick Gordon
52145a479e
testing completed, committing test results in comments
2013-11-23 10:55:56 -08:00
Daniel the Bard
2544c13045
Class Abilities Updated
2013-11-23 13:41:42 -05:00
Nick Gordon
40de2f3bf0
manual testing of bindonce commencing -____-
2013-11-23 09:26:39 -08:00
Matteo Pagliazzi
1dfd3b8b05
remove code moved in previous commit
2013-11-23 17:45:03 +01:00
Matteo Pagliazzi
df5a436338
use countPets also for stats, fix #1898
2013-11-23 17:42:47 +01:00
Sabe Jones
baf89c7023
Merge branch 'develop' into sabe_tweak
2013-11-23 09:48:15 -06:00
Sabe Jones
0d6f3dd5e6
Make number format consistent between current exp and exp TNL ( fix #1827 )
2013-11-23 09:46:28 -06:00
Adrien Lemaire
d4b25fdc5f
change avatars lvl colors
2013-11-24 01:04:27 +11:00
Sabe Jones
983df5c97c
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-23 06:54:00 -06:00
Adrien Lemaire
b36a288f04
add sort by date joined option
2013-11-23 22:06:22 +11:00
Adrien Lemaire
cef1e07b18
add migration script → default 'random'
2013-11-23 22:03:13 +11:00
Adrien Lemaire
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
Adrien Lemaire
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
snicker
6eed685004
Merge pull request #1892 from snicker/develop
...
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 23:01:15 -08:00
Nick Gordon
90582c3709
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 22:57:41 -08:00
snicker
11bf814151
Merge pull request #1891 from snicker/develop
...
reverting more bindonce changes...
2013-11-22 22:47:36 -08:00
Nick Gordon
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
Tyler Renelle
123c515cbb
challenges: only push history for dailies / habits
2013-11-22 23:22:24 -07:00
Sabe Jones
9e5e035c6e
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-22 23:22:47 -06:00
Adrien Lemaire
be4691cf58
sort by level
2013-11-23 16:21:43 +11:00
snicker
306e235ef7
Merge pull request #1887 from snicker/develop
...
some style fixes for markdown in chat
2013-11-22 21:17:35 -08:00
Nick Gordon
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
Tyler Renelle
c2b8a62749
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:12:43 -07:00
Tyler Renelle
18d6bed3b8
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:07:27 -07:00
snicker
3bc285f281
Merge pull request #1886 from snicker/develop
...
Yeah, this didn't work with the achievements popup
2013-11-22 16:02:28 -08:00
Nick Gordon
dfb09b1f9b
Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal
2013-11-22 15:59:53 -08:00
Tyler Renelle
fac99c7f7f
[ #1862 ] re-migrat users with items.pets, items.hatchingPotions, or
...
items.eggs which are arrays, not objects. This shouldn't be happening
still, need to investigate
2013-11-22 16:22:09 -07:00
snicker
f006a97f42
Merge pull request #1885 from snicker/bindonce
...
Bindonce implementation
2013-11-22 15:21:16 -08:00
Nick Gordon
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
Nick Gordon
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
Nick Gordon
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
Matteo Pagliazzi
8e5edbbef8
fix #1611 , @lefnire added a migration for deleted tags, this time it should not delete all of them ;)
2013-11-22 20:23:41 +01:00
Matteo Pagliazzi
e722a064c8
revert drop notification change
2013-11-22 20:11:35 +01:00
snicker
b723bc17dd
Merge pull request #1880 from snicker/develop
...
super awesome mega-fix with unintended awesome collateral-fixes
2013-11-22 10:49:25 -08:00
Nick Gordon
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
