Commit graph

589 commits

Author SHA1 Message Date
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
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
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
Shane Lister
ea1be5f346 Merge branch 'pets' into patch-3 2013-03-26 23:20:13 -07:00
Tyler Renelle
0253815625 pets: rename food to hatching powder 2013-03-26 22:21:46 -07:00
Tyler Renelle
903f2b17c6 pets: bug where everyone shows main user's pet 2013-03-26 22:15:52 -07:00
Tyler Renelle
77f697446c pets: revert back to market as top-level tab 2013-03-26 18:57:58 -07:00
Tyler Renelle
42292be251 pets: show which egg was dropped on unlocking drops 2013-03-26 17:58:44 -07:00
Tyler Renelle
f6b2c08a60 Merge branch 'develop' into pets
Conflicts:
	views/app/rewards.html
2013-03-26 17:54:31 -07:00
Tyler Renelle
76512eef46 parties: bunch of bug fixes. enable parties by default, just notify
them at lvl 3 if they haven't started using it. Show a bell-icon
notification in user, reset dom properly after invitation
2013-03-26 14:54:14 -07:00
Tyler Renelle
80fd4f192c code cleanup: some indentation & {{}} where live-binds aren't required 2013-03-26 12:55:47 -07:00
Shane Lister
6b0aad01f7 Merge pull request #7 from lefnire/pets
Update my pets branch
2013-03-26 08:04:07 -07:00
Tyler Renelle
124409bfc5 Merge pull request #715 from switz/translations
@lefnire => i18n support... aka Translations!
2013-03-25 18:42:53 -07:00
Tyler Renelle
58ba7cf4f3 Merge branch 'develop' 2013-03-25 17:43:48 -07:00
Tyler Renelle
f7937ffb1b add forum link to footer 2013-03-25 17:43:34 -07:00