Merge remote-tracking branch 'origin/master' into max/time

1 files changed, 40 insertions, 3 deletions

diff --git a/time.txt b/time.txt
index 6db1f2d..2da6f0d 100644
--- a/time.txt
+++ b/time.txt
@@ -114,6 +114,16 @@ loek: 2024-11-07 1h review :: PR review (#16)
 loek: 2024-11-07 20m review :: PR review (#25)
 loek: 2024-11-07 1h15m implementation :: audio system
 loek: 2024-11-07 25m implementation :: refactoring (big cleanup)
+loek: 2024-11-08 50m project meeting
+loek: 2024-11-08 10m tech support (Jaro w/ old clang-format version)
+loek: 2024-11-08 10m tooling :: repository (update libraries + readme)
+loek: 2024-11-08 1h25m review :: PR review (#27)
+loek: 2024-11-08 20m tech support (more library install issues)
+loek: 2024-11-11 40m review :: PR review (#28)
+loek: 2024-11-12 35m project meeting
+loek: 2024-11-12 40m review :: PR review (#30)
+loek: 2024-11-12 5m review :: PR review (#28)
+loek: 2024-11-12 2h35m implementation :: unit tests (script system + major refactoring)
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -250,10 +260,20 @@ wouter: 2024-10-12 30m reviewing pull request logging
 wouter: 2024-10-24 1h20m project meeting
 wouter: 2024-10-25 2h added collision functionality to event manager
 wouter: 2024-10-28 2h added iKeyListener and iMouseListener to poc
+wouter: 2024-10-28 6h worked on UIObjects
 wouter: 2024-10-29 20m discusing api change for UI objects
 wouter: 2024-10-30 15m helping out with gameloop question
 wouter: 2024-10-29 4h created diagrams for gameloop/events/inputs system
 wouter: 2024-10-31 3h45m fiftheent project meeting
+wouter: 2024-11-04 2h sixteent project meeting
+wouter: 2024-11-05 30m setting up coding environment
+wouter: 2024-11-05 3h struggling with coding environment + fixing gameloop.
+wouter: 2024-11-06 3h trying to fix sdl_image environment error
+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
+
 
 
 niels: 2024-09-02 1h project meeting :: project kickoff
@@ -316,6 +336,15 @@ niels: 2024-10-30 3h fixing camera SDL viewort bug
 niels: 2024-10-31 3h45m meeting
 niels: 2024-11-2 3h design document, diagrams and flowcharts
 niels: 2024-11-3 1h design document, diagrams and flowcharts
+niels: 2024-11-4 3h30m assesment and meetings
+niels: 2024-11-7 1h merging master with niels/rendering
+niels: 2024-11-7 30m debugging segmentation fault of script.
+niels: 2024-11-7 1h Animator Component 
+niels: 2024-11-7 3h AnimatorSystem programming and debugging
+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.
 
 jaro: 2024-09-02 1h project meeting :: project kickoff
 jaro: 2024-09-02 45m project meeting
@@ -388,8 +417,16 @@ jaro: 2024-10-31 3h30m discusing design questions
 jaro: 2024-10-31 1h changing diagrams
 jaro: 2024-10-31 45m adding diagrams physics,collision,particles
 jaro: 2024-11-1 15m weeklyupdate
-
-
-
+jaro: 2024-11-3 3h design documentation
+jaro: 2024-11-4 3h30m assesment and meetings
+jaro: 2024-11-4 3h Physics system,rigidbody,vector2
+jaro: 2024-11-5 3h merge conflicts and physics system and clangd
+jaro: 2024-11-6 1h30m physics doxygen,tests,rigidbody
+jaro: 2024-11-7 30m max code review
+jaro: 2024-11-7 2h physics code standard and particle system
+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.
 
 # vim:ft=cfg