sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3731 commits 3 branches 0 tags 1.6 GiB
Commit graph

81 commits

Author SHA1 Message Date
Tyler Renelle
26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -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
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -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
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07: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
17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01: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
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
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +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
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
Nick Gordon
46410bc244 accomodate longer titles per #1855 2013-11-19 06:39:14 -08:00
Sabe Jones
b701e2b24a Go with the borderless option 2013-11-17 10:21:43 -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
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08: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
Nick Gordon
edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Tyler Renelle
32a94871d2 Merge pull request #1796 from snicker/develop 
Autocompletion of nicknames in chat
 2013-11-12 00:17:29 -08:00
Nick Gordon
cd693835ce Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages 2013-11-11 22:32:52 -08:00
Tyler Renelle
bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle
05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Nicole Foster
95031fb6ee Even space between limited edition skins and rainbow skins 2013-11-09 15:25:31 -05:00
Tyler Renelle
962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle
557ce59c71 back to non-halloween NPCs 2013-11-03 17:44:46 -08:00
Tyler Renelle
646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't 
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
 2013-11-02 16:07:12 -07:00
Matteo Pagliazzi
2da33b0355 add loading bar to front page too 2013-11-01 21:07:44 +01:00
Matteo Pagliazzi
3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Matteo Pagliazzi
1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00
J. Ozymandias Fallick
22b429242f Merge remote-tracking branch 'upstream/develop' into manual-due-date 2013-10-23 14:34:36 -04:00
Tyler Renelle
f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle
e7886e00b4 halloween: highlght limited skins, add description about limited, rename 
to "rainbow" and "spooky" @lemoness
 2013-10-22 17:56:46 -07:00
Tyler Renelle
2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle
a1959a9beb halloween: use halloween npcs habitrpg-shared@0ffd265 2013-10-22 16:20:37 -07:00
Tyler Renelle
534a761875 remove customizer css, moved to habitrg-shared@06e489d 2013-10-22 16:19:54 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi
18c06b5043 user top right button should not cover notifications, they can be closed with a click on the "x" 2013-10-21 20:44:31 +02:00
Tyler Renelle
378d158a44 pegs: restructure inventory/market html so we market is aware of 
inventory and we can sell items
 2013-10-19 19:36:59 -07:00
Tyler Renelle
be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00
Tyler Renelle
81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle
4c018d84c1 Merge branch 'paypal' into develop 
Conflicts:
	bower.json
 2013-10-12 19:23:44 -07:00