Merge branch 'paul' into jejew

058eaed7 · Paul Chevalier · 14e19050 · 73f7a464 · 058eaed7 · 058eaed7
Commit 058eaed7 authored 2 weeks ago by Paul Chevalier
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
+{
+    "python.testing.pytestArgs": [
+        "."
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}
\ No newline at end of file
--- a/Code_objets/__pycache__/Display.cpython-310.pyc
+++ b/Code_objets/__pycache__/Display.cpython-310.pyc
--- a/Code_objets/__pycache__/ImageProcessing.cpython-310.pyc
+++ b/Code_objets/__pycache__/ImageProcessing.cpython-310.pyc
--- a/Code_objets/__pycache__/Main.cpython-310.pyc
+++ b/Code_objets/__pycache__/Main.cpython-310.pyc
--- a/Code_objets/__pycache__/Menu.cpython-310.pyc
+++ b/Code_objets/__pycache__/Menu.cpython-310.pyc
--- a/Code_objets/__pycache__/Parameters.cpython-310.pyc
+++ b/Code_objets/__pycache__/Parameters.cpython-310.pyc
--- a/Code_objets/__pycache__/Point.cpython-310.pyc
+++ b/Code_objets/__pycache__/Point.cpython-310.pyc
--- a/Code_objets/__pycache__/Trajectory.cpython-310.pyc
+++ b/Code_objets/__pycache__/Trajectory.cpython-310.pyc
--- a/Code_objets/__pycache__/UI.cpython-310.pyc
+++ b/Code_objets/__pycache__/UI.cpython-310.pyc
--- a/Code_objets/__pycache__/VideoManager.cpython-310.pyc
+++ b/Code_objets/__pycache__/VideoManager.cpython-310.pyc
--- a/Objet/__pycache__/Main.cpython-311.pyc
+++ b/Objet/__pycache__/Main.cpython-311.pyc
--- a/Objet/__pycache__/main.cpython-310.pyc
+++ b/Objet/__pycache__/main.cpython-310.pyc
--- a/Objet/__pycache__/menu.cpython-310.pyc
+++ b/Objet/__pycache__/menu.cpython-310.pyc
--- a/Objet/__pycache__/menu.cpython-311.pyc
+++ b/Objet/__pycache__/menu.cpython-311.pyc
--- a/Objet/__pycache__/trajectory.cpython-310.pyc
+++ b/Objet/__pycache__/trajectory.cpython-310.pyc
--- a/Objet/__pycache__/ui.cpython-310.pyc
+++ b/Objet/__pycache__/ui.cpython-310.pyc
--- a/__pycache__/test_chargement.cpython-310-pytest-8.3.5.pyc
+++ b/__pycache__/test_chargement.cpython-310-pytest-8.3.5.pyc
--- a/__pycache__/test_chercherdossier.cpython-310-pytest-8.3.5.pyc
+++ b/__pycache__/test_chercherdossier.cpython-310-pytest-8.3.5.pyc
--- a/__pycache__/test_multithrading_logo.cpython-310-pytest-8.3.5.pyc
+++ b/__pycache__/test_multithrading_logo.cpython-310-pytest-8.3.5.pyc
--- a/__pycache__/test_nouveautestthreding.cpython-310-pytest-8.3.5.pyc
+++ b/__pycache__/test_nouveautestthreding.cpython-310-pytest-8.3.5.pyc