Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion building.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ Game.buildings = (function(){
};

return instance;
}());
}());
2 changes: 1 addition & 1 deletion core.js
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ copyTextareaBtn.addEventListener('click', function(event) {

//ToolTips
$(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip({container: 'body'});
$('[data-toggle="tooltip"]').tooltip({container: 'body'});
});

//Change Company Name
Expand Down
2 changes: 1 addition & 1 deletion game.js
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ var Game = (function() {
$('[data-toggle="tooltip"]').tooltip();

console.debug("Loading Game");

this.createInterval("Loading Animation", this.loadAnimation, 10);
this.createInterval("Loading", this.loadDelay, 1000);

Expand Down
36 changes: 18 additions & 18 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html style="height:100%">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Space Company</title>
<link href="SpaceCompanyFavicon.png" rel="shortcut icon" type="image/x-icon" />
<link href="lib/bootstrap.min.css" rel="stylesheet" type="text/css" id="theme_css"/>
<link href="lib/pnotify.custom.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="style.css" rel="stylesheet">
<script src='https://cdn1.kongregate.com/javascripts/kongregate_api.js'></script>
<link href="lib/pnotify.custom.min.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet" />
<link href="style.css" rel="stylesheet" type="text/css" />
<script src="https://cdn1.kongregate.com/javascripts/kongregate_api.js" type="javascript"></script>
<!-- <script>
kongregateAPI.loadAPI(function(){
window.kongregate = kongregateAPI.getAPI();
Expand All @@ -36,21 +36,21 @@
<!-- Use this for more embed options. go here https://oembed.com/ to see those options. -->
<link type="application/json+oembed" href="https://sparticle999.github.io/SpaceCompany/oembed.json" />

<meta name="author" content="Sparticle999">
<meta name="title" content="Space Company">
<meta name="description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)">
<meta content="Space Company" property="og:title">
<meta property="og:description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)">
<meta content="Space Company" property="og:site_name">
<meta property="og:image" content="https://sparticle999.github.io/SpaceCompany/SpaceCompanyFavicon.png">
<meta name="twitter:card" value="summary">
<meta property="twitter:url" content="https://sparticle999.github.io/SpaceCompany">
<meta property="twitter:title" content="Space Company">
<meta property="twitter:description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)">
<meta property="twitter:image" content="https://sparticle999.github.io/SpaceCompany/SpaceCompanyFavicon.png">
<meta name="author" content="Sparticle999" />
<meta name="title" content="Space Company" />
<meta name="description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)" />
<meta content="Space Company" property="og:title" />
<meta property="og:description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)" />
<meta content="Space Company" property="og:site_name" />
<meta property="og:image" content="https://sparticle999.github.io/SpaceCompany/SpaceCompanyFavicon.png" />
<meta name="twitter:card" value="summary" />
<meta property="twitter:url" content="https://sparticle999.github.io/SpaceCompany" />
<meta property="twitter:title" content="Space Company" />
<meta property="twitter:description" content="Space Company is a science-fiction incremental game where you start from humble beginnings on Earth, working your way up to travelling between star systems and building Dyson Spheres and pretty much colonising the entire galaxy(ies?)" />
<meta property="twitter:image" content="https://sparticle999.github.io/SpaceCompany/SpaceCompanyFavicon.png" />

<!-- When you put the link in discord, it uses this tag to color the stripe on the embed -->
<meta name="theme-color" content="#ffffff">
<meta name="theme-color" content="#ffffff" />
</head>
<body style="height:100%">
<div id="loadScreen" style="width:100%; height:100%; background-color: black">
Expand Down
2 changes: 1 addition & 1 deletion oembed.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Space Company",
"title": "Space Company",
"author_name": "Sparticle999",
"author_url": "https://sparticle999.github.io/SpaceCompany"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://github.com/sparticle999/SpaceCompany",
"licenses": "",
"author": {
"name": "sparticle999"
"name": "sparticle999"
},
"engines": {
"node": ">= 0.10.0"
Expand Down
2 changes: 1 addition & 1 deletion resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,4 @@ Game.resources = (function(){
};

return instance;
}());
}());
2 changes: 1 addition & 1 deletion rocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ Game.interstellar.rocket = (function(){

return instance;

}());
}());
6 changes: 3 additions & 3 deletions rocketParts.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Game.interstellar.rocketParts = (function(){
instance.initialise = function(){
for (var id in Game.rocketPartsData) {
var data = Game.rocketPartsData[id];

this.navCount++;
this.entries[id] = $.extend({}, data, {
id: id,
Expand Down Expand Up @@ -49,7 +49,7 @@ Game.interstellar.rocketParts = (function(){
this.entries[entryName].count = Math.min(newValue, this.entries[entryName].max);
for(var resource in this.entries[entryName].cost){
window[resource.toString()] -= this.entries[entryName].cost[resource.toString()];
}
}
this.entries[entryName].displayNeedsUpdate = true;
}
}
Expand All @@ -67,4 +67,4 @@ Game.interstellar.rocketParts = (function(){

return instance;

}());
}());
8 changes: 3 additions & 5 deletions star.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Game.interstellar.stars = (function(){
instance.starCount = 0;

instance.systemsConquered = 0;

instance.initialise = function() {
for (var id in Game.starData) {
var data = Game.starData[id];

this.starCount++;
this.entries[id] = $.extend({}, data, {
id: id,
Expand All @@ -22,7 +22,6 @@ Game.interstellar.stars = (function(){
owned: false,
displayNeedsUpdate: false,
});

}

console.debug("Loaded " + this.starCount + " Stars");
Expand Down Expand Up @@ -54,7 +53,6 @@ Game.interstellar.stars = (function(){
instance.getStarData = function(id) {
return this.entries[id];
};


return instance;
}());
}());
2 changes: 1 addition & 1 deletion tech.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,4 @@ Game.tech = (function(){
};

return instance;
}());
}());