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

48 commits

Author SHA1 Message Date
Tyler Renelle
830089a74e some fixes to make sure {#each} contains one-and-only-one element 2013-04-21 17:46:58 -04:00
Tyler Renelle
77e7b3e36d take custom overridden profile name into account 2013-04-15 09:56:32 -04:00
Tyler Renelle
3a64c1104a add pets count on character popover. also, static bindings wherever 
possible - saves CPU
 2013-04-15 02:27:38 -04:00
Tyler Renelle
6e0b82e081 move Rest checkbox out of avatar into settings for now, we'll put back 
once we've added the tavern art
 2013-04-14 14:33:50 -04:00
Daniel Saewitz
9917173429 Rest 2013-04-11 18:22:06 -04:00
Tyler Renelle
6522badaa6 rename _view.* to _* - don't know why I did that whole _view.* thing 
in the first place, but whatevs
 2013-04-07 20:29:13 -04:00
Tyler Renelle
51f054e51c show tokens in character modal at all times 2013-03-28 08:43:13 -07:00
Tyler Renelle
4edbb8bf3d pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future) 2013-03-27 11:34:41 -07:00
Tyler Renelle
6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit 
previous architecture, add some placeholders for the un-finished
potions. got them working
 2013-03-27 00:20:33 -07:00
Tyler Renelle
903f2b17c6 pets: bug where everyone shows main user's pet 2013-03-26 22:15:52 -07:00
Tyler Renelle
77f697446c pets: revert back to market as top-level tab 2013-03-26 18:57:58 -07:00
Tyler Renelle
f6b2c08a60 Merge branch 'develop' into pets 
Conflicts:
	views/app/rewards.html
 2013-03-26 17:54:31 -07:00
Tyler Renelle
b2f0ee58c8 pets: move market into inventory as sub-tab 2013-03-25 17:01:16 -07:00
Tyler Renelle
64e421d529 pets: add eggs to market, move from rewards tab to avatar modal 2013-03-25 15:44:41 -07:00
Zachary Kain
0f49ec3ebc fix 697 remove level from top of herobox 2013-03-25 16:03:13 -04:00
Tyler Renelle
acdb9eb5e5 add better temporary pet positioning 2013-03-22 22:40:12 -06:00
Tyler Renelle
6fd9bfbab4 pets: use pet.name for unique identifier, not pet.text. general cleanup 2013-03-22 22:17:25 -06:00
Tyler Renelle
c170cd269f move some more pet html into pets.html 2013-03-22 19:37:48 -06:00
Tyler Renelle
a862e21e8e Merge branch 'develop' into pets 2013-03-22 19:06:48 -06:00
Tyler Renelle
3d679ba94e fix to "anonymous" username 2013-03-21 16:50:27 -06:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory 
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
 2013-03-21 13:51:38 -06:00
Zachary Kain
dd0b041565 remove duplicate user name from party popover 2013-03-21 14:55:35 -04:00
Tyler Renelle
fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks 
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
 2013-03-21 12:36:05 -06:00
Zachary Kain
1d93793616 fix customization modal cutting off herobox 2013-03-19 01:02:59 -04:00
Zachary Kain
30b3b527a5 fix no name showing up if not logged in 2013-03-19 00:09:06 -04:00
Zachary Kain
915c86d8ba implement avatar variable system with data attributes and css. LIKE A BOSS 2013-03-19 00:04:24 -04:00
Zachary Kain
507a0fc3c9 MASSIVE HEADER CHANGES OH SHIT 2013-03-18 23:42:03 -04:00
Tyler Renelle
49db610602 fix to "editing profile" bug. move {#with _user.preferences as :p} 
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
 2013-03-18 15:43:02 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz
099008d557 whitespace 2013-03-16 15:36:56 -04:00
Daniel Saewitz
6d34fa8953 Highlight active pet 2013-03-16 15:09:16 -04:00
Daniel Saewitz
419351494c Clean up helpers + choose Pet 2013-03-16 14:58:09 -04:00
Daniel Saewitz
2ffe0aecf9 FeedEgg 2013-03-16 11:18:27 -04:00
Tyler Renelle
f2faf8c968 add 'show helm' option 2013-03-15 17:20:01 -04:00
Daniel Saewitz
ab332d5f23 Save eggs as object so we can grab text easily 2013-03-09 20:03:24 -05:00
Daniel Saewitz
aece4b1a41 Add food drop and avatar stable 2013-03-09 15:34:48 -05:00
Daniel Saewitz
9f172cb627 Merge branch 'inventory' of github.com:switz/habitrpg into inventory 2013-03-09 13:34:04 -05:00
Daniel Saewitz
96e36f97d3 Add eggs and rename to food 2013-03-09 13:33:57 -05:00
Tyler Renelle
65b7f432a9 get the pets working for the avatar box, with consistent names (need 
to manually apply with model.set for now)
 2013-03-09 12:03:38 -05:00
Daniel Saewitz
db132fad19 Show meats in inventory 2013-03-09 08:17:02 -05:00
Daniel Saewitz
9a06f5d6c3 Add inventory tab 2013-03-07 23:23:18 -05:00
Tyler Renelle
39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00
Tyler Renelle
22ac8e1d16 add faux achievements, fix error page 2013-02-17 15:07:56 -05:00
Tyler Renelle
eb56efb0dc for now remove badges section of profile 2013-02-17 01:55:17 -05:00
Tyler Renelle
a3ef2e1977 temporary method for active profile username - {#if} on private paths 
in derby seems iffy
 2013-02-17 01:51:40 -05:00
Tyler Renelle
6dafefc45a show profile for the individual you clicked 2013-02-17 01:31:10 -05:00
Tyler Renelle
4602e0bf5b more separation 2013-02-17 00:55:52 -05:00
Tyler Renelle
dd5f2f7a12 move more html files around 2013-02-17 00:45:17 -05:00