Merge anubisthejackle:issue115

Closes #115
Closes #224
This commit is contained in:
Blake Grotewold
2015-02-14 17:14:22 -05:00
23 changed files with 6030 additions and 5928 deletions
+584 -584
View File
File diff suppressed because it is too large Load Diff
+63 -63
View File
@@ -1,64 +1,64 @@
div#village {
position: absolute;
top: 0px;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#population {
position: absolute;
top: -13px;
right: 10px;
background-color: white;
}
.noHuts #population {
display: none;
}
div#village:before {
position: absolute;
background: white;
content: "village";
left: 8px;
top: -13px;
}
div#village.noHuts:before {
content: "forest";
}
div#workers {
position:absolute;
top: -4px;
left: 160px;
width: 150px;
}
.workerRow > .row_val {
position: relative;
padding-right: 20px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.workerRow {
position: relative;
margin: 10px 0px;
cursor: default;
}
.workerRow .tooltip {
width: 150px;
}
div.storeRow div.tooltip {
width: 160px;
div#village {
position: absolute;
top: 0px;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#population {
position: absolute;
top: -13px;
right: 10px;
background-color: white;
}
.noHuts #population {
display: none;
}
div#village:before {
position: absolute;
background: white;
content: "village";
left: 8px;
top: -13px;
}
div#village.noHuts:before {
content: "forest";
}
div#workers {
position:absolute;
top: -4px;
left: 160px;
width: 150px;
}
.workerRow > .row_val {
position: relative;
padding-right: 20px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.workerRow {
position: relative;
margin: 10px 0px;
cursor: default;
}
.workerRow .tooltip {
width: 150px;
}
div.storeRow div.tooltip {
width: 160px;
}
+65 -65
View File
@@ -1,66 +1,66 @@
#outfitting {
position: relative;
border: 1px solid black;
width: 200px;
margin-bottom: 20px;
padding: 5px 10px;
}
div#outfitting:before {
position: absolute;
content: "supplies";
top: -13px;
background-color: white;
}
div.outfitRow {
position: relative;
cursor: default;
margin: 10px -30px 10px 0px;
}
div.outfitRow > .row_val {
padding-right: 30px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
div.outfitRow .tooltip {
width: 150px;
}
div#bagspace {
background-color: white;
position: absolute;
top:-13px;
right: 10px;
}
div#perks {
position: absolute;
top: 0px;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#perks:before {
position: absolute;
content: "perks";
top: -13px;
background-color: white;
}
div.perkRow {
position: relative;
}
div.perkRow .row_key {
float: none;
#outfitting {
position: relative;
border: 1px solid black;
width: 200px;
margin-bottom: 20px;
padding: 5px 10px;
}
div#outfitting:before {
position: absolute;
content: "supplies";
top: -13px;
background-color: white;
}
div.outfitRow {
position: relative;
cursor: default;
margin: 10px -30px 10px 0px;
}
div.outfitRow > .row_val {
padding-right: 30px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
div.outfitRow .tooltip {
width: 150px;
}
div#bagspace {
background-color: white;
position: absolute;
top:-13px;
right: 10px;
}
div#perks {
position: absolute;
top: 0px;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#perks:before {
position: absolute;
content: "perks";
top: -13px;
background-color: white;
}
div.perkRow {
position: relative;
}
div.perkRow .row_key {
float: none;
}
+78 -78
View File
@@ -1,79 +1,79 @@
div#buildBtns {
position: absolute;
top: 50px;
left: 0px;
}
div#buildBtns:before {
content: "build:";
position: relative;
top: -5px;
}
div#craftBtns {
position: absolute;
top: 50px;
left: 150px;
}
div#craftBtns:before {
content: "craft:";
position: relative;
top: -5px;
}
div#buyBtns {
position: absolute;
top: 50px;
left: 300px;
}
div#buyBtns:before {
content: "buy:";
position: relative;
top: -5px;
}
div#storesContainer {
position: absolute;
top: 0px;
right: 0px;
}
div#stores {
position: relative;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div.storeRow {
position: relative;
}
div#stores:before {
position: absolute;
background: white;
content: "stores";
left: 8px;
top: -13px;
}
div#weapons {
margin-top: 15px;
position: relative;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#weapons:before {
position: absolute;
background: white;
content: "weapons";
left: 8px;
top: -13px;
div#buildBtns {
position: absolute;
top: 50px;
left: 0px;
}
div#buildBtns:before {
content: "build:";
position: relative;
top: -5px;
}
div#craftBtns {
position: absolute;
top: 50px;
left: 150px;
}
div#craftBtns:before {
content: "craft:";
position: relative;
top: -5px;
}
div#buyBtns {
position: absolute;
top: 50px;
left: 300px;
}
div#buyBtns:before {
content: "buy:";
position: relative;
top: -5px;
}
div#storesContainer {
position: absolute;
top: 0px;
right: 0px;
}
div#stores {
position: relative;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div.storeRow {
position: relative;
}
div#stores:before {
position: absolute;
background: white;
content: "stores";
left: 8px;
top: -13px;
}
div#weapons {
margin-top: 15px;
position: relative;
right: 0px;
border: 1px solid black;
cursor: default;
padding: 5px 10px;
width: 200px;
}
div#weapons:before {
position: absolute;
background: white;
content: "weapons";
left: 8px;
top: -13px;
}
+8 -8
View File
@@ -1,8 +1,8 @@
div#hullRow {
width: 70px;
}
div#engineRow {
width: 70px;
margin-bottom: 20px;
}
div#hullRow {
width: 70px;
}
div#engineRow {
width: 70px;
margin-bottom: 20px;
}
+154 -154
View File
@@ -1,154 +1,154 @@
@-ms-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@-webkit-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@-moz-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
#spacePanel {
float: none !important;
position: absolute !important;
top: -700px;
left: 0px;
}
#starsContainer {
width: 100%;
height: 100%;
position: absolute;
top: 0px;
left: 0px;
overflow: hidden;
}
#stars, #starsBack {
position: absolute;
z-index: -1;
left: 0px;
}
#stars > div, #starsBack > div {
position: relative;
height: 3000px;
width: 3000px;
color: white;
}
#starsBack {
opacity: 0.5;
}
.star {
position: absolute;
}
#ship {
cursor: default;
position: absolute;
margin-top: -10px;
margin-left: -7.5px;
}
#theEnd {
position: relative;
cursor: default;
top: 200px;
margin-left: -220px;
text-align: center;
font-size: 24px;
font-weight: bold;
opacity: 0;
color: white;
}
.asteroid {
cursor: default;
position: absolute;
top: -40px;
left: 350px;
-webkit-animation: 1s linear 0s normal none infinite spin;
-moz-animation: 1s linear 0s normal none infinite spin;
-ms-animation: 1s linear 0s normal none infinite spin;
animation: 1s linear 0s normal none infinite spin;
font-size: 32px;
}
#hullRemaining {
width: 70px;
position: absolute;
top: 0px;
left: 0px;
}
.centerCont {
padding-top:10%;
}
.endGame {
font-size:48px;
color:#FFFFFF;
opacity:0;
position:relative;
}
.endGameRestart {
font-size: 32px;
cursor: pointer;
}
.endGameRestart:hover {
text-decoration: underline;
}
@-ms-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@-webkit-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@-moz-keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
@keyframes spin {
0% {
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
transform:rotate(0deg);
}
100% {
-ms-transform: rotate(360deg);
-webkit-transform: rotate(360deg);
-moz-transform: rotate(360deg);
transform:rotate(360deg);
}
}
#spacePanel {
float: none !important;
position: absolute !important;
top: -700px;
left: 0px;
}
#starsContainer {
width: 100%;
height: 100%;
position: absolute;
top: 0px;
left: 0px;
overflow: hidden;
}
#stars, #starsBack {
position: absolute;
z-index: -1;
left: 0px;
}
#stars > div, #starsBack > div {
position: relative;
height: 3000px;
width: 3000px;
color: white;
}
#starsBack {
opacity: 0.5;
}
.star {
position: absolute;
}
#ship {
cursor: default;
position: absolute;
margin-top: -10px;
margin-left: -7.5px;
}
#theEnd {
position: relative;
cursor: default;
top: 200px;
margin-left: -220px;
text-align: center;
font-size: 24px;
font-weight: bold;
opacity: 0;
color: white;
}
.asteroid {
cursor: default;
position: absolute;
top: -40px;
left: 350px;
-webkit-animation: 1s linear 0s normal none infinite spin;
-moz-animation: 1s linear 0s normal none infinite spin;
-ms-animation: 1s linear 0s normal none infinite spin;
animation: 1s linear 0s normal none infinite spin;
font-size: 32px;
}
#hullRemaining {
width: 70px;
position: absolute;
top: 0px;
left: 0px;
}
.centerCont {
padding-top:10%;
}
.endGame {
font-size:48px;
color:#FFFFFF;
opacity:0;
position:relative;
}
.endGameRestart {
font-size: 32px;
cursor: pointer;
}
.endGameRestart:hover {
text-decoration: underline;
}
+73 -73
View File
@@ -1,74 +1,74 @@
#worldOuter {
position: relative;
display: inline-block;
}
#map {
position: relative;
font-family: "Courier New", Courier, monospace;
border: 1px solid black;
overflow: hidden;
display: inline-block;
line-height: 10px;
letter-spacing: 1px;
color: #999;
cursor: default;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
#map .landmark {
position: relative;
font-weight: bold;
color: black;
line-height: 0px; /* Hack to prevent the boldness from increasing the row's line-height. I hope it works in all browsers... */
}
#bagspace-world {
border: 1px solid black;
height: 62px;
margin-bottom: 5px;
margin-top: 13px;
overflow: hidden;
}
#bagspace-world > div {
padding: 6px 4px;
}
#backpackTitle {
position: absolute;
top: 0px;
left: 10px;
background-color: white;
z-index: 1;
}
#backpackSpace {
position: absolute;
top: 0px;
right: 10px;
background-color: white;
z-index: 1;
}
#healthCounter {
position: absolute;
top: 0px;
left: 80px;
background-color: white;
z-index: 1;
}
div.supplyItem {
display: inline-block;
border: 1px solid #999;
float: left;
margin: 0px 5px 6px 0px;
padding: 0 5px;
cursor: default;
#worldOuter {
position: relative;
display: inline-block;
}
#map {
position: relative;
font-family: "Courier New", Courier, monospace;
border: 1px solid black;
overflow: hidden;
display: inline-block;
line-height: 10px;
letter-spacing: 1px;
color: #999;
cursor: default;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
#map .landmark {
position: relative;
font-weight: bold;
color: black;
line-height: 0px; /* Hack to prevent the boldness from increasing the row's line-height. I hope it works in all browsers... */
}
#bagspace-world {
border: 1px solid black;
height: 62px;
margin-bottom: 5px;
margin-top: 13px;
overflow: hidden;
}
#bagspace-world > div {
padding: 6px 4px;
}
#backpackTitle {
position: absolute;
top: 0px;
left: 10px;
background-color: white;
z-index: 1;
}
#backpackSpace {
position: absolute;
top: 0px;
right: 10px;
background-color: white;
z-index: 1;
}
#healthCounter {
position: absolute;
top: 0px;
left: 80px;
background-color: white;
z-index: 1;
}
div.supplyItem {
display: inline-block;
border: 1px solid #999;
float: left;
margin: 0px 5px 6px 0px;
padding: 0 5px;
cursor: default;
}