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

1 files changed, 65 insertions, 3 deletions

diff --git a/time.txt b/time.txt
index 957929c..4cf40dc 100644
--- a/time.txt
+++ b/time.txt
@@ -174,7 +174,24 @@ loek: 2024-11-28 40m chores
 loek: 2024-11-28 15m implementation :: mediator
 loek: 2024-11-28 45m implementation :: resource manager
 loek: 2024-11-29 1h15m project meeting
-loek: 2024-11-29 40m implementation :: audio system
+loek: 2024-11-29 4h05m implementation :: audio system
+loek: 2024-11-30 2h45m implementation :: audio system
+loek: 2024-12-02 2h05m review :: PR review (#35, #53)
+loek: 2024-12-02 1h20m project meeting
+loek: 2024-12-02 25m implementation :: audio system (remove `Private`)
+loek: 2024-12-03 20m project meeting
+loek: 2024-12-03 2h05m review :: PR review (#35, #53)
+loek: 2024-12-03 35m chores
+loek: 2024-12-03 50m review :: PR review (#58)
+loek: 2024-12-04 1h30m docs :: doxygen
+loek: 2024-12-04 15m review :: PR review (#57)
+loek: 2024-12-04 55m review :: PR review (#55)
+loek: 2024-12-04 50m review :: PR review (#55, #60)
+loek: 2024-12-05 1h10m implementation :: unit tests (resource manager)
+loek: 2024-12-05 1h05m project meeting
+loek: 2024-12-05 1h20m review :: PR review (#55)
+loek: 2024-12-05 20m review :: PR review (#55, #60)
+loek: 2024-12-05 30m tech support (w/ jaro)
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -401,6 +418,19 @@ wouter: 2024-11-19 1h eight project lesson
 wouter: 2024-11-19 1h50m twenty-second project meeting
 wouter: 2024-11-20 9h working on big eventManager changes
 wouter: 2024-11-22 2h checking gameLoop problem and checking timing code
+wouter: 2024-11-24 3h working on inputsystem
+wouter: 2024-11-25 4h finishing inputsytem and writing tests
+wouter: 2024-11-25 1h twenty-fourth project meeting
+wouter: 2024-11-26 1h30m twenty-fifth project meeting
+wouter: 2024-11-26 3h working on inputsystem feedback
+wouter: 2024-11-26 30m finishing feedback inputsystem
+wouter: 2024-11-27 2h reviewing collision system PR #53
+wouter: 2024-11-27 30m discussing pixels to gameunits with niels
+wouter: 2024-11-27 2h setting up demogame environment and looking at assets
+wouter: 2024-11-28 6h working on demogame.
+wouter: 2024-11-28 1h30m twenty-sixth project meeting
+
+
 
 niels: 2024-09-02 1h project meeting :: project kickoff
 niels: 2024-09-02 45m project meeting
@@ -505,6 +535,20 @@ niels: 2024-11-21 1h merging master (problems with git submodule whereami)
 niels: 2024-11-21 1h researching more about 2d camera
 niels: 2024-11-22 1h40m programming decoupling the world units and pixel in rendering
 niels: 2024-11-22 1h15m project meeting
+niels: 2024-11-22 4h updating and refactoring camera
+niels: 2024-11-24 1h Running jaro tests
+niels: 2024-11-25 1h project meeting
+niels: 2024-11-26 1h30m project meeting
+niels: 2024-11-26 1h50m project lesson
+niels: 2024-11-27 3h implementing feedback from #PR40
+niels: 2024-11-27 1h making niels/doxygen
+niels: 2024-11-27 29m Mouse position and rendering
+niels: 2024-11-28 41m call with max discussing #PR40
+niels: 2024-11-28 25m call about sdlcontext singleton and PR's
+niels: 2024-11-28 18m rendering features
+niels: 2024-11-28 5h implementing feedback from #PR40
+niels: 2024-11-28 2h meeting with jaro about camera
+niels: 2024-11-29 1h30m prject meeting
 
 jaro: 2024-09-02 1h project meeting :: project kickoff
 jaro: 2024-09-02 45m project meeting
@@ -617,7 +661,25 @@ jaro: 2024-11-20 3h15m unit test collision with scripts
 jaro: 2024-11-20 1h call loek for unti test collision
 jaro: 2024-11-20 30m particle rendering feedback
 jaro: 2024-11-20 1h15m making unit tests
-jaro: 2024-11-20 1h15m project meeting
-jaro: 2024-11-20 15m weeklyupdate
+jaro: 2024-11-21 15m review vector2
+jaro: 2024-11-21 15m bug fix rendering (particle)
+jaro: 2024-11-21 30m Merge with master
+jaro: 2024-11-21 1h bug fix collision system
+jaro: 2024-11-22 1h15m project meeting
+jaro: 2024-11-22 15m weeklyupdate
+jaro: 2024-11-22 30m merge and bug fix collision system
+jaro: 2024-11-22 1h call scripts and collision system integration
+jaro: 2024-11-22 2h45m refactoring collision system variant
+jaro: 2024-11-22 30m unit test collision system
+jaro: 2024-11-23 2h collision system comments,unit test and profiling test
+jaro: 2024-11-25 1h project meeting
+jaro: 2024-11-25 30m profiling average function
+jaro: 2024-11-26 1h30m project meeting
+jaro: 2024-11-27 30m feedback and explaining collision system
+jaro: 2024-11-28 30m feedback decoupling pixels
+jaro: 2024-11-28 30m call niels decoupling pixels
+jaro: 2024-11-28 2h discussion niels decoupling pixels
+jaro: 2024-11-29 1h30m project meeting
+jaro: 2024-11-29 15m weeklyupdate
 
 # vim:ft=cfg