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

Compare commits

base: halo-battle:8bb2779b2fdea4a4f6d032ad04e15730287da10f
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur
..
compare: halo-battle:11cf52ff69d1906ca34af550791236a07c138ab1
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur

No commits in common. "8bb2779b2fdea4a4f6d032ad04e15730287da10f" and "11cf52ff69d1906ca34af550791236a07c138ab1" have entirely different histories.
8bb2779b2f ... 11cf52ff69

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

965
htdocs/css/covenant/covenant.css
View File

File diff suppressed because one or more lines are too long

967
htdocs/css/csnu/csnu.css
View File

File diff suppressed because one or more lines are too long

3
onyx2/include/game/laboratoire.php
View File

@ -71,7 +71,6 @@ function traiterBranche($onglet, $branche, $start = false)
$return .= traiterBranche($onglet, $b); $return .= traiterBranche($onglet, $b);
$return .= "</dd>"; $return .= "</dd>";
} else { } else {
$origin_b = $b;
//On recherche s'il s'agit d'une technologie à niveau multiple //On recherche s'il s'agit d'une technologie à niveau multiple
if ((dTechnologies::idToBit($b) & $planete->technologies[$onglet]) && isset($LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+1]) && $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b] == $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+1]) { if ((dTechnologies::idToBit($b) & $planete->technologies[$onglet]) && isset($LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+1]) && $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b] == $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+1]) {
if ((dTechnologies::idToBit($b+1) & $planete->technologies[$onglet]) && isset($LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+2]) && $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b] == $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+2]) { if ((dTechnologies::idToBit($b+1) & $planete->technologies[$onglet]) && isset($LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+2]) && $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b] == $LANG[$planete->race]["technologies"]["noms_sing"][$onglet][$b+2]) {
@ -87,8 +86,6 @@ function traiterBranche($onglet, $branche, $start = false)
if (dTechnologies::idToBit($b) & $planete->technologies[$onglet]) { if (dTechnologies::idToBit($b) & $planete->technologies[$onglet]) {
$return .= '<dt><a href="#">'; $return .= '<dt><a href="#">';
} elseif (dTechnologies::idToBit($origin_b) & $planete->technologies[$onglet]) {
$return .= '<dt class="partial"><a href="?p=laboratoire&amp;n='.$onglet.'&amp;t='.$b.'">';
} else { } else {
$return .= '<dt class="lack"><a href="?p=laboratoire&amp;n='.$onglet.'&amp;t='.$b.'">'; $return .= '<dt class="lack"><a href="?p=laboratoire&amp;n='.$onglet.'&amp;t='.$b.'">';
} }