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

345 commits

Author SHA1 Message Date
Zachary Kain
c2dd51959f rewrite game over modal, remove tables 2013-02-09 16:22:39 -05:00
Zachary Kain
5132dacdf0 replace customizer table markup with figure & menu elements. CSS to match. Lots of minor UX tweaks. 2013-02-09 15:55:48 -05:00
Zachary Kain
675b506ff5 create avatar viewing window & add customizer-specific stylesheet 2013-02-09 14:41:19 -05:00
Zachary Kain
625dfe4b9b fixed level not showing up on party members, got myself a clean avatar ready to style 2013-02-09 14:24:05 -05:00
Zachary Kain
61d3da9b61 Revert "I don't think we should offer the “dead” skin option in character customization. Also having 4 hair and 4 skin options satisfies my “OCD” :D" 
This reverts commit 53a197097d.
 2013-02-09 13:49:27 -05:00
Zachary Kain
ebf99d40d1 char level only appears in the MAIN avatar, not the avatar in the customization modal 2013-02-09 13:49:24 -05:00
Zachary Kain
b638ee5ea6 tweak :active transition animation for more tactile feedback 2013-02-09 13:30:06 -05:00
Zachary Kain
53a197097d I don't think we should offer the “dead” skin option in character customization. Also having 4 hair and 4 skin options satisfies my “OCD” :D 2013-02-09 13:26:17 -05:00
Tyler Renelle
ad75d869c8 Merge pull request #357 from toebu/context-dependant-display 
Adding a new functionality that allows the context (i.e. css classes)
 2013-02-09 09:26:00 -08:00
Tyler Renelle
5fd5ef0130 final kickstarter message update 2013-02-09 11:14:41 -05:00
Tobias Leugger
c94563c8f3 Adding a new functionality that allows the context (i.e. css classes) 
of an element to be changed easily. Using this to implement the
'remaining todos' and 'complete todos' views. Reverting fix from
69e5778 that is now not needed anymore since task deletion works as
it used to.
 2013-02-09 16:45:00 +01:00
Tyler Renelle
aaf94d9a4d put social share links back into footer 2013-02-09 10:41:27 -05:00
Tyler Renelle
f49a532fcd another kickstarter message change 2013-02-09 10:34:21 -05:00
Tyler Renelle
bd7a39ddb1 Kickstarter message update 2013-02-09 10:20:10 -05:00
Tyler Renelle
4dd7bad81a small avatar html/css tweaks 2013-02-08 16:57:08 -05:00
Tyler Renelle
63bef37e98 fixes to gold / silver. Add copper, but not using it in the html (it's 
currently always calculated at 00)
 2013-02-08 16:41:04 -05:00
Tyler Renelle
0c6e51e6c7 avatar for party members 2013-02-08 15:18:15 -05:00
Tyler Renelle
e0d3b4fe3e CAN customize if not registered, but CAN'T join parties 2013-02-08 14:11:18 -05:00
Tyler Renelle
4ac5d5e24d put debugging in if in debugging environment 2013-02-08 13:57:00 -05:00
Tyler Renelle
2be5136a2f shop items now working. really crappy css (@Pandoro save me?) but it works 2013-02-08 13:43:57 -05:00
Tyler Renelle
5160595354 add @Pandoro's new sprites to /styl, clean up 2013-02-08 13:22:09 -05:00
Tyler Renelle
9250b8b2b5 some more fixes on "nextItem" 2013-02-08 12:50:37 -05:00
Tyler Renelle
1bcd4a3fbd some more half-backed changes for the new customization engine 2013-02-08 01:04:38 -05:00
Tyler Renelle
e42d4e6ba6 half-baked commit to save my progress and show my direction, we may 
want to rever this
 2013-02-07 22:42:59 -05:00
Tyler Renelle
b6398964fe got most of the character customizations working 2013-02-07 22:28:44 -05:00
Tyler Renelle
b134ec558d add in popover for customizations (can't get css working properly) 2013-02-07 21:24:04 -05:00
Tyler Renelle
76231aed12 begin integrating spritesheet 2013-02-07 20:53:11 -05:00
Tyler Renelle
1aa047d163 remove debuggging buttons 2013-02-06 15:05:14 -05:00
Tyler Renelle
906932090f Merge branch 'parties' 
Conflicts:
	src/app/helpers.coffee
	src/app/scoring.coffee
 2013-02-06 14:16:52 -05:00
Tyler Renelle
0e6d08e16b add more debug tools, and email me on error 2013-02-06 02:44:42 -05:00
Tyler Renelle
a0c4480c53 cleanup, typos, html tidying 2013-02-06 01:59:02 -05:00
Tyler Renelle
972a7af0ff various fixes and page-refresh fallbacks 2013-02-06 00:47:08 -05:00
Tyler Renelle
63dc9c1305 only show party in menu if unlocked 2013-02-05 20:21:26 -05:00
Tyler Renelle
fbeaabc7c0 sometimes model.session.userId is available, sometimes 
model.get('_userId'). *sigh*
 2013-02-05 19:25:46 -05:00
Tyler Renelle
c1ac873ad5 pretty up the html a bit 2013-02-05 18:52:29 -05:00
Tyler Renelle
9020ca4c17 Merge branch 'master' of github.com:lefnire/habitrpg 2013-02-05 11:54:09 -05:00
Tyler Renelle
dc00b0fb5e fix to 'gender' undefined 2013-02-05 11:51:24 -05:00
Tyler Renelle
f431090e0f forgot to bring in hiding ads 2013-02-05 11:49:17 -05:00
Tyler Renelle
4ac1a84acd kill party with last member, show user avatars in party 2013-02-05 01:46:46 -05:00
Tyler Renelle
6245d0adce setup party model subscriptions (currently very inefficient, and 
unsubscribe not being utilized)
 2013-02-05 01:37:13 -05:00
Tyler Renelle
a67c82aab5 accessControl basic framework for party system 2013-02-05 01:00:43 -05:00
Tyler Renelle
9723f3c37a don't need public/private paths after all, can check path requests in store accessControl callbacks 2013-02-04 23:32:40 -05:00
Tyler Renelle
6966f6a439 modify everything to accomdate migratino 2013-02-04 21:18:13 -05:00
Tyler Renelle
72cefaf787 Merge pull request #304 from Sabin144/master 
Fix for #47
 2013-02-04 15:59:57 -08:00
Tyler Renelle
c62b2d3e05 disable parties, merge in private, back to old REST, hide "next day" button 2013-02-04 17:43:30 -05:00
Tyler Renelle
57a7edc5d3 rename everything "friends" to "party", since we may use friends for 
following/followers feature
 2013-02-04 14:10:20 -05:00
Sabin144
e4d43846f6 Update views/app/index.html 2013-02-04 00:25:46 -05:00
Tyler Renelle
86ea99c2dc add "emulate next day" debugging button 2013-02-01 14:05:52 -05:00
Zachary Kain
791a19893c change the logic dictating change in bar size from if parties enabled to having party members 2013-01-30 22:25:20 -05:00
Tyler Renelle
7a478ab6cd fix to username, apply to main user 2013-01-30 21:22:38 -05:00
Tyler Renelle
d2c5506234 show friend modal for non logged in user 2013-01-30 20:54:34 -05:00
Tyler Renelle
a6ac1b0ce8 view.fn on specific user paths, getting errors otherwise 2013-01-30 18:57:46 -05:00
Tyler Renelle
e8ac4dcf86 unlock the party system at level 3, view.fn 'userName' 2013-01-30 18:22:52 -05:00
Tyler Renelle
c4526b3a37 fixes to html to include friend stuff 2013-01-30 17:49:21 -05:00
Tyler Renelle
fcadcb000f convert armor model.fn to a view.fn, so we can use on party too 2013-01-30 17:41:06 -05:00
Tyler Renelle
519dcf256e reactive model fucntion seems to bust the app, may need to send to use 
model.subscribe on get '/' and redirect on friend-add
 2013-01-30 17:14:55 -05:00
Tyler Renelle
57ab186a62 begin party subscription & view 2013-01-30 16:52:31 -05:00
Tyler Renelle
b896865865 v1 api using api token 2013-01-30 16:01:16 -05:00
Tyler Renelle
52b2532b5a armorset (v1 or v2) settings for females 2013-01-30 13:29:59 -05:00
Tyler Renelle
0e01160ee4 add setting for male / female 2013-01-30 13:25:10 -05:00
Tyler Renelle
466256f793 lotsa changes! renaming male/female icons, fix tnl & current armor 
refresh bug, model function for current armor (female pending)
 2013-01-30 13:03:10 -05:00
Tyler Renelle
371b532e70 remove mailing list alert 2013-01-30 12:19:10 -05:00
Tyler Renelle
bb4fa87f4a use data-targets instead of hrefs for modal links. fixes mobile 2013-01-29 00:50:36 -05:00
Tyler Renelle
4fae8f05a4 move flash error down below header 2013-01-28 23:56:44 -05:00
Tyler Renelle
d7e28ea07f some tweaks to last merge 2013-01-28 20:09:57 -05:00
Tyler Renelle
c2cd3d8498 Merge pull request #227 from SlappyBag/master 
Static Header & Popups
 2013-01-28 17:06:50 -08:00
Stan Lindsey
da3c0f1a2d All popups on left 2013-01-26 13:15:57 +00:00
Tobias Leugger
b697e7bdf1 Getting rid of the completedList and completedIds, instead only 
using the 'completed' attribute of the todo task. This fixes some
issues were a task was at the same time in the todoIds and
completedIds.
 2013-01-26 11:33:51 +01:00
Tyler Renelle
d4c2d274ba list item typo 2013-01-23 19:49:40 -05:00
Tyler Renelle
9051f2e40c more links 2013-01-23 19:39:32 -05:00
Tyler Renelle
e0d3df831b new footer links 2013-01-23 15:09:30 -05:00
Michael Writhe
82ed0971fd reward:gold field is now a number instead of text. Validates the input from user before submitting form... we should check the input once received as well, but this is good enough for now 2013-01-22 16:56:16 -07:00
Tyler Renelle
eb6fcaed25 remove addthis for app page (they see it on about page) 2013-01-21 10:00:51 -05:00
Tyler Renelle
08fadd3974 typo 2013-01-20 12:11:23 -05:00
Tyler Renelle
bb51f677f7 but _ga back in 2013-01-19 08:38:06 -05:00
Tyler Renelle
3c8d18e55e mass assignment on server #2 (@WIP) 2013-01-18 17:29:28 -05:00
Tyler Renelle
7f0d4ee1ec mass assignment on the server (@WIP) 2013-01-18 17:11:45 -05:00
Tyler Renelle
b95e063543 remove aws notification 2013-01-18 12:11:06 -05:00
Tyler Renelle
af58e1ce5f use updated bootstrap tabs 2013-01-18 12:10:52 -05:00
Tyler Renelle
79b784bdfb remove gittip, redirect about to splash 2013-01-18 12:10:49 -05:00
Daniel Saewitz
613e536fcb Turn off email form 2013-01-18 12:10:42 -05:00
Daniel Saewitz
3c1ef4a822 Collect emails 2013-01-18 12:10:38 -05:00
Daniel Saewitz
9d8569cfd9 Add email signup 2013-01-18 12:10:36 -05:00
Daniel Saewitz
57e46cdc89 Add parentheses 2013-01-18 12:10:34 -05:00
Tyler Renelle
4b48336098 aws notification 2013-01-18 12:10:15 -05:00
Tyler Renelle
30fe5cd744 Revert "Revert "add splash page to try to reduce server load"" 
This reverts commit 517ed68598.
 2013-01-16 13:07:01 -05:00
Tyler Renelle
517ed68598 Revert "add splash page to try to reduce server load" 
This reverts commit ecbe791e45.
 2013-01-16 13:05:49 -05:00
Tyler Renelle
ecbe791e45 add splash page to try to reduce server load 2013-01-16 12:59:53 -05:00
Tyler Renelle
e6f0476c09 "dismiss" link 2013-01-15 21:02:14 -05:00
Tyler Renelle
8ee3c5e2e3 have about be a modal, inserted for SEO. will consolidate content later 2013-01-15 20:16:24 -05:00
Tyler Renelle
129be203e1 seo fix 2013-01-15 19:31:06 -05:00
Tyler Renelle
7e02fc8214 try dismiss modal before showing stripe (performance) 2013-01-15 14:55:50 -05:00
Tyler Renelle
f5a07f0a1c use stripe v2 for easier checkout form 2013-01-15 14:35:25 -05:00
Tyler Renelle
5ea51acbd3 "why ads" verbage cleanup 2013-01-14 13:40:18 -05:00
Tyler Renelle
feba0878de move all the modals to one spot in the html. add footers to them, much cleaner 2013-01-14 13:32:48 -05:00
Tyler Renelle
7a74575094 why ads modal 2013-01-14 12:40:30 -05:00
Tyler Renelle
5e0ffce9bb add adsense in for now (monitization test) 2013-01-14 12:24:18 -05:00
Tyler Renelle
63c69bbb6b Hide Safari User Interface Components 2013-01-14 10:56:52 -05:00
Tyler Renelle
0b0d400fe7 update kickstarter wording 2013-01-12 18:13:41 -05:00
Tyler Renelle
effd635d7a update kickstarter message 2013-01-12 15:47:51 -05:00