Merge branch 'master' of https://github.com/lonkaars/crepe-docs into wouter/time

1 files changed, 37 insertions, 0 deletions

diff --git a/time.txt b/time.txt
index 0c73bee..b754032 100644
--- a/time.txt
+++ b/time.txt
@@ -129,6 +129,12 @@ loek: 2024-11-13 3h05m review :: PR review (#26)
 loek: 2024-11-13 25m review :: PR review (merge #29 + update #26)
 loek: 2024-11-14 55m project meeting
 loek: 2024-11-14 5h45m implementation :: audio system
+loek: 2024-11-15 2h30m project meeting
+loek: 2024-11-15 55m tech support (Jaro w/ event manager & scripts)
+loek: 2024-11-15 10m tooling :: repository (change default column width)
+loek: 2024-11-15 10m review :: PR review (#36)
+loek: 2024-11-15 2h review :: PR review (#26)
+loek: 2024-11-16 1h40m review :: PR review (#26)
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -220,6 +226,12 @@ max: 2024-11-12 40m eighteent project meeting
 max: 2024-11-13 2h50m reviewing Loek's big cleanup
 max: 2024-11-13 1h40m reviewing Jaro's particle PR
 max: 2024-11-12 3h50m second review of Loek's big cleanup
+max: 2024-11-14 1h15m ninetheenth project meeting
+max: 2024-11-15 1h30m seventh project lesson
+max: 2024-11-15 1h twentheenth project meeting
+max: 2024-11-15 30m extended code standard
+max: 2024-11-16 4h third review of Loek's big cleanup
+max: 2024-11-16 1h30m fourth review of Loek's big cleanup
 
 wouter: 2024-09-02 1h project meeting :: project kickoff
 wouter: 2024-09-02 45m project meeting
@@ -359,6 +371,18 @@ niels: 2024-11-7 3h AnimatorSystem programming and debugging
 niels: 2024-11-8 50m Project meeting
 niels: 2024-11-8 3h30m adjusted the RenderSystem,Animator,AnimatorSystem,Sprite,Texture, Camera. to code-style
 niels: 2024-11-8 3h Integrated the feedback from pullrequest.
+niels: 2024-11-11 30m Adjusted rendering example
+niels: 2024-11-11 3h30m rendering particle
+niels: 2024-11-12 40m project meeting
+niels: 2024-11-12 1h adjusted rendering and texture so that gameObject can have multiple sprite components
+niels: 2024-11-12 20m merge master into rendering_particle branch
+niels: 2024-11-14 1h30m made the color parameter in sprite component work with rendersystem
+niels: 2024-11-14 1h Made a mistake in merging and needed to fix my mistake
+niels: 2024-11-14 1h Adjusted code based on feedback from team (#31)
+niels: 2024-11-14 1h30m sorting sprites based on sorting in layer
+niels: 2024-11-14 1h Project meeting
+niels: 2024-11-15 1h Project meeting
+niels: 2024-11-15 2h project guidance
 
 jaro: 2024-09-02 1h project meeting :: project kickoff
 jaro: 2024-09-02 45m project meeting
@@ -442,5 +466,18 @@ jaro: 2024-11-7 2h physics code standard and particle system
 jaro: 2024-11-8 2h project meeting
 jaro: 2024-11-8 2h installing environment and feedback.
 jaro: 2024-11-8 2h installing environment.
+jaro: 2024-11-8 3h fixing dependency issues and updated environment.
+jaro: 2024-11-10 3h30m finished Particle system and unit tests.
+jaro: 2024-11-10 1h30m code correct particle and collision system (box box).
+jaro: 2024-11-10 1h collision system circle circle.
+jaro: 2024-11-11 3h feedback particle system and collision system (box square).
+jaro: 2024-11-12 2h collision system
+jaro: 2024-11-13 1h giving feedback pr
+jaro: 2024-11-14 1h30m project meeting
+jaro: 2024-11-14 4h15m collision system all collision and improved functions.
+jaro: 2024-11-15 1h30m project lesson
+jaro: 2024-11-15 1h project meeting
+jaro: 2024-11-15 2h30m collision system unit test and integration scripts.
+jaro: 2024-11-17 5h collision system static handeler and bouncing ball game.
 
 # vim:ft=cfg