Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,980 Commits 64 Branches 1,256 Tags
e30bf204b4c5003fc94de05ddcea7fc3bb88fa75
Commit Graph

585 Commits

Author SHA1 Message Date
Tyler Renelle 823f524d57 begin adding toggle-header 2013-03-15 16:47:48 -04:00
Tyler Renelle d8918790e5 update comment 2013-03-15 12:27:22 -04:00
Tyler Renelle a7de94f180 move party stats to a modal 2013-03-15 12:24:30 -04:00
Tyler Renelle d2837afbd4 move tnl to a view function instead of model function, beging adding 
party stats visuals (hp & exp presently)
 2013-03-15 12:00:47 -04:00
Tyler Renelle 2f372124b3 start moving javascript loading functionality back to <Scripts:> so we 
can utilize CDNs
 2013-03-15 11:15:35 -04:00
Tyler Renelle 646deb2cdd protocol-agnostic fonts 2013-03-14 15:51:29 -04:00
Tyler Renelle 3f251c4b32 Merge pull request #624 from zakkain/ui-tweaks 
Time to update the dev preview again!
 2013-03-14 11:38:06 -07:00
Daniel Saewitz 3d5e3c7743 Fix modals 2013-03-13 11:47:37 -04:00
Daniel Saewitz 4485d226e8 1% chance on every score to get an item 2013-03-13 11:37:06 -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 31c0099119 Drop an egg when the user htis level 4 2013-03-09 08:30:06 -05:00
Daniel Saewitz db132fad19 Show meats in inventory 2013-03-09 08:17:02 -05:00
Zachary Kain e5a893a710 revamp rewards and pets UI. Obv pets is temporary pending new pet system 2013-03-09 01:34:15 -05:00
Zachary Kain f89037da53 new drag animation, tiny outline & shadow tweaks 2013-03-08 22:26:01 -05:00
Zachary Kain 17dcb70e04 Merge remote-tracking branch 'upstream/develop' into ui-tweaks 2013-03-08 19:01:25 -05:00
Daniel Saewitz f71e2fbade Working... in progress 2013-03-08 12:55:04 -05:00
Daniel Saewitz 510bcda47c wip 2013-03-08 12:44:21 -05:00
Daniel Saewitz 9a06f5d6c3 Add inventory tab 2013-03-07 23:23:18 -05:00
Tyler Renelle 36677c0585 Merge branch 'origin-develop' 2013-03-07 13:16:54 -05:00
Tyler Renelle db805b6388 Merge pull request #592 from aaron4/patch-1 
Added space after each line of text (privacy.html)
 2013-03-06 10:11:01 -08:00
Tyler Renelle 467cbfba64 Merge pull request #593 from aaron4/patch-2 
Added space after each line of text (terms.html)
 2013-03-06 10:09:42 -08:00
Philip How 0dbf2257d7 New Algorithms + fixes 2013-03-06 17:02:08 +00:00
Zachary Kain 81a527e5d6 android mobile bugfixes 2013-03-06 01:29:13 -05:00
Zachary Kain f0462d022f style Todo tabs, misc stuff 2013-03-06 01:15:45 -05:00
Zachary Kain 456580e352 gut & re-style Task Options, only Rewards tasks & options left to go through 2013-03-06 00:50:39 -05:00
Zachary Kain 84e07a0317 better a11y than display:none 2013-03-06 00:50:39 -05:00
Zachary Kain 174c7a8b9f tweaks, most notably DISABLE CHART BUTAN 2013-03-06 00:50:39 -05:00
Zachary Kain a002932210 re-add Lato webfont 2013-03-05 20:29:20 -05:00
Tyler Renelle 4f6a78c0ae add help popover to difficulty 2013-03-05 20:12:09 -05:00
Tyler Renelle 4bb0207564 rename priority multiplier to "Difficulty" -> easy, medium, 
hard (people keep getting confused) and putting it back into
"advanced" section
 2013-03-05 20:12:05 -05:00
Tyler Renelle 48dc49e1c4 re-enstate double-rewards bug fix 2013-03-05 20:10:03 -05:00
Tyler Renelle 3f33261792 proper derby tabbing 2013-03-05 20:08:31 -05:00
Tyler Renelle 67c42f5e1a Merge branch 'develop' into zakkain-ui-tweaks 
Conflicts:
	styles/app/tasks.styl
	views/app/tasks.html
 2013-03-05 20:04:37 -05:00
Tyler Renelle 4f7cdc38e9 add help popover to difficulty 2013-03-05 18:58:15 -05:00
Tyler Renelle 9c14b29a3d rename priority multiplier to "Difficulty" -> easy, medium, 
hard (people keep getting confused) and putting it back into
"advanced" section
 2013-03-05 18:07:22 -05:00
Tyler Renelle 41b1ca9f73 typo 2013-03-05 17:05:05 -05:00
Tyler Renelle 6a280c57ea re-applying #553 fix 2013-03-05 17:04:22 -05:00
Tyler Renelle a8c09110f7 reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues 2013-03-05 17:02:22 -05:00
Tyler Renelle 16b9ea3b58 reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again 2013-03-05 17:00:44 -05:00
Tyler Renelle 1cd3299388 strange fix for #553, also #539 take note 2013-03-05 16:16:08 -05:00
Tyler Renelle 9a60ed5269 some html cleanup 2013-03-05 16:06:56 -05:00
Tyler Renelle bb82bcc62a namespacing for tasks & rewards too 2013-03-05 15:52:47 -05:00
Tyler Renelle 8132dbfe05 <task:> tabbing borked 2013-03-05 15:23:16 -05:00
Zachary Kain 1a308da495 better responsive breakpoints, more robust custom grid 2013-03-05 15:01:52 -05:00
Zachary Kain efe1c9267e WIP: new 'Task Actions' UI (buttons, checkboxes, etc) 2013-03-05 14:16:10 -05:00
aaron4 9ad67fa169 Added space after each line of text 
Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
 2013-03-05 10:42:40 -06:00