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

2243 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Tyler Renelle
85018568e4 Merge pull request #973 from Shaners/develop 
Backer-Gear Tweaks, matt tweak, add NPCs
 2013-05-16 03:12:14 -07:00
Shane Lister
2cebbb93e5 NPC Sprite Sheet and CSS 2013-05-15 21:44:39 -07:00
Shane Lister
8bb0718cea Backer-Gear Tweaks, NPCs 2013-05-15 17:22:32 -07:00
Shane Lister
c9cfd2c30b Merge pull request #16 from lefnire/develop 
Update my develop branch
 2013-05-15 17:07:14 -07: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
aef76ae969 pets: bug fix for users who haven't been properly converted to pets array system 2013-05-15 09:14:42 +01:00
Tyler Renelle
d59f1f6925 Revert "back to xhr-polling or a bit, will figure out why websockets having" 
This reverts commit e5549d0501.
 2013-05-14 23:53:59 +01:00
Tyler Renelle
e5549d0501 back to xhr-polling or a bit, will figure out why websockets having 
issues soon
 2013-05-14 23:42:36 +01:00
Tyler Renelle
950be4daf2 cron: better solution to testing "due today" for tasks with repeat 
options, and user with custom dayStart. Still not sure if this is the
ideal solution, but addresses #963
 2013-05-14 19:01:05 +01:00
Tyler Renelle
3ae295c9a3 don't include 'disabled' shading for todos 2013-05-14 18:20:19 +01:00
Tyler Renelle
19016cc895 fix #958 2013-05-14 18:17:19 +01:00
Tyler Renelle
02215aeda0 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-14 18:10:47 +01:00
Tyler Renelle
0a0cf1d94e cron: fix repeat, for old users without default task.repeat={} 2013-05-14 18:10:24 +01:00
Tyler Renelle
5d421bdbd4 Merge pull request #962 from Celtis/patch-1 
Minor grammatical fix
 2013-05-14 10:05:44 -07:00
Celtis
0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02:00
Tyler Renelle
92b178b4a4 huge cron fixes which should solve streak, dayStart, "timezone" issues 2013-05-14 17:39:42 +01: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
4a23ad4856 Merge branch 'develop' 
Conflicts:
	locales/en/app.json
 2013-05-13 21:31:18 +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
Tyler Renelle
dc7f80ceb9 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-13 11:02:20 +01:00
Daniel Saewitz
d6b312eb13 Fix borked translations 2013-05-12 15:18:16 -04:00
Stan Lindsey
26e3a7d83c Additional Keys 2013-05-12 20:44:27 +02:00
Stan Lindsey
7c62c523b4 Additional Keys 2013-05-12 20:43:28 +02:00
Daniel Saewitz
b11df0a755 Merge branch 'locale/nl' of github.com:jbnicolai/habitrpg into develop 2013-05-12 14:20:11 -04:00
Joshua Boy Nicolai
27a3627fa0 Merge pull request #1 from xeross/locale/nl 
Locale fixes/changes
 2013-05-12 11:17:44 -07:00
Daniel Saewitz
ce6914f0c8 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-12 14:00:33 -04:00
Daniel Saewitz
445a968a9b Merge 2013-05-12 13:58:50 -04:00
Tyler Renelle
b162a43545 module.exports growl notifications so other files can use it 2013-05-12 16:47:31 +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
Slappybag
1079d060fc Final app.json english. 2013-05-12 13:32:41 +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
Slappybag
7986464132 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-12 12:30:34 +01:00
Tyler Renelle
912b716a28 fix the reroll buy-button bug 2013-05-12 12:29:00 +01:00
Tyler Renelle
dcc4d0c93e update Dailys => Dailies (we use dailys throughout the code so we can 
easly switch between singular/plural, but for actual text we want Dailies)
 2013-05-12 11:36:56 +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
a9d3348678 last of the tokens=>gems 2013-05-12 10:15:31 +01:00
Tyler Renelle
2164e7322b _partyMembers fetch as async to final 3-part subscription. test on 
beta first
 2013-05-12 00:56:02 +01:00
Tyler Renelle
ca9d3bf2ed small bailey about tokens => gems 2013-05-12 00:51:59 +01:00
Tyler Renelle
e33eee4142 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-12 00:50:02 +01:00
Tyler Renelle
d54afdcc3d tavern: icon-eye-close instead of icon-glass (to signify resting) 2013-05-12 00:26:17 +01:00
Daniel Saewitz
8e7ab79098 Turn off locale set 2013-05-11 18:05:27 -04:00
Shane Lister
0d72818c9a Merge pull request #15 from lefnire/develop 
Update my develop branch
 2013-05-11 12:56:34 -07:00