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

2278 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
a31eb184a2 habitrpg-shared: don't forget the package req! 2013-05-22 11:27:16 +01:00
Tyler Renelle
5a25244096 Merge branch 'habitrpg-shared' into develop 
Conflicts:
	src/app/helpers.coffee
	src/app/items.coffee
 2013-05-22 11:13:27 +01:00
Tyler Renelle
598f2f6c46 habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get() 2013-05-22 11:08:05 +01:00
Tyler Renelle
2230ce6688 habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116) to prevent data-loss on user.get() 2013-05-22 00:40:54 +01:00
Tyler Renelle
bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle
ff2fedda48 add ability to restore lost streaks, also add int() view helper 
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
 2013-05-21 14:33:31 +01:00
Tyler Renelle
e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-21 12:57:40 +01:00
Tyler Renelle
cc097c32f7 clean up of preen_cron, which I'm re-enstating 2013-05-21 12:54:06 +01:00
Philip How
b77a62e915 Merge pull request #1002 from MrConcept/master 
Merge Master
 2013-05-20 11:09:37 -07:00
Philip How
105087c823 Removes +4 Gems on Reset exploit 2013-05-20 19:52:37 +02:00
Tyler Renelle
f412a20203 habitrpg-shared: cron bug-fixes 2013-05-20 10:56:38 +01:00
Tyler Renelle
5776bec545 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-20 10:28:49 +01:00
Tyler Renelle
ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using 
anymore, i was wrong)
 2013-05-20 10:27:53 +01:00
Stan Lindsey
9c173e3a08 HP potion description clarify. 
People getting confused about its use.
 2013-05-20 11:08:04 +02:00
Slappybag
d870325169 Margin on Buttons for #996 & 128eb8a 2013-05-20 09:59:36 +01:00
Tyler Renelle
83ac2adb79 habithabitrpg-shared: cron mostly working wiht habitrpg-shared 7805a2ba26 2013-05-20 01:15:33 +01:00
Tyler Renelle
0b445df909 habitrpg-shared: *almost* working wth new scoring (c0cf9780fe) - need to fix for cron, API, and other misc bugs 2013-05-19 23:50:41 +01:00
Tyler Renelle
128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 2013-05-19 20:43:48 +01:00
Tyler Renelle
6a36f4bd1d habitrpg-shared: helpers now working d42ac5d53c 2013-05-19 18:53:13 +01:00
Tyler Renelle
5d1368e794 habitrpg-shared: got items working (see 1feb209c24) 2013-05-19 18:01:50 +01:00
Tyler Renelle
6a6a75edda Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-19 15:02:50 +01:00
Tyler Renelle
ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle
9b46805452 Merge pull request #989 from Shaners/develop 
Bacon Bacon
 2013-05-18 01:09:05 -07:00
Shane Lister
5cff970947 Bacon Bacon 
Putting some bacon into the tavern NPC graphic. The people demand bacon.
 2013-05-17 16:42:26 -07:00
Shane Lister
081b5be657 Merge pull request #17 from lefnire/develop 
Update my Develop
 2013-05-17 16:36:30 -07: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
a6973e9ae2 back to websockets 2013-05-17 09:58:37 +01:00
Tyler Renelle
9946495564 Merge branch 'develop' 2013-05-17 09:57:32 +01:00
Tyler Renelle
636e7aa4c0 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-16 17:58:49 +01:00
Tyler Renelle
f1767191d3 Merge pull request #977 from Shaners/patch-1 
Update npcs.styl
 2013-05-16 09:28:42 -07:00
Shane Lister
0c6a71a581 Update npcs.styl 
Should fix Bailey's full body graphic.
 2013-05-16 10:22:37 -06:00
Tyler Renelle
f6df9a610a get rid of some old unused images 2013-05-16 12:16:24 +01:00
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
eca7b1b53b Merge branch 'develop' 2013-05-15 12:47:58 +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
5a01963c1f back to xhr-polling or a bit, will figure out why websockets having 
This reverts commit d59f1f6925.
 2013-05-15 09:58:38 +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