halo-battle/game
1
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

Compare commits

base: halo-battle:1072d78ae7bbc18ba4f7ba3cf8bb6d1e5daa4e85
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur
..
compare: halo-battle:c56099e3b0e1c21fe2e34e29941b9ddb4970c807
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur

No commits in common. "1072d78ae7bbc18ba4f7ba3cf8bb6d1e5daa4e85" and "c56099e3b0e1c21fe2e34e29941b9ddb4970c807" have entirely different histories.
1072d78ae7 ... c56099e3b0

3 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
onyx2/include/Class/Donnees/spatial.php
View File

@ -665,7 +665,7 @@ class dSpatial implements Donnees
), ),
array( array(
array('batiments', 8, 3), array('batiments', 8, 3),
array('technologies', 8, 0) array('technologies', 8, 1)
), ),
array( array(
array('batiments', 8, 3), array('batiments', 8, 3),

5
onyx2/include/Class/planete.php
View File

@ -712,10 +712,7 @@ class Planete extends Surface
$this->cristal = 700; $this->cristal = 700;
$this->hydrogene = 0; $this->hydrogene = 0;
// on met le moment où la planete a été crée, comme ça, à la première actualisation, on ne remplit pas les silos $this->modif = array("id_user", "nom_planete", "galaxie", "ss", "position", "image", "cases");
$this->timestamp = time();
$this->modif = array("id_user", "nom_planete", "galaxie", "ss", "position", "image", "cases", "timestamp", "metal", "cristal", "hydrogene");
} }
/** /**

2
onyx2/include/Class/rapport.php
View File

@ -18,8 +18,6 @@ class Rapport
public $rapportA = ""; public $rapportA = "";
public $rapportB = ""; public $rapportB = "";
public $table = "mail";
/** /**
* Constructor * Constructor
* @access protected * @access protected