Merge branch 'master' into niels/time-update

1 files changed, 69 insertions, 3 deletions

diff --git a/time.txt b/time.txt
index 7a9653e..8b35ce2 100644
--- a/time.txt
+++ b/time.txt
@@ -130,6 +130,30 @@ 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)
+loek: 2024-11-18 1h15m project meeting
+loek: 2024-11-18 20m review :: PR review (#38)
+loek: 2024-11-18 55m implementation :: split branch into separate PR (#39)
+loek: 2024-11-19 40m review :: PR review (#38)
+loek: 2024-11-19 40m implementation :: audio system
+loek: 2024-11-19 1h25m docs :: user documentation
+loek: 2024-11-19 50m chores
+loek: 2024-11-19 2h50m project meeting
+loek: 2024-11-19 1h15m review :: PR review (#34)
+loek: 2024-11-20 15m tech support (w/ jaro)
+loek: 2024-11-20 1h55m review :: PR review (#38, #39, #43)
+loek: 2024-11-20 1h implementation :: unit tests (ValueBroker, Proxy & DB)
+loek: 2024-11-20 2h15m implementation :: unit tests (collision test / event manager)
+loek: 2024-11-20 35m docs :: doxygen
+loek: 2024-11-20 2h review :: PR review (#34 + update Script class)
+loek: 2024-11-21 40m implementation :: script (more utilities)
+loek: 2024-11-21 50m review :: PR review (#39, #43 and #47)
+loek: 2024-11-21 15m review :: PR review (merge #39 + update #47)
+loek: 2024-11-21 30m review :: PR review (#47, #48)
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -221,6 +245,27 @@ 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
+max: 2024-11-18 1h30m twenty-first project meeting
+max: 2024-11-18 30m prepare PowerPoint for project lesson
+max: 2024-11-19 1h50m reviewing Niels's game-units to pixels PR
+max: 2024-11-19 1h eight project lesson
+max: 2024-11-19 1h50m twenty-second project meeting
+max: 2024-11-20 1h30m reviewing Loek's util PR
+max: 2024-11-20 1h40m creating unit tests for ECS and Scenes
+max: 2024-11-20 45m added Doxygen user-documentation
+max: 2024-11-21 1h30m adjusting Doxygen PR according to feedback
+max: 2024-11-21 1h installing WhereAmI and checking PR
+max: 2024-11-21 1h reviewing Loek's util PR
+max: 2024-11-21 1h45m making Vector2 templated and making tests
+max: 2024-11-22 40m improving Vector2 after feedback
+max: 2024-11-22 1h20m replaced reference by OptionalRef in Scene
+max: 2024-11-22 1h40m implemented presistent objects in ComponentManager
 
 wouter: 2024-09-02 1h project meeting :: project kickoff
 wouter: 2024-09-02 45m project meeting
@@ -281,8 +326,16 @@ wouter: 2024-11-07 1h gameloop working and worked on feedback
 wouter: 2024-11-07 1h discussing eventManager improvements with loek
 wouter: 2024-11-07 15m reviewing pull request #16 saveManager
 wouter: 2024-11-07 4h working on eventManager improvements
-
-
+wouter: 2024-11-08 4h working on loopManager feedback
+wouter: 2024-11-11 4h finishing up loopManager
+wouter: 2024-11-11 4h working on eventManager
+wouter: 2024-11-12 4h working on eventManager
+wouter: 2024-11-12 45m reviewing particle system PR #29
+wouter: 2024-11-12 35m project meeting
+wouter: 2024-11-13 4h testing eventManager using example + fixing code standard
+wouter: 2024-11-13 3h starting with inputSystem
+wouter: 2024-11-14 55m project meeting
+wouter: 2024-11-16 3h implementing feedback and improving eventManager
 
 niels: 2024-09-02 1h project meeting :: project kickoff
 niels: 2024-09-02 45m project meeting
@@ -354,7 +407,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
@@ -470,5 +523,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