sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-31 15:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d90f594cb8 Merge remote-tracking branch 'origin/pets' into develop 2013-03-30 13:08:43 -07:00
Tyler Renelle
533deb7c83 Merge pull request #751 from Shaners/pets 
More Gem Sizes
 2013-03-30 09:16:06 -07:00
Shane Lister
b5665cdd7c new line 2013-03-29 22:50:15 -07:00
Shane Lister
86102ce8e7 More Gem sizes 2013-03-29 22:44:44 -07:00
Tyler Renelle
96ce6da743 update habit version to upgrade nodemodules 2013-03-29 22:39:56 -07:00
Tyler Renelle
ea92779ef8 Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-29 22:29:09 -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
Stan Lindsey
acfb76c243 renamed comments 2013-03-29 21:38:13 +00:00
Tyler Renelle
1444143c7b Merge pull request #748 from switz/translations 
@lefnire => Remove translations for now
 2013-03-29 11:17:53 -07:00
Daniel Saewitz
2b59c205a2 Remove translations for now 2013-03-29 14:15:17 -04:00
Stan Lindsey
d81cbe570b Merge pull request #743 from Shaners/pets 
Addition of Gem
 2013-03-29 03:50:10 -07:00
Stan Lindsey
bb2ba07672 Update app.json 2013-03-29 10:46:42 +00:00
Stan Lindsey
e2dc08bae0 Update app.json 2013-03-29 10:23:39 +00:00
Shane Lister
f72c8f33ec Added Gem to Sprite Sheet and Egg CSS 2013-03-28 19:04:01 -07:00
Shane Lister
9ecb53747c Merge pull request #10 from lefnire/pets 
Update my Pets Branch
 2013-03-28 17:04:25 -07:00
Stan Lindsey
ef12b2adce Incomplete up of EN "translation" 2013-03-28 22:29:54 +00:00
Tyler Renelle
f87ab6866f Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-28 08:46:50 -07:00
Tyler Renelle
b03bf8ea60 Merge branch 'develop' 2013-03-28 08:43:25 -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
f57734eda5 Merge branch 'develop' 2013-03-28 01:36:29 -07:00
Tyler Renelle
3d36a3f531 "new stuff" update 2013-03-28 01:36:18 -07:00
Tyler Renelle
f3c43628c7 Merge branch 'develop' 2013-03-28 00:52:22 -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
a966c2ce65 pets: rename base.name to from "Common" to "Base" for technical reasons 2013-03-28 00:34:05 -07:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07:00
Tyler Renelle
157f0400e1 fix tokens migration script 2013-03-28 00:25:45 -07:00
Tyler Renelle
83bfee0fa3 and include email in apply_tokens 2013-03-27 23:23:19 -07:00
Tyler Renelle
a84d1920bf pets: remove unecessary css 2013-03-27 17:57:39 -07:00
Tyler Renelle
e44304f63a Merge branch 'pets' of github.com:lefnire/habitrpg into pets 2013-03-27 17:33:27 -07:00
Tyler Renelle
fdcf927a47 Merge pull request #739 from Shaners/pets 
Last Four Potions for New Pet System from Lemoness
 2013-03-27 17:32:50 -07:00
Shane Lister
0ac25e7686 Last four potions for new pet system 2013-03-27 17:16:49 -07:00
Shane Lister
264ab6f241 Merge pull request #9 from lefnire/pets 
Keeping my pets branch updated
 2013-03-27 16:59:59 -07:00
Tyler Renelle
30d92a1583 add username to tokens migration 2013-03-27 16:02:29 -07:00
Tyler Renelle
56eccabe5a apply tokens migration script 2013-03-27 14:19:11 -07:00
Tyler Renelle
b7459517f4 Merge branch 'develop' into pets 2013-03-27 13:14:08 -07:00
Tyler Renelle
8bad13e5c7 pets: remove <strong> on "hatching potion" 2013-03-27 12:32:18 -07:00
Tyler Renelle
562634478f pets: easier click on market items 2013-03-27 11:59:56 -07:00
Tyler Renelle
3a62482a4d pets: bug fixes & rewording 2013-03-27 11:57:40 -07:00
Tyler Renelle
1ee008aea1 pets: raise egg cost a tad 2013-03-27 11:46:10 -07:00
Tyler Renelle
4edbb8bf3d pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future) 2013-03-27 11:34:41 -07:00
Tyler Renelle
6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit 
previous architecture, add some placeholders for the un-finished
potions. got them working
 2013-03-27 00:20:33 -07:00
Tyler Renelle
db2a210007 Merge pull request #735 from Shaners/pets 
Hatching Potions from Lemoness, Pet Egg CSS, Ethereal lion mount.
 2013-03-26 23:53:28 -07:00
Tyler Renelle
1055f687cd Merge branch 'develop' 2013-03-26 23:48:42 -07:00
Tyler Renelle
18ccf816ec crit fix: freeze lodash version 2013-03-26 23:48:26 -07:00
Tyler Renelle
5d38962151 crit fix: freeze lodash version 2013-03-26 23:47:51 -07:00