undefined_name/School_Project
3
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 4 Wiki Activity

Shape_Piece_Map #15

Merged
tonitch merged 12 commits from Shape_Piece_Map into master 2023-03-28 00:31:42 +02:00
Conversation 4 Commits 12 Files Changed 7 +311
tonitch commented 2023-02-27 00:54:14 +01:00
Owner
Copy Link

This is the base class that I need to implement the filemap level I made as prototype.

This is a wip as this is clearly not completed yet but I have to sleep

This is the base class that I need to implement the filemap level I made as prototype. This is a wip as this is clearly not completed yet but I have to sleep
tonitch added 2 commits 2023-02-27 00:54:15 +01:00
tonitch added 1 commit 2023-02-27 11:06:02 +01:00 
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
tonitch added 1 commit 2023-02-27 11:22:27 +01:00 
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
tonitch commented 2023-02-27 11:24:33 +01:00
Author
Owner
Copy Link

This is the first Step for #10, When done, I will have to do the fileParser

This is the first Step for #10, When done, I will have to do the fileParser
tonitch added 1 commit 2023-02-28 07:14:07 +01:00
tonitch force-pushed Shape_Piece_Map from a1e36ccbc7 to 8d88f01c9d 2023-03-01 23:46:11 +01:00 Compare
tonitch self-assigned this 2023-03-01 23:59:22 +01:00
BrokenBrad was assigned by tonitch 2023-03-01 23:59:22 +01:00
tonitch added this to the Cats Organized Neatly project 2023-03-01 23:59:28 +01:00
tonitch added this to the Moteur de jeu fini milestone 2023-03-01 23:59:34 +01:00
tonitch added the
Important
 label 2023-03-01 23:59:41 +01:00
tonitch commented 2023-03-02 00:01:47 +01:00
Author
Owner
Copy Link

@BrokenBrad C'est la branche dont je te parlai, je passe sur une nouvelle branche MapParser pour continuer à faire mon parser donc tu peux continuer sur cette branche, je vais essayer de faire un dernier push demain pour ajouter un peu de doc mais si tu as besoin tu peux toujours demander

@BrokenBrad C'est la branche dont je te parlai, je passe sur une nouvelle branche [MapParser](https://git.herisson.ovh/undefined_name/School_Project/src/branch/MapParser) pour continuer à faire mon parser donc tu peux continuer sur cette branche, je vais essayer de faire un dernier push demain pour ajouter un peu de doc mais si tu as besoin tu peux toujours demander
👍 1
tonitch reviewed 2023-03-05 22:01:01 +01:00
app/src/main/java/school_project/Map.java Outdated
@ -0,0 +14,4 @@
}
// TODO: 2/27/23 Tests for Map
public void AddShape(Piece piece){
tonitch commented 2023-03-05 22:01:01 +01:00
Author
Owner
Copy Link

This should actually be AddPiece(Piece piece)

This should actually be `AddPiece(Piece piece)`
Mat_02 approved these changes 2023-03-10 10:37:50 +01:00
Mat_02 left a comment
Member
Copy Link

I understand everything nice job

I understand everything nice job
tonitch commented 2023-03-19 23:19:49 +01:00
Author
Owner
Copy Link

I would also need some way of knowing where the pieces currently are on the map,

I haven't though of a way yet ^^ any suggestions ?

I would also need some way of knowing where the pieces currently are on the map, I haven't though of a way yet ^^ any suggestions ?
tonitch added 1 commit 2023-03-20 23:57:19 +01:00 
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
tonitch added 1 commit 2023-03-21 09:56:17 +01:00 
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
tonitch added 1 commit 2023-03-21 14:16:27 +01:00
tonitch added 20 commits 2023-03-21 14:22:37 +01:00 
Reviewed-on: #16
Reviewed-on: #17
adding drone ci
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
d5b8da4f21
fixup! adding drone ci
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
a55dcc678a
fixup! fixup! adding drone ci
Some checks failed
continuous-integration/drone/push Build is failing
Details
c70e30b629
fixup! fixup! fixup! adding drone ci
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
5a45ab43ba
fixup! fixup! fixup! fixup! adding drone ci
Some checks failed
continuous-integration/drone/push Build is failing
Details
36c79daa4e
adding missing wraper
Some checks failed
continuous-integration/drone/push Build is failing
Details
bc05260ba7
maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
5c4dc5c370
fixup! maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
ec7692f8d3
fixup! fixup! maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
207195c0c8
fixup! fixup! fixup! maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
08c4a08a01
fixup! fixup! fixup! fixup! maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
e55b17fcd8
fixup! fixup! fixup! fixup! fixup! maybe finishing ci? hopefully
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
922497573b
fix ci
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
bbfc5687d9
Update 'README.md'
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details
aafb5f5c66
Merge branch 'master' of git.herisson.ovh:undefined_name/School_project
All checks were successful
continuous-integration/drone/push Build is passing
Details
3ab6ff1bfa
Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
bd41d24a36
tonitch reviewed 2023-03-21 14:29:55 +01:00
tonitch left a comment
Author
Owner
Copy Link

I think it's good to push!

Take a good look :D

I think it's good to push! Take a good look :D
tonitch requested review from Mat_02 2023-03-21 14:30:05 +01:00
tonitch requested review from BrokenBrad 2023-03-21 14:30:21 +01:00
tonitch changed title from WIP: Shape_Piece_Map to Shape_Piece_Map 2023-03-21 14:30:31 +01:00
tonitch added 1 commit 2023-03-21 14:30:59 +01:00
Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
df457b830a
tonitch added 1 commit 2023-03-21 21:28:27 +01:00
Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
1ef428962f
tonitch added 1 commit 2023-03-21 23:07:38 +01:00
Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
bc2feee03c
Mat_02 reviewed 2023-03-23 11:19:25 +01:00
app/src/main/java/school_project/Vec2.java Outdated
@ -0,0 +8,4 @@
public int x, y;
public Vec2() {
x = -1;
Mat_02 commented 2023-03-23 11:19:25 +01:00
Member
Copy Link

oublie pas de l'enlever bb

oublie pas de l'enlever bb
tonitch commented 2023-03-23 11:27:25 +01:00
Author
Owner
Copy Link

e7d82b3076

e7d82b3076
tonitch marked this conversation as resolved
Mat_02 approved these changes 2023-03-23 11:19:53 +01:00
Mat_02 left a comment
Member
Copy Link

lgtm

lgtm
tonitch added 1 commit 2023-03-23 11:26:03 +01:00
Setting default position of vector to 0.
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
e7d82b3076
tonitch commented 2023-03-25 10:17:53 +01:00
Author
Owner
Copy Link

@BrokenBrad est-ce que tu peux y jeter un oeuil pour pouvoir faire le merge s'il te plaît ? :D
Ca te serait certainement utile pour avoir une base pour les graph UI

@BrokenBrad est-ce que tu peux y jeter un oeuil pour pouvoir faire le merge s'il te plaît ? :D Ca te serait certainement utile pour avoir une base pour les graph UI
BrokenBrad approved these changes 2023-03-25 16:31:27 +01:00
tonitch requested review from Mat_02 2023-03-25 16:37:34 +01:00
tonitch merged commit eeae13b339 into master 2023-03-28 00:31:42 +02:00
tonitch deleted branch Shape_Piece_Map 2023-03-28 00:31:42 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
BrokenBrad
Mat_02
Labels
Clear labels   
Important

Doit absolument être fait

  
Moins important

   
Pas important

   
bug

Something is not working

  
done

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
suppléments

à faire si on a le temps

  
wontfix

This won't be fixed

No Label
Important
Moins important
Pas important
bug
done
duplicate
enhancement
help wanted
invalid
question
suppléments
wontfix
Milestone
Clear milestone
No items
No Milestone
Moteur de jeu fini
Projects
Clear projects
No project
Cats Organized Neatly
Assignees
Clear assignees
No Assignees
BrokenBrad
tonitch
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: undefined_name/School_Project#15
No description provided.
Delete Branch "Shape_Piece_Map"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?