sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1713 commits 1 branch 0 tags 1.6 GiB
Commit graph

127 commits

Author SHA1 Message Date
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory 
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
 2013-03-21 13:51:38 -06:00
Tyler Renelle
fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks 
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
 2013-03-21 12:36:05 -06:00
Tyler Renelle
7c77126129 try some protocol-agnostics to fix homepage css 2013-03-21 11:23:46 -06:00
Tyler Renelle
d737bd0714 remove a ton of public/vendor git submodules, using CDN instead. The 
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
 2013-03-21 11:11:15 -06:00
Shane Lister
63f0a9f3a4 Mount Sprite Sheet, Mount CSS, Revised Pet Egg CSS 
Here is a copy of the mount sprite sheet, mount CSS, and a revised pet
egg CSS. CSS now matches the player CSS structure. Removed individual
mount images as they'd no longer be needed.
 2013-03-18 22:19:20 -07:00
Zachary Kain
e18c53f97f middle of wrasslin the new header 2013-03-18 16:48:47 -04:00
Tyler Renelle
2276867f6c use cloudflare cdn for bootstrap too 2013-03-17 09:45:57 -04:00
Tyler Renelle
6182a474c7 remoe bootstrap import from .styl, start pulling in from 
CDN (500.html, static, & dynamic pages)
 2013-03-17 09:33:14 -04:00
Tyler Renelle
ee9e6064b2 add a ton of static page, beef up the footer, make this website look 
official! @zakkain, I hope I didn't break anything!
 2013-03-16 23:03:59 -04:00
Tyler Renelle
b1fe9b64a9 Merge branch 'develop' into static-pages 2013-03-16 20:29:22 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz
2ffe0aecf9 FeedEgg 2013-03-16 11:18:27 -04:00
Shane Lister
644a23cc57 Pet Egg Sprite Sheet and CSS 2013-03-14 21:57:08 -07:00
Daniel Saewitz
c83da2ae79 Merge branch 'develop' of github.com:lefnire/habitrpg into inventory 2013-03-13 06:15:17 -04:00
Tyler Renelle
b34bfc886d start static-pages redesign 2013-03-11 01:32:24 -04:00
Tyler Renelle
a534eec548 [documentation] level 2 unlocks items 2013-03-10 12:21:30 -04:00
Tyler Renelle
65b7f432a9 get the pets working for the avatar box, with consistent names (need 
to manually apply with model.set for now)
 2013-03-09 12:03:38 -05:00
Tyler Renelle
e280be3f62 gut old pet images, now we're using sprites. begin on new items.pets[] structure 2013-03-08 13:01:29 -05:00
Tyler Renelle
b3247e32d0 add . to player / pet sprite classes 2013-03-08 12:21:59 -05:00
Daniel Saewitz
e555271a70 Merge branch 'pet+player_css' of github.com:Pandoro/habitrpg into inventory 2013-03-08 12:17:43 -05:00
kyokutei
84f046024e Updated public/splash.html 2013-03-07 13:08:36 -08:00
Tyler Renelle
26a8917862 tour fix 2013-03-05 14:02:57 -05:00
Tyler Renelle
378a03b6a0 add bootstrap tour as a submodule, some cleanup 2013-03-04 12:47:33 -05:00
Alex
811e9a673c Added Pet css sprite and removed genders from player css sprites 
Added one sprites containing all of @Shaners' pets.

Fused male and female back together to 1 spritesheet again. Genders were removed although the same appearance should be obtainable with the new system!
 2013-03-04 00:54:18 +01:00
Tyler Renelle
afaf358005 update to chest favicon 2013-03-03 12:15:25 -05:00
Tyler Renelle
39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00
Rudd Fawcett
f13e46fb9c Icons v2 2013-02-27 22:19:10 -05:00
Tyler Renelle
29770fbc0e chagne some wording on splash & 500.html 2013-02-21 10:33:44 -05:00
Tyler Renelle
4d0d5d3dc9 remove more kickstarter stuff 2013-02-21 10:31:52 -05:00
Tyler Renelle
22ac8e1d16 add faux achievements, fix error page 2013-02-17 15:07:56 -05:00
Tyler Renelle
1757f137f0 add BrowserQuest as submodule in public/vendor 2013-02-17 14:43:12 -05:00
Tyler Renelle
3aef9f1ac0 Merge branch 'master' into develop 2013-02-17 12:32:15 -05:00
Tyler Renelle
c14bc8ef76 Merge pull request #410 from Shaners/master 
75 New Pet Sprites, 1 New Mount
 2013-02-17 09:12:08 -08:00
Shane Lister
ca41e1dab6 75 New Pets, 1 New Mount 
Mainly just colour variations for the previously made pets. 1 New pet
and 1 new Mount.
 2013-02-17 02:57:08 -08:00
Tyler Renelle
0669511ebe Merge branch 'master' into develop 2013-02-17 02:46:36 -05:00
Tyler Renelle
cc6b6775fc fix assets on splash 2013-02-17 02:46:34 -05:00
Tyler Renelle
3d76f11644 new logo 2013-02-16 23:44:49 -05:00
Tyler Renelle
31489f0869 logos by Joanna 2013-02-16 23:25:41 -05:00
Tyler Renelle
82a18cacb8 remove old jquery & jquery ui 2013-02-16 20:09:26 -05:00
Tyler Renelle
f25a53c3b6 more submodules, including only using sortablef or jquery-ui 2013-02-16 20:01:59 -05:00
Tyler Renelle
f0602b69fc jquery fix 2013-02-16 19:48:41 -05:00
Tyler Renelle
8726056820 remove old bootstrap css 2013-02-16 19:48:02 -05:00
Tyler Renelle
23c94c0aee remove vestige bootstrap-datepicker, move github-buttons to submodule 2013-02-16 19:46:31 -05:00
Tyler Renelle
d03352c323 move all public/js to public/vendor, move bootstrap & bootstrap-growl to git submodule 2013-02-16 19:42:35 -05:00
Tyler Renelle
fc7a1fd7a3 add bootstrap-datepicker submodule, remove html5 date field (seems 
poorly supported)
 2013-02-16 18:59:42 -05:00
Tyler Renelle
29fecb36c8 Merge branch 'master' into ical 2013-02-16 16:20:34 -05:00
Cloud Chiller
78b0ae093d Changed the image on the 500 to a male sprite of the intended image. 
It's better than nothing.
 2013-02-16 18:10:30 +01:00
Tyler Renelle
219065907d add calendar icons 2013-02-15 14:17:27 -05:00
Tyler Renelle
064abc959b reverting the commit-set for the progress-bars https://github.com/lefnire/habitrpg/pull/379 (@zakkain I'll follow up on GH) 
Revert "move progress-pollyfill to require for performance"

This reverts commit 96b983b564.
 2013-02-13 15:21:44 -05:00
Zachary Kain
7864865065 ACTUALLY add the polyfill for <progress> this time 2013-02-12 12:33:41 -05:00