Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
Not Alone
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anthony ROZEN
Not Alone
Commits
1e97cdc7
Commit
1e97cdc7
authored
Dec 21, 2020
by
Antoine Guérin
Browse files
Options
Browse Files
Download
Plain Diff
correction de conflit
parents
1d29b2e7
2fec3482
Changes
19
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
1980 additions
and
6 deletions
+1980
-6
not-alone-doc/src/doc/asciidoc/_sections/analyse.adoc
not-alone-doc/src/doc/asciidoc/_sections/analyse.adoc
+4
-4
not-alone-player/package-lock.json
not-alone-player/package-lock.json
+1747
-0
not-alone-player/pom.xml
not-alone-player/pom.xml
+2
-2
not-alone-player/pom.xml~
not-alone-player/pom.xml~
+91
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/Carte.java
...n/java/fr/univnantes/alma/game/composant/Carte/Carte.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteLieu.java
...va/fr/univnantes/alma/game/composant/Carte/CarteLieu.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteSurvie.java
.../fr/univnantes/alma/game/composant/Carte/CarteSurvie.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteTraque.java
.../fr/univnantes/alma/game/composant/Carte/CarteTraque.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
...n/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
+44
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonArtemia.java
...fr/univnantes/alma/game/composant/Jeton/JetonArtemia.java
+17
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCible.java
...a/fr/univnantes/alma/game/composant/Jeton/JetonCible.java
+17
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCreature.java
...r/univnantes/alma/game/composant/Jeton/JetonCreature.java
+14
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Creature.java
...va/fr/univnantes/alma/game/composant/Joueur/Creature.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Joueur.java
...java/fr/univnantes/alma/game/composant/Joueur/Joueur.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Traque.java
...java/fr/univnantes/alma/game/composant/Joueur/Traque.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/Pion.java
...ain/java/fr/univnantes/alma/game/composant/Pion/Pion.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionAssimilation.java
...univnantes/alma/game/composant/Pion/PionAssimilation.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionSecours.java
...a/fr/univnantes/alma/game/composant/Pion/PionSecours.java
+4
-0
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Plateau.java
.../main/java/fr/univnantes/alma/game/composant/Plateau.java
+4
-0
No files found.
not-alone-doc/src/doc/asciidoc/_sections/analyse.adoc
View file @
1e97cdc7
...
...
@@ -267,13 +267,13 @@ class CarteLieu4 {
}
Traque -> "main " CarteLieu1 : \t\t
Traque --> "def
f
ausse " CarteLieu2 : \t\t
Traque --> "def
f
ausse " CarteLieu3 : \t\t
Traque --> "def
f
ausse " CarteLieu4 : \t\t
Traque --> "defausse " CarteLieu2 : \t\t
Traque --> "defausse " CarteLieu3 : \t\t
Traque --> "defausse " CarteLieu4 : \t\t
....
après
é
xécution
après
e
xécution
[plantuml, exemple-apres-resister, png]
....
...
...
not-alone-player/package-lock.json
View file @
1e97cdc7
This diff is collapsed.
Click to expand it.
not-alone-player/pom.xml
View file @
1e97cdc7
...
...
@@ -20,8 +20,8 @@
<version>
1.10.0
</version>
<configuration>
<workingDirectory>
./
</workingDirectory>
<nodeVersion>
v1
4.11.0
</nodeVersion>
<yarnVersion>
v1.22.
10
</yarnVersion>
<nodeVersion>
v1
2.18.4cdc
</nodeVersion>
<yarnVersion>
v1.22.
5
</yarnVersion>
</configuration>
<executions>
...
...
not-alone-player/pom.xml~
0 → 100644
View file @
1e97cdc7
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns=
"http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
not-alone
</artifactId>
<groupId>
fr.univnantes.alma
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
not-alone-player
</artifactId>
<name>
Not Alone Player Services
</name>
<build>
<plugins>
<plugin>
<groupId>
com.github.eirslett
</groupId>
<artifactId>
frontend-maven-plugin
</artifactId>
<version>
1.10.0
</version>
<configuration>
<workingDirectory>
./
</workingDirectory>
<nodeVersion>
v12.18.4
</nodeVersion>
<yarnVersion>
v1.22.5
</yarnVersion>
</configuration>
<executions>
<execution>
<id>
install-node-and-yarn
</id>
<goals>
<goal>
install-node-and-yarn
</goal>
</goals>
<phase>
generate-resources
</phase>
</execution>
<execution>
<id>
yarn-install
</id>
<goals>
<goal>
yarn
</goal>
</goals>
<configuration>
<arguments>
install
</arguments>
</configuration>
<phase>
generate-resources
</phase>
</execution>
<execution>
<id>
yarn run build
</id>
<goals>
<goal>
yarn
</goal>
</goals>
<configuration>
<arguments>
run build
</arguments>
</configuration>
<phase>
compile
</phase>
</execution>
<execution>
<id>
code-generation
</id>
<phase>
generate-sources
</phase>
<goals>
<goal>
yarn
</goal>
</goals>
<configuration>
<arguments>
run codegen
</arguments>
</configuration>
</execution>
<execution>
<id>
yarn-clean
</id>
<phase>
clean
</phase>
<goals>
<goal>
yarn
</goal>
</goals>
<configuration>
<arguments>
run clean
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>
./dist/not-alone-web
</directory>
<targetPath>
static
</targetPath>
</resource>
</resources>
</build>
</project>
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/Carte.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Carte
;
public
class
Carte
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteLieu.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Carte
;
public
class
CarteLieu
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteSurvie.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Carte
;
public
class
CarteSurvie
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteTraque.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Carte
;
public
class
CarteTraque
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Jeton
;
import
fr.univnantes.alma.game.composant.Carte.CarteLieu
;
import
java.util.ArrayList
;
public
abstract
class
Jeton
{
ArrayList
<
CarteLieu
>
position
;
public
Jeton
()
{
this
.
position
=
new
ArrayList
<>();
}
public
void
poserJeton
(
CarteLieu
clieu
)
{
position
.
add
(
clieu
);
}
public
void
retirerJeton
()
{
position
.
clear
();
}
public
abstract
void
pouvoir
();
public
ArrayList
<
CarteLieu
>
getPosition
()
{
return
position
;
}
public
boolean
equals
(
Object
obj
)
{
if
(
obj
==
this
){
return
true
;
}
if
(!(
obj
instanceof
Jeton
)){
return
false
;
}
Jeton
jeton
=
(
Jeton
)
obj
;
return
position
.
equals
(
jeton
.
getPosition
());
}
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonArtemia.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Jeton
;
import
fr.univnantes.alma.game.composant.Carte.CarteLieu
;
import
java.util.ArrayList
;
public
class
JetonArtemia
extends
Jeton
{
public
JetonArtemia
()
{
this
.
position
=
new
ArrayList
<>();
}
@Override
public
void
pouvoir
()
{
//
}
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCible.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Jeton
;
import
fr.univnantes.alma.game.composant.Carte.CarteLieu
;
import
java.util.ArrayList
;
public
class
JetonCible
extends
Jeton
{
public
JetonCible
()
{
this
.
position
=
new
ArrayList
<>();
}
@Override
public
void
pouvoir
()
{
//
}
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCreature.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Jeton
;
import
java.util.ArrayList
;
public
class
JetonCreature
extends
Jeton
{
public
JetonCreature
()
{
this
.
position
=
new
ArrayList
<>();
}
@Override
public
void
pouvoir
()
{
//
}
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Creature.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Joueur
;
public
class
Creature
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Joueur.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Joueur
;
public
class
Joueur
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Traque.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Joueur
;
public
class
Traque
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/Pion.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Pion
;
public
class
Pion
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionAssimilation.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Pion
;
public
class
PionAssimilation
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionSecours.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant.Pion
;
public
class
PionSecours
{
}
not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Plateau.java
0 → 100644
View file @
1e97cdc7
package
fr.univnantes.alma.game.composant
;
public
class
Plateau
{
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment