sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3808 commits 3 branches 0 tags 1.6 GiB
Commit graph

559 commits

Author SHA1 Message Date
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4 
Added link to HabitRPG wiki.
 2013-12-08 09:54:36 -05: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
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00
Tyler Renelle
e367985fa8 window.env not available on frontpage, @paglias is this an ok workaround? 2013-12-07 11:56:22 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Xatres
2d6fb91273 Updated Beginner's Tour, Mk 3 
Quickfix to changed "sex" to "body type," in anticipation of coming customization updates.
 2013-12-07 11:59:08 -05: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
Xatres
d2a0fb073f Updated Beginner's Tour, Mk 2 
Fixed issues proposed by SabreCat, including gender neutral language, general terminology, and adding a note about unlockable features at the end.
 2013-12-06 15:46:39 -05:00
Matteo Pagliazzi
9b459e37f3 fix siteVerion check & reload page after batchUpdate if needed, @lefnire let me know what do you think and if it needs to be applied to other routes too 2013-12-06 21:43:25 +01:00
Tyler Renelle
b852d9a9f2 classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f 2013-12-06 11:46:07 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -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
469a1e5e12 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-12-05 21:50:47 -06:00
Tyler Renelle
7f1892b34a classes: move item-store sorting from web to shard (so we can share with 
mobile) habitrpg-shared#6651665
 2013-12-05 18:20:09 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -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
62d50a1f4d classes: fixes to buying items 2013-12-04 23:10:14 -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
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
Xatres
a28327410e Updated Beginner's Tour 
As requested by SabreCat, I've done some editing on the Beginner's Tour. Mostly I just flesh out the guide to how the game works and try to contextualize everything on the page with the user avatar. If we implement these changes, there may need to be a few edits to the starting task descriptions to prevent overlap.

Definitely check to make sure I didn't mess up any of the coding. I'm a writer, not a programmer.
 2013-12-02 19:01:17 -05:00
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Sabe Jones
30a5b349f8 Fix #1909 (keep stack selected after selling item) 2013-12-01 10:16:21 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07:00
Nick Gordon
5b610bfc5c small fix for sanity 2013-11-27 22:48:48 -08:00
Nick Gordon
62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Nick Gordon
1d03fee4e3 change reference to images directory for emoji, fixes #1935 2013-11-27 20:46:18 -08:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Matteo Pagliazzi
bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01:00
Matteo Pagliazzi
a196cc0586 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-27 15:59:02 +01:00
Nick Gordon
13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 2013-11-26 21:49:53 -08:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Tyler Renelle
2b128f71f4 [#1532] add better validation on preferences.dayStart, and a migration to 
cleanup corrupt ones
 2013-11-26 15:18:20 -07:00
Matteo Pagliazzi
860a084c69 fix for multiple guilds creation 2013-11-26 20:16:10 +01:00
Matteo Pagliazzi
c4e8de2ee0 fix language switching 2013-11-25 17:34:41 +01:00
Matteo Pagliazzi
2e8fc8d248 use script tag not eval to execute moment language code 2013-11-25 17:04:07 +01:00
Matteo Pagliazzi
17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01:00
Matteo Pagliazzi
d1698460e0 add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too 2013-11-24 21:45:24 +01:00
Nick Gordon
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
Matteo Pagliazzi
fa2fb8e3fb open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function 2013-11-24 17:49:12 +01:00
Nick Gordon
0e7c7e439f images shown with markdown now link to themselves in an external browser window 2013-11-23 19:33:41 -08:00
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
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -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
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Adrien Lemaire
b36a288f04 add sort by date joined option 2013-11-23 22:06:22 +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
Adrien Lemaire
be4691cf58 sort by level 2013-11-23 16:21:43 +11: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
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
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
Matteo Pagliazzi
a8578602d7 fix drops not showing until refresh 2013-11-22 19:21:34 +01:00
Matteo Pagliazzi
8955fb5a39 typo 2013-11-20 21:44:20 +01:00
Matteo Pagliazzi
1a388fa994 fix #1803, when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code? 2013-11-20 21:36:18 +01:00
Matteo Pagliazzi
4bedefbc57 use helpers.countPets on server, fix client side pet count 2013-11-20 18:48:48 +01:00
Nick Gordon
afc9b6f62b chat highlights work properly when preceeded by spaces again 2013-11-20 06:46:07 -08:00
Nick Gordon
46410bc244 accomodate longer titles per #1855 2013-11-19 06:39:14 -08:00
Adrien Lemaire
7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Matteo Pagliazzi
557d65a626 do not count rare pets into pet counts & fix beast master achievement 2013-11-18 16:18:57 +01:00
Tyler Renelle
a262828e09 Merge pull request #1847 from HabitRPG/sabe_tweak_3 
Work on standardizing terminology
 2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
13856ce1ce Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-17 20:53:00 +01:00
Matteo Pagliazzi
a81e77f0ff update chat messages timestamp 2013-11-17 20:52:39 +01:00
Sabe Jones
b701e2b24a Go with the borderless option 2013-11-17 10:21:43 -06:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Sabe Jones
44a82c71e2 Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer. 2013-11-17 07:40:19 -06:00
Matteo Pagliazzi
b83eb0ee28 moment is exported as an helper by habitrpg-shared 2013-11-17 13:28:57 +01:00
Matteo Pagliazzi
34d5eda736 [#1832] remove relative-date, use moment instead 2013-11-17 13:21:21 +01:00
Nick Gordon
55998085e3 fixed the issue with case insensitive highlighting highlighting short usernames 
how this works:
* rather than throw an expensive regular expression at each chat message, we start by checking to see if the users name exists.
* then, by simple string manipulation we verify that the preceeding character before the alleged username is whitespace, the start of a line, or an '@' character.
* FINALLY, we verify the following character is a non-word character using a regular expression.
* then we cache the highlight status on the local `message` object, because for some reason, this function is called **every time a character is typed in the chatbox.** this seems like a hugh performance problem to me, need to see if there is a way to disable that or something
 2013-11-16 09:24:01 -08:00
Tyler Renelle
b9d3b3a1a7 admin: refresh contrib list when saving a member 2013-11-15 20:06:18 -08:00
Tyler Renelle
b762ecba81 admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes 2013-11-15 19:27:23 -08:00
Tyler Renelle
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
05334550b0 [#1837] separate groups filter from "create new challenge"-available groups 2013-11-15 17:36:36 -08:00
Nick Gordon
5116a99dce moved UI stuff into the settings area, moved authWithSession to the Auth controller 2013-11-15 16:25:09 -08:00
Nick Gordon
b958103447 Merge branch 'develop' of https://github.com/snicker/habitrpg into develop 2013-11-15 06:20:37 -08:00
Nick Gordon
7bf1bf2af0 data export commit, supports exporting task history via csv 
*adds the following new dependencies: moment, express-csv
*recommend replacing functionality of 'relative-date' with features from 'moment'
*supports retrieval of CSV history via the API and in browser
**/api/v1/export/history (requires typical API authorization)
**/export/history.csv (requires session authorization)
*adds new routes for data export
 2013-11-15 06:18:16 -08:00
Tyler Renelle
9b1c8884a4 [#1735] fix repeated timezone setting for UK users 2013-11-14 21:29:34 -08:00
Tyler Renelle
3461d67995 challenges: include challenges that user created, or belongs to, even if 
not in group anymore
 2013-11-14 20:30:48 -08:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Matteo Pagliazzi
c256295d6f fix tests, @lefnire not the best solution but it works 2013-11-14 14:48:36 +01:00
Matteo Pagliazzi
0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed 2013-11-14 14:41:42 +01:00
Matteo Pagliazzi
c75bfaa4d9 remove $rootScope.translations, it should not be necessary, update readme 2013-11-14 14:16:46 +01:00
Tyler Renelle
10e9c205e6 Merge branch 'translations' into develop 
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
 2013-11-13 23:37:29 -08:00
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire
153d1957a8 clean code from websites 
Need review !
 2013-11-14 15:20:35 +11:00
Matteo Pagliazzi
83d9368c2e translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set 2013-11-13 22:01:02 +01:00
Tyler Renelle
56b1684a45 Merge pull request #1798 from snicker/develop 
Fixed issues with positioning of userlist
 2013-11-12 20:16:42 -08:00