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
2568 commits 3 branches 0 tags 1.6 GiB
Commit graph

811 commits

Author SHA1 Message Date
Tyler Renelle
836787906d bstart building challenges 2013-05-17 14:06:26 +01:00
Tyler Renelle
92e8e5b597 done trying to futz with user-menu css for maintaining visibility when 
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
 2013-05-17 12:09:43 +01:00
Tyler Renelle
4c0fe42d4e only hide header bits with preferences.hideHeader, fixes #979 2013-05-17 10:22:21 +01:00
Tyler Renelle
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Tyler Renelle
149961c07d z-index fix on NPC popover dialogs 2013-05-15 12:23:18 +01:00
Tyler Renelle
4aeb7c5635 better "level: 1" positioning, add stats to party members 2013-05-15 11:51:16 +01:00
Tyler Renelle
19016cc895 fix #958 2013-05-14 18:17:19 +01:00
Celtis
0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02:00
Tyler Renelle
2c7492709c tags: make tag-selection checkboxes for now, peopel aren't 
understanding combobox
 2013-05-14 16:07:37 +01:00
Tyler Renelle
4d5b87351f misspelled matt boch 2013-05-14 00:07:40 +01:00
Tyler Renelle
a8f9cc972f fix up stables / matt for smaller screens 2013-05-13 23:17:54 +01:00
Tyler Renelle
be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also 
include link to the pets spritesheet, and some info on mounts
 2013-05-13 21:29:27 +01:00
Slappybag
367c860ac8 syntax error on my part 2013-05-12 14:34:49 +01:00
Slappybag
ae0dfa9ffe Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-12 13:33:40 +01:00
Tyler Renelle
bb1ea755f1 tasks / rewards.html - pass in the actual list, and whether booleans 
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
 2013-05-12 13:12:13 +01:00
Slappybag
a287160d3b Changed Tavern message to be less threatening & simplier. 2013-05-12 12:41:00 +01:00
Tyler Renelle
f28a542aa4 small cleanup 2013-05-12 12:40:06 +01:00
Tyler Renelle
912b716a28 fix the reroll buy-button bug 2013-05-12 12:29:00 +01:00
Tyler Renelle
4347ba52ba overhaul tasks.html so we can start generalizing task-lists, 
ground-work for challenges
 2013-05-12 11:33:05 +01:00
Tyler Renelle
f7145bb951 cleanup of the show-completed / show-remaining. That context-dependant 
/ display-context-for stuff was bugging me out, and wasn't using Derby
to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses()
 2013-05-12 10:52:32 +01:00
Tyler Renelle
ca9d3bf2ed small bailey about tokens => gems 2013-05-12 00:51:59 +01:00
Tyler Renelle
d54afdcc3d tavern: icon-eye-close instead of icon-glass (to signify resting) 2013-05-12 00:26:17 +01:00
Tyler Renelle
0ca67bef95 wrap up some "token" => "gem" conversions, code-style 2013-05-11 19:19:09 +01:00
Tyler Renelle
35342e8b71 Merge pull request #925 from SlappyBag/develop 
Tokens = Gems for front-end display.
 2013-05-11 10:43:45 -07:00
Tyler Renelle
7131742524 update FAQ link 2013-05-11 15:29:27 +01:00
Tyler Renelle
2fcf5632ef add "resources" to tavern, n00000bs 2013-05-11 11:20:36 +01:00
Tyler Renelle
e6cd061bfd don't calculate dailies on cron when user is resting, this to prevent 
abusing the inn. see https://trello.com/card/rest-in-tavern/50e5d3684fe3a7266b0036d6/14
 2013-05-10 23:16:59 +01:00
Tyler Renelle
44bd61016f tags: cleaner tag-deletion handling 2013-05-10 18:23:05 +01:00
Tyler Renelle
ec87bf82b6 floor some user stats 2013-05-10 17:31:47 +01:00
Slappybag
88e6f40804 Tokens = Gems for front-end display. 2013-05-10 17:30:13 +01:00
Tyler Renelle
24ea5511fa colons insted of dashes 2013-05-10 17:13:38 +01:00
Tyler Renelle
293756719f add profile stats showing their attributes, gear, etc 2013-05-10 17:09:49 +01:00
Tyler Renelle
fcebebc601 use _items.next for the store, so we can access other _items 
throughout the app
 2013-05-10 16:42:21 +01:00
Tyler Renelle
d696d1946d hide main avatar popover again, we'll display in profile stats, lvl 
near user name
 2013-05-10 15:39:43 +01:00
Tyler Renelle
836c0a74e3 "one random gear piece" 2013-05-10 15:38:22 +01:00
Tyler Renelle
708e3cf781 more informative death modal, lose 1 lvl 2013-05-10 14:53:02 +01:00
Tyler Renelle
be3b71be39 tavern: show zzz's if they're checked in 2013-05-10 12:25:24 +01:00
Tyler Renelle
73e029d63e bailey notification on death 2013-05-10 12:03:19 +01:00
Tyler Renelle
1f3dbc8530 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-10 11:53:45 +01:00
Tyler Renelle
2e61d3f1ea chat: allow delete message 2013-05-10 11:53:20 +01:00
Stan Lindsey
12c6e111b4 Merge pull request #921 from switz/locales 
@slappybag => Allow locale to be set from a model middleware
 2013-05-10 03:49:13 -07:00
Tyler Renelle
193d79d72c Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-10 11:18:28 +01:00
Tyler Renelle
016bb08572 fix "reset not working in development mode" 2013-05-10 11:12:16 +01:00
Tyler Renelle
2a78fb5ea9 Revert "deploying in process.env.NODE_ENV='development' until we can fix #840" 
This reverts commit 6aba44c43d.
 2013-05-10 10:29:33 +01:00
Shane Lister
2234f57d73 Resting icon and pixely version of missing pet 2013-05-09 16:41:44 -07:00
Daniel Saewitz
58d6c39be8 Allow translations to be set from local model 2013-05-09 13:07:54 -04:00
Tyler Renelle
1e8adc7e17 tags: add clear-filters button so you can reset filters, but primarily 
to fix #918 (stopgap)
 2013-05-09 13:59:37 +01:00
Tyler Renelle
6aba44c43d deploying in process.env.NODE_ENV='development' until we can fix #840 2013-05-09 09:56:49 +01:00
Tyler Renelle
2774662474 backer-gear: add bailey alert 2013-05-09 09:14:05 +01:00
Tyler Renelle
8137e4b2a6 Merge branch 'develop' of github.com:lefnire/habitrpg into backer-gear 2013-05-09 08:40:34 +01:00
Tyler Renelle
d3fdd051e1 backer: fix pets html, add migration 2013-05-08 21:40:01 +01:00
Tyler Renelle
d7ad379ec1 achievements: extra note on contrib badge 2013-05-08 20:13:47 +01:00
Tyler Renelle
fcc0c4d3f3 add backer pet, move backer styles into its own stylus 2013-05-08 16:24:26 +01:00
Tyler Renelle
981bf3e71a start setting up backer gear in html 2013-05-08 15:42:44 +01:00
Tyler Renelle
fedc5b6a0d small functional overhaul of party.coffee to accomodate new party 
subscriptions, still need to run a migration
 2013-05-08 12:47:10 +01:00
Tyler Renelle
a64c40cd79 smarter, more performant view.fn equipped() function. also paves way 
for backer gear
 2013-05-07 21:07:52 +01:00
Tyler Renelle
b2bc54aead Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-07 17:59:14 +01:00
Tyler Renelle
ecf1ee5dea achievements: h5 for prettier titles 2013-05-07 17:53:18 +01:00
Slappybag
5f48658eff Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-07 17:48:09 +01:00
Slappybag
743474e573 CSS Updates: Filters Edit & Party/Tavern Chat 2013-05-07 17:48:00 +01:00
Tyler Renelle
55d9cfec55 add achievement silhouettes, so peopel know what they can achieve - 
FIXME optimize the {} vs {{}}
 2013-05-07 17:22:01 +01:00
Tyler Renelle
3416a9c71b always show achievements tab (we'll just need to do silhouette) 2013-05-07 16:19:28 +01:00
Tyler Renelle
5e16dddefa tags: add bailey notification 2013-05-07 08:59:14 +01:00
Tyler Renelle
81dbaaef67 use unicode & icon-repeat to solve character support issue, temporary 
solution to #868
 2013-05-06 22:20:21 +01:00
Tyler Renelle
33749af7c8 only show achievements tab if they have any 2013-05-06 21:28:27 +01:00
Tyler Renelle
88c0db47f1 tags: only show filters when in tasks view 2013-05-06 21:27:10 +01:00
Tyler Renelle
ad54079c0c tags: simply display by just showing an icon with a tooltip listing tags 2013-05-06 20:51:25 +01:00
Tyler Renelle
e2a4e8b826 small cleanup 2013-05-06 18:02:42 +01:00
Tyler Renelle
3347163d5c tags: rename to Filters: to Tags: 2013-05-06 18:00:30 +01:00
Tyler Renelle
9370958693 tags: move tags stuff in tasks html out to filters.html, click the 
tag on a task to apply tag
 2013-05-06 17:57:06 +01:00
Tyler Renelle
be6460edbb tags: click 'add' works now, along with enter 2013-05-06 17:34:17 +01:00
Tyler Renelle
d975931500 tags: add tags legend to task meta 2013-05-06 17:05:34 +01:00
Tyler Renelle
fa7232760c tags: use icon-pencil for editing 2013-05-06 16:43:01 +01:00
Tyler Renelle
82682e1af1 tags: cleanup, prevent bug for multiple tag-creation 2013-05-06 16:41:35 +01:00
Tyler Renelle
ccd091b622 tags: some visual cleanup of the filter bar 2013-05-06 15:59:58 +01:00
Tyler Renelle
bed0f64d47 tags: use select combobox instead of dropdown, easier code & mitigates 
some css issues
 2013-05-06 15:27:27 +01:00
Tyler Renelle
40dc8e422c new tag sets _newTag to '', reset dom, static-bound tag loop 2013-05-06 15:18:36 +01:00
Tyler Renelle
a3003a758d Merge branch 'tags' into develop 
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html
 2013-05-06 14:01:43 +01:00
Tyler Renelle
9737e0e2a2 settings in two panes rather than sub-tabs 2013-05-06 09:55:44 +01:00
Tyler Renelle
ed1f3acded full username test in chat (_user.profile.name only part of the 
equation), and min-height: 60px - was getting stacked longtext issue
 2013-05-05 23:29:10 +01:00
Daniel Saewitz
3526cd6f72 Keep relative times updated every 60 seconds 2013-05-05 13:44:24 -04:00
Daniel Saewitz
c1c2f025ad Merge develop and add functionality to party chat 2013-05-05 13:07:36 -04:00
Tyler Renelle
9b1bcb8367 dynamic pets, fix #897 2013-05-05 13:54:32 +01:00
Daniel Saewitz
68a932d5ab Remove timestamp 2013-05-04 15:00:26 -04:00
Daniel Saewitz
c8ddd39577 Add relative dates to chat 2013-05-04 14:56:21 -04:00
Daniel Saewitz
66dbc3f258 Highlight username in tavernchat 2013-05-04 13:15:47 -04:00
Tyler Renelle
7ebe611078 adjust achievement view logic for previous commit 2013-05-04 16:41:07 +01:00
Tyler Renelle
0f1ec096ef add backer.contributor & backer.npc for tavern & party chat 2013-05-04 16:03:03 +01:00
Tyler Renelle
c8e4386b4b add backer, npc, and contributor achievements (still need to run 
database migrations for them)
 2013-05-04 14:24:37 +01:00
Tyler Renelle
54ef864458 wording update 2013-05-04 11:45:51 +01:00
Tyler Renelle
5232589678 bailey alert for streaks 2013-05-04 11:35:11 +01:00
Tyler Renelle
4584433506 Merge branch 'master' into develop 2013-05-04 08:56:59 +01:00
Tyler Renelle
dd8935ec63 put popover back in for main herobox #890 2013-05-04 08:11:01 +01:00
Tyler Renelle
55957ca72d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-03 23:38:28 +01:00
Daniel Saewitz
63495a647b Send chat message on enter and disallow empty messages 2013-05-03 14:59:37 -04:00
Tyler Renelle
bcb2505a96 add streak GP bonus & drop bonus (separately handled) 2013-05-03 18:51:47 +01:00
Tyler Renelle
c9aa04439d begin implementing streaks 2013-05-03 18:20:28 +01:00
Tyler Renelle
df59817f64 add bailey notification for achievements 2013-05-03 16:39:11 +01:00
Tyler Renelle
db5466f381 add <hr/> 2013-05-03 16:24:59 +01:00
Tyler Renelle
055848452b add "max-gear" achievement 2013-05-03 16:24:28 +01:00
Tyler Renelle
7c93d80ae5 add beast-master achievement 2013-05-03 16:08:22 +01:00
Tyler Renelle
2b9f4e336b add achievemnts in as spritesheet 2013-05-03 15:46:59 +01:00
Tyler Renelle
2e3a4853f8 make "original user" achievement real. unfortunately would be a dick 
move to take away from any current users, even though they may have
only recently signed up - so just setting cut-off point to now
 2013-05-03 15:27:35 +01:00
Tyler Renelle
ae1a4230ca add pets count to stable page 2013-05-03 12:27:14 +01:00
Tyler Renelle
7308b8ffbc cleaner profiles modal, also fix bug where user.profile not being 
sent (hence not seeing eachother's info)
 2013-05-03 12:04:17 +01:00
Tyler Renelle
b3620f1db0 don't show stats popover for main user 2013-05-03 10:56:51 +01:00
Tyler Renelle
71b30e8289 add bailey notification 2013-05-02 21:31:07 +01:00
Tyler Renelle
079d91956a prettier rest-in-tavern 2013-05-02 21:21:51 +01:00
Tyler Renelle
c48d6bde13 add tavern chat 2013-05-02 21:09:50 +01:00
Tyler Renelle
c3eadab4dc notify of new chat messages 2013-05-02 20:23:50 +01:00
Tyler Renelle
f8e592d68f begin implementing party chat. still need notifications 2013-05-02 19:26:25 +01:00
Tyler Renelle
470cad9df3 add the latest NPCs to new stuff 2013-05-02 17:57:51 +01:00
Tyler Renelle
937aea6f23 adjust some popover / login requirement stuff 2013-05-02 17:42:35 +01:00
Tyler Renelle
bdb4a08f9e add 'options' menu item back, more obvious toggling between panes 2013-05-02 17:26:20 +01:00
Tyler Renelle
77bd61c244 Add bailey the crier for alerts. move CHANGELOG.md into the modal 2013-05-02 16:56:43 +01:00
Tyler Renelle
a40a41fa9c add in alexander the merchant 2013-05-02 15:12:00 +01:00
Tyler Renelle
e22634658a add in daniel / tavern tab content 2013-05-02 15:01:11 +01:00
Tyler Renelle
60b5783689 add separate game-pane from tasks-pane, make layout smoother #828 2013-05-02 14:16:57 +01:00
Tyler Renelle
584eb3e936 let's try moving external script loading back to app.on('render') so 
ew don't cause blocking on failed amazon affiliate load
 2013-05-01 13:07:42 +01:00
Matteo Pagliazzi
dcf61fe355 show gold amount rounded up in rewards column, fix #758 2013-04-23 10:37:33 +02:00
Tyler Renelle
089a2e0cf1 hide user from partyMembers (see previous commit) 2013-04-21 18:48:28 -04:00
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
6aaca11227 add rare pets back in (veteran wolf only for now) 2013-04-16 21:30:44 -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
9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -04:00
Tyler Renelle
0342e9a4e7 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-14 14:34:21 -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
Kevin Kaland
f6f397dcb0 Use user's current day for completed/uncompleted. 
References #587.
 2013-04-12 23:20:30 +02:00
Daniel Saewitz
9917173429 Rest 2013-04-11 18:22:06 -04:00
Tyler Renelle
72ee444608 back to our roots: store vendor files in public/vendor instead of 
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
 2013-04-09 13:21:20 -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
Shane Lister
4742e4236e Update pets.html 
Changing the sprinkle button to say pour.
 2013-04-05 22:55:34 -07:00
Tyler Renelle
dd736923ca Merge pull request #757 from ThibG/master 
Fix rewards moving / item unlocking
 2013-04-04 14:43:34 -07:00
Tyler Renelle
367ca4a76b redirect about, team, extensions to the community site. remove header 2013-04-03 17:15:28 -04:00
Thibaut Girka
96d1dbd430 Fix rewards being movable only once and item tooltips not showing up after that 2013-03-31 23:34:20 +02:00
Tyler Renelle
41449d349a protocol-agnostic amazon images & hover-script at the end 2013-03-31 00:27:47 -07:00
Tyler Renelle
ce43a7503b no more adsense, switching to amazon affiliates because of https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo 2013-03-31 00:06:29 -07:00
Tyler Renelle
c9907f9558 move some external script loading into app.on('render') to see if that 
solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo
 2013-03-30 18:45:57 -07:00
Tyler Renelle
be83a2c46e Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-29 22:28:27 -07:00
Tyler Renelle
9b42eb825b small ads & static-bindings cleanup (doesn't fix the ads issue) 2013-03-29 21:48:08 -07:00
Daniel Saewitz
2b59c205a2 Remove translations for now 2013-03-29 14:15:17 -04:00
Tyler Renelle
f87ab6866f Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-28 08:46:50 -07:00
Tyler Renelle
51f054e51c show tokens in character modal at all times 2013-03-28 08:43:13 -07:00
Stan Lindsey
6ba25e40b0 Added Community Link 2013-03-28 11:29:02 +00:00
Stan Lindsey
e0a28514c7 Added Community Link 2013-03-28 11:27:52 +00:00
Tyler Renelle
3d36a3f531 "new stuff" update 2013-03-28 01:36:18 -07:00
Tyler Renelle
d2b4072ad6 better wording on buying tokens 2013-03-28 00:49:57 -07:00
Tyler Renelle
88badc4929 pets: list cost of items in market 2013-03-28 00:36:57 -07:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07:00