Unverified Commit 866c64dc authored by Erreiip's avatar Erreiip Committed by GitHub
Browse files

Merge pull request #1 from Ciliste/changement-archi 

ON VEUT UN MAIN Z'AI MIS LA BRANCHE SUR OLD
parents 6414e96a a29ad9c6

.gitignore

+2 −0
Changes for .gitignore: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ jeuAssemblage/build/* 
jeuAssemblage/dist/*

jeuAssemblage/jeuAssemblage.iml

jeuAssemblage/dist/*.jar

jeuAssemblage/log.txt





piece_puzzle/build/*

piece_puzzle/dist/*

jeuAssemblage/build.xml

+2 −0
Changes for jeuAssemblage/build.xml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ 
    </target>

    <!--  ==================== Run Target ==================================  -->

    <target name="run" depends="dist">

        <record name="log.txt" action="start"/> 

            <java jar="${dist.home}/${app.fullname}.jar" fork="true"/>

        <record name="log.txt" action="stop"/>

    </target>

    <!--  ==================== runWithoutComp Target ==================================  -->

    <target name="runWithoutComp">

jeuAssemblage/lib/pieces_puzzle-0.1.0.jar

+2.66 KiB (7.87 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

jeuAssemblage/maps.tetriste

+7 −0
Changes for jeuAssemblage/maps.tetriste: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line 
10;10;3;0;shesh10;10

15;12;7;7950305377179271168;Jean;143

10;14;6;1270873474421636096;Nul;96

13;11;7;493101277235170304;Test;77

14;12;7;5761360446297763840;zdqzd;117

15;13;7;5544433734978013184;Shesh;121

17;15;9;8065871849407982592;Test;224

jeuAssemblage/output.png

−1.01 KiB (257 B)
Loading image diff...