pascal.lafourcade
/
swish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Golfier' of https://gitlab.iut-clermont.uca.fr/palafour/swish into Golfier

Browse Source 
# Conflicts:
#	SwichGIT/src/.idea/workspace.xml
Golfier
algolfier 4 years ago
parent 4d47bed75a f8fa5d6b70
commit f5323c008f
18 changed files with 58 additions and 154 deletions
Show Stats Download Patch File Download Diff File

8
SwichGIT/src/.idea/.gitignore vendored
Unescape View File

@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/../../../../../../../:\Users\alexandre\swish\SwichGIT\src\.idea/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/

5
SwichGIT/src/.idea/codeStyles/codeStyleConfig.xml
Unescape View File

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

14
SwichGIT/src/.idea/deployment.xml
Unescape View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" serverName="HighscoreBD">
<serverData>
<paths name="HighscoreBD">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>

8
SwichGIT/src/.idea/modules.xml
Unescape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
</modules>
</component>
</project>

8
SwichGIT/src/.idea/src.iml
Unescape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

6
SwichGIT/src/.idea/vcs.xml
Unescape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

77
SwichGIT/src/.idea/workspace.xml
Unescape View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BranchesTreeState">
<expand>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
</path>
</expand>
<select />
</component>
<component name="ChangeListManager">
<list default="true" id="12d56b32-510d-4ffa-aba7-04c860cf5168" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings">
<execution />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
</component>
<component name="ProjectId" id="1ooBWcIrr6KA29y9dHHVaKNm4D5" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="12d56b32-510d-4ffa-aba7-04c860cf5168" name="Default Changelist" comment="" />
<created>1613943095985</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1613943095985</updated>
<workItem from="1613943097057" duration="318000" />
<workItem from="1613943477277" duration="28000" />
<workItem from="1613943506651" duration="2083000" />
<workItem from="1613977711326" duration="118000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
</project>

17
SwichGIT/src/css/PageDaccueil.css
Unescape View File

@ -467,8 +467,25 @@ label:active:after {
.buttonvalidersettings:active{
background-color: blue;
}
/* LANGUES */
#cf2 img {
position:absolute;
left:0;
cursor: pointer;
-webkit-transition: opacity 0.2s ease-in-out;
-moz-transition: opacity 0.2s ease-in-out;
-o-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
#cf2 img.transparent {
opacity:0;
}
#cf_onclick {
cursor:pointer;
}

6
SwichGIT/src/css/desktops.css
Unescape View File

@ -452,4 +452,10 @@
position: relative;
left: 2vw;
}
#cf2 {
position:relative;
margin-left: 8vh;
top: 1.5vh;
}
}

6
SwichGIT/src/css/tablet.css
Unescape View File

@ -450,5 +450,11 @@
display: none;
}
#cf2 {
position:relative;
margin-left: 14vh;
top: 2.5vh;
}
}

BIN
SwichGIT/src/imgs/drapeau-en.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 118 KiB

BIN
SwichGIT/src/imgs/drapeau-fr.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
SwichGIT/src/imgs/flags/flag-australia.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
SwichGIT/src/imgs/flags/flag-france.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
SwichGIT/src/imgs/flags/flag-uk.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
SwichGIT/src/imgs/flags/flag-usa.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

37
SwichGIT/src/index.php → SwichGIT/src/index.html
Unescape View File

@ -23,22 +23,6 @@
</head>
<body onload="settingOpen()">
<?php
$langue=0;
if(isset($_GET["lang"]))
$langue=1;
$jouer = array("JOUER","PLAY");
$matchpts = array("match à point","point match");
$parametres = array("paramètres","parameters");
$descregles = array("Swish : Jeu de 60 cartes composé chacun de billes et de cerceaux, de 4 couleurs différentes possibles. 16 cartes sont posés sur une table et le joueur doit faire superposer des cartes de manière que chaque bille soit dans le cerceau de même couleur d’une autre carte.","Swish: Set of 60 cards each composed of balls and hoops, 4 different colors possible. 16 cards are placed on a table and the player must make superimpose cards so that each ball is in the hoop of the same color of another card.");
$regles = array("Les Règles","The Rules");
?>
<div id="langue" >
<a href="."><img src="imgs/drapeau-fr.jpg" id="drapeauFR"/></a>
<a href="index.php?lang=1"><img src="imgs/drapeau-en.png" id="drapeauEN"/></a>
</div>
<div id="pageAccueil">
@ -67,13 +51,18 @@
</ul>
</div>
</div>
<div id="cf2" class="shadow">
<img onclick="functionLange()" id="flag_bottom" src="imgs/flags/flag-uk.png" />
<img onclick="functionLange()" id="flag_top" src="imgs/flags/flag-france.png" />
</div>
</div>
<div id="containpseudo">
<a onclick="lancerpartie()">
<div id="contourbuttonvalider">
<div class="bouttonvalider">
<h1 id="textjouer"> <?php echo $jouer[$langue]; ?> </h1>
<h1 id="textjouer">JOUER</h1>
</div>
</div>
</a>
@ -82,24 +71,20 @@
<div id="popup1" class="overlay">
<div class="popup">
<h2><?php echo $regles[$langue]; ?></h2>
<h2>Les Règles :</h2>
<a class="close" href="#">&times;</a>
<div class="content">
<?php echo $descregles[$langue]; ?>
<!-- Swish : Jeu de 60 cartes compos&eacute chacun de billes et de cerceaux, de 4 couleurs
Swish : Jeu de 60 cartes compos&eacute chacun de billes et de cerceaux, de 4 couleurs
diff&eacuterentes possibles. 16 cartes sont pos&eacutes sur une table et le joueur doit faire superposer
des cartes de mani&egravere que chaque bille soit dans le cerceau de m&ecircme couleur d’une autre
carte.
-->
</div>
</div>
</div>
<div id="popup2" class="overlay">
<div class="popup2">
<h2 id="SettingName"><?php echo $parametres[$langue]; ?></h2>
<h2 id="SettingName">Param&#232;tres</h2>
<a class="close" onclick="SettingClose()" href="#">&times;</a>
<div class="content">
<div id="couleurs" class="Mode_Setting">
@ -585,7 +570,7 @@
<a onclick="lancerpartie();">
<div id="contourbuttonvalider">
<div class="bouttonvalider violet">
<h1 id="textjouer"><?php echo $jouer[$langue]; ?></h1>
<h1 id="textjouer">JOUER</h1>
</div>
</div>
</a>
@ -603,7 +588,7 @@
</a>
<div id="textdumode">
<h1 id="textmode"><?php echo $matchpts[$langue]; ?></h1>
<h1 id="textmode">Match à Point</h1>
</div>
<a onclick="modeSuiv()">
<div id="modesuiv">

20
SwichGIT/src/js/main.js
Unescape View File

@ -1,5 +1,6 @@
var mode = 1;
var nbplayers = 1;
var lange = 0;
var lightprima = "#DEDEDE";
var lightsedonca = "#B7B7B7";
var lighttercia = "#E6E6E6";
@ -1549,7 +1550,7 @@ function testPourJeuInfini() {
}
}
//Fonction de test mias pour le jeu classique
//Fonction de test mais pour le jeu classique
function testPourJeuClassique() {
//try {
@ -1820,8 +1821,23 @@ function bacASable() {
lesCartes.push(uneCarte);
afficherCartes(lesCartes);
}
function functionLange(){
if(lange % 2 == 0)
{
document.getElementById("flag_top").classList.add("transparent");
} else{
document.getElementById("flag_top").classList.remove("transparent");
}
lange = lange + 1;
}
function trad(){
var flag_top = document.getElementById("flag_top");
var flag_bottom = document.getElementById("flag_bottom");
}

Write Preview
Loading…
Cancel
Save