Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Johan lab3 #39

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
0f197d5
First commit
JohanFendi Jan 31, 2025
cfc1c12
test
Jan 31, 2025
4b5ce78
ny fordon class
RayanAhmad123 Feb 4, 2025
969fd69
Scania + FlatBedTruck klasser
JoosefL Feb 4, 2025
209d4b7
ny fordon klass
RayanAhmad123 Feb 4, 2025
29cc674
Merge remote-tracking branch 'origin/master'
JoosefL Feb 4, 2025
5fc54e7
push #2
JoosefL Feb 4, 2025
e5cbc70
ny fordon class
RayanAhmad123 Feb 4, 2025
938b1a4
ny fordon class
RayanAhmad123 Feb 4, 2025
deff0ad
ny fordon class
RayanAhmad123 Feb 4, 2025
dd2f47d
push #3
JoosefL Feb 4, 2025
8af355b
ny fordon class
RayanAhmad123 Feb 4, 2025
bb46dd0
push #4
JoosefL Feb 4, 2025
b09b891
Merge remote-tracking branch 'origin/master'
JoosefL Feb 4, 2025
beeba7f
OGFlatBed
JoosefL Feb 4, 2025
c599964
First implementation of CarRepairShop
JohanFendi Feb 4, 2025
f370b0e
ny fordon class
RayanAhmad123 Feb 4, 2025
79c0fb4
First implementation of CarRepairShop
JohanFendi Feb 4, 2025
7e3d75b
ny fordon class
RayanAhmad123 Feb 4, 2025
4e28739
Merge remote-tracking branch 'origin/master'
JohanFendi Feb 4, 2025
d587b1a
OGFlatBed
JoosefL Feb 4, 2025
714716e
- Byggt vidare på 2an
JoosefL Feb 4, 2025
90516c4
Merge remote-tracking branch 'origin/master'
JoosefL Feb 4, 2025
b90f41b
småfix
JoosefL Feb 4, 2025
1a5bc65
Hej
JoosefL Feb 7, 2025
527cffe
ny fordon class
RayanAhmad123 Feb 7, 2025
f5344d5
Hej2
JoosefL Feb 7, 2025
ea492fa
ny fordon class
RayanAhmad123 Feb 7, 2025
f48da47
Merge remote-tracking branch 'origin/master'
JoosefL Feb 7, 2025
fd1983d
ny fordon class
RayanAhmad123 Feb 7, 2025
fce53d5
Merge remote-tracking branch 'origin/master'
JoosefL Feb 7, 2025
342d361
Testfil för CarRepairShop
JohanFendi Feb 7, 2025
72d6881
Hej3
JoosefL Feb 7, 2025
f4817f3
Merge remote-tracking branch 'origin/master'
JohanFendi Feb 7, 2025
4c13203
Flatbed implemented
JohanFendi Feb 7, 2025
bab4502
Container implemented'
JohanFendi Feb 7, 2025
527aa8c
Vehicle no longer implements moveable. Car class implements movable
JohanFendi Feb 7, 2025
594c092
Scania + andra grejer
JoosefL Feb 9, 2025
8c14bc2
Implementation of movementobj. Implementations of Movable methods in …
JohanFendi Feb 10, 2025
57ea851
Name changes, mostly to flatbed class'
JohanFendi Feb 11, 2025
3ec9a06
fixat testerna
JoosefL Feb 11, 2025
0b2a2b4
fixat testerna
JoosefL Feb 11, 2025
bbd1185
Test file for container
JohanFendi Feb 11, 2025
947e234
fixat testerna
JoosefL Feb 11, 2025
8f8fd25
Merge remote-tracking branch 'origin/Josef/ändringar' into Josef/ändr…
JohanFendi Feb 11, 2025
5df2abd
ny fordon class
RayanAhmad123 Feb 11, 2025
2cd7d20
ny fordon class
RayanAhmad123 Feb 11, 2025
922c4af
ny fordon class
RayanAhmad123 Feb 11, 2025
a589826
ny fordon class
RayanAhmad123 Feb 12, 2025
4318751
Merge remote-tracking branch 'origin/Josef/ändringar' into Josef/ändr…
RayanAhmad123 Feb 12, 2025
628214e
Merge pull request #2 from JohanFendi/Josef/ändringar
JohanFendi Feb 13, 2025
bf120b1
First implementation of CarRepairshop
JohanFendi Feb 13, 2025
5314124
Merge pull request #3 from JohanFendi/Josef/ändringar
JohanFendi Feb 13, 2025
ec7c729
Refactor file structure
JohanFendi Feb 13, 2025
f96799a
Changes after TA-feedback
JohanFendi Feb 14, 2025
d47ffd4
Integrating UI files into lab2
JoosefL Feb 14, 2025
a05ce3e
Major changes in CarController and DrawPanel.
JohanFendi Feb 18, 2025
fddd7d8
Frankenstein lösning / Viewer discretion is adviced
JohanFendi Feb 20, 2025
80890f2
3
JohanFendi Feb 20, 2025
43843f3
Added refac. plan, UMLs.
JohanFendi Feb 21, 2025
601a409
hejdå
JoosefL Feb 24, 2025
17c8c66
Merge remote-tracking branch 'origin/johanLab3' into johanLab3
JoosefL Feb 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/libraries/junit_jupiter.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/junit_jupiter_api.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 0 additions & 79 deletions Saab95.java

This file was deleted.

68 changes: 0 additions & 68 deletions Volvo240.java

This file was deleted.

Loading