From 33c697dec8aca9b79602e70dffcc7d0bac28ef9f Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 15 Nov 2024 14:56:01 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 2bb7cfc..6726e81 100644 --- a/time.txt +++ b/time.txt @@ -129,6 +129,7 @@ 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 max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 0ad091d4576181ace6122a16bc53f4d691288b28 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 15 Nov 2024 16:33:30 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 6726e81..f1c2b76 100644 --- a/time.txt +++ b/time.txt @@ -130,6 +130,7 @@ 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) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 4b75f73701b9580109e0723422bce0e9dbdb2d4d Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 15 Nov 2024 17:01:00 +0100 Subject: time update --- time.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/time.txt b/time.txt index 6726e81..b4c0fd4 100644 --- a/time.txt +++ b/time.txt @@ -353,6 +353,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 -- cgit v1.2.3 From 548cca08ce4a0a65ac8a65cf6e98394380522908 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Fri, 15 Nov 2024 17:01:24 +0100 Subject: Added tasks --- time.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/time.txt b/time.txt index 7a350a3..63a33e6 100644 --- a/time.txt +++ b/time.txt @@ -218,6 +218,9 @@ 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 wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 3fd8de3c89a43e7b4cd8bf6698f8a995646701c8 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Fri, 15 Nov 2024 17:28:29 +0100 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index a8b1546..bce532f 100644 --- a/time.txt +++ b/time.txt @@ -225,6 +225,7 @@ 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 wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 40ebf860008fb3cb63b5fc505ded7eb830e241cc Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 15 Nov 2024 17:39:48 +0100 Subject: update time.txt --- time.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/time.txt b/time.txt index f1c2b76..53a16a6 100644 --- a/time.txt +++ b/time.txt @@ -131,6 +131,8 @@ 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) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 4699f53ed66648707851633b156d24e707b9ad9b Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 15 Nov 2024 20:40:18 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 51b9652..aed534f 100644 --- a/time.txt +++ b/time.txt @@ -133,6 +133,7 @@ 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) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 3205bb8e6c7b3ac5611c969cfd4816e5ee74a728 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 16 Nov 2024 13:25:23 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index aed534f..68a9e33 100644 --- a/time.txt +++ b/time.txt @@ -134,6 +134,7 @@ 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 10m review :: PR review (#26) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From c035649b94e2389b44868d64cf231568b568c643 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Sat, 16 Nov 2024 15:35:24 +0100 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index bce532f..ebc46f2 100644 --- a/time.txt +++ b/time.txt @@ -226,6 +226,7 @@ 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 wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 7e0d361437a64906d4f93f7e9457cba5ee7de62b Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 16 Nov 2024 16:48:56 +0100 Subject: update time.txt --- time.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.txt b/time.txt index 68a9e33..9818a1c 100644 --- a/time.txt +++ b/time.txt @@ -134,7 +134,7 @@ 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 10m review :: PR review (#26) +loek: 2024-11-16 1h10m review :: PR review (#26) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 70bf21bef6794a0ab4987d9a605322632b3c32d8 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Sat, 16 Nov 2024 20:30:23 +0100 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index ebc46f2..3bb315a 100644 --- a/time.txt +++ b/time.txt @@ -227,6 +227,7 @@ 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 -- cgit v1.2.3 From 2b77536e2ec1617a51af2a23693f62985a601e6a Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 16 Nov 2024 21:11:47 +0100 Subject: update time.txt --- time.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.txt b/time.txt index b995953..df7a4f9 100644 --- a/time.txt +++ b/time.txt @@ -134,7 +134,7 @@ 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 1h10m 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 -- cgit v1.2.3 From 37d6f3f6231f2f923f0eb2635f31d9f3e0a0ee29 Mon Sep 17 00:00:00 2001 From: Jaro Date: Sun, 17 Nov 2024 21:07:48 +0100 Subject: update time --- time.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/time.txt b/time.txt index b54761d..945812c 100644 --- a/time.txt +++ b/time.txt @@ -365,7 +365,7 @@ 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-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 @@ -459,5 +459,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 -- cgit v1.2.3