Merge branch 'master' into beta

Conflicts:
	CookieMonster.js
	src/Main.js
This commit is contained in:
Aktanusa
2014-10-31 20:25:47 -04:00
6 changed files with 42 additions and 32 deletions

View File

@@ -2,7 +2,7 @@
* Sim *
*******/
CM.Sim.BuildingGetPrice = function (basePrice, start, increase) {
CM.Sim.BuildingGetPrice = function(basePrice, start, increase) {
var totalPrice = 0;
var count = 0;
while(count < increase) {