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

1 files changed, 60 insertions, 39 deletions

diff --git a/time.txt b/time.txt
index e9e6b2f..cce2f9d 100644
--- a/time.txt
+++ b/time.txt
@@ -1,70 +1,72 @@
-loek: 2024-09-02 1h project meeting :: project kickoff
+loek: 2024-09-02 1h project meeting (project kickoff)
 loek: 2024-09-02 45m project meeting
-loek: 2024-09-02 1h4m repository scaffolding
-loek: 2024-09-03 25m repository scaffolding
-loek: 2024-09-03 1h30m repository scaffolding :: engine repository, unit testing
-loek: 2024-09-04 1h30m repository scaffolding :: latex example code
+loek: 2024-09-02 1h4m tooling :: repository (scaffolding)
+loek: 2024-09-03 25m tooling :: repository (scaffolding)
+loek: 2024-09-03 1h30m tooling :: unit testing
+loek: 2024-09-04 1h30m tooling :: documentation (add latex example code)
 loek: 2024-09-04 50m poc :: dynamic library linking test example
-loek: 2024-09-04 45m repository scaffolding :: visual studio code latex configuration
-loek: 2024-09-04 20m repository scaffolding :: visual studio code cmake configuration
-loek: 2024-09-05 15m repository scaffolding :: additional latex contributing guidelines
+loek: 2024-09-04 45m tooling :: repository (visual studio code latex configuration)
+loek: 2024-09-04 20m tooling :: repository (visual studio code cmake configuration)
+loek: 2024-09-05 15m tooling :: documentation (additional latex contributing guidelines)
 loek: 2024-09-05 1h40m project meeting
-loek: 2024-09-05 1h24m time report script
-loek: 2024-09-06 55m time report script
-loek: 2024-09-09 30m review :: niels code style guide
-loek: 2024-09-09 45m review :: wouter research PR#5
-loek: 2024-09-09 25m documentation style guide
+loek: 2024-09-05 1h24m tooling :: time report script
+loek: 2024-09-06 55m tooling :: time report script
+loek: 2024-09-09 30m review :: style (niels code style guide)
+loek: 2024-09-09 45m review :: PR review (#5 wouter research)
+loek: 2024-09-09 25m docs :: style guide
 loek: 2024-09-10 1h55m project meeting
-loek: 2024-09-10 25m briefing :: watch bob videos
-loek: 2024-09-10 5m docs :: update readme
-loek: 2024-09-10 12m docs :: add comparison package and more example latex code
+loek: 2024-09-10 25m research :: watch bob's videos
+loek: 2024-09-10 5m tooling :: repository (update readme)
+loek: 2024-09-10 12m tooling :: documentation (comparison package & more example latex code)
 loek: 2024-09-10 30m project meeting
 loek: 2024-09-11 1h40m research :: profiling and debugging
-loek: 2024-09-12 15m integration :: PR merge
+loek: 2024-09-12 15m review :: PR review
 loek: 2024-09-12 30m research :: audio
 loek: 2024-09-13 1h10m project meeting
-loek: 2024-09-13 45m integration :: PR merge
-loek: 2024-09-14 45m refactoring :: clean up LaTeX build system
-loek: 2024-09-14 1h10m docs :: requirements
-loek: 2024-09-15 2h55m docs :: requirements
-loek: 2024-09-16 2h30m docs :: requirements
+loek: 2024-09-13 45m review :: PR review
+loek: 2024-09-14 45m tooling :: documentation (clean up LaTeX build system)
+loek: 2024-09-14 1h10m tooling :: requirements
+loek: 2024-09-15 2h55m tooling :: requirements
+loek: 2024-09-16 2h30m tooling :: requirements
 loek: 2024-09-17 1h20m project meeting
-loek: 2024-09-17 55m bugs :: cross-platform latexmk filespec
-loek: 2024-09-17 2h25m docs :: requirements
+loek: 2024-09-17 55m tooling :: documentation (cross-platform latexmk filespec bug)
+loek: 2024-09-17 2h25m tooling :: requirements
 loek: 2024-09-18 2h20m docs :: requirements
 loek: 2024-09-18 1h50m research :: audio
-loek: 2024-09-18 1h05m integration :: PR merge
-loek: 2024-09-19 30m docs :: requirements
+loek: 2024-09-18 1h05m review :: PR review
+loek: 2024-09-19 30m tooling :: requirements
 loek: 2024-09-19 15m project meeting
 loek: 2024-09-19 1h30m project meeting
 loek: 2024-09-19 45m project meeting
-loek: 2024-09-19 15m docs :: remove versioning
-loek: 2024-09-19 30m PR merge and style guide update
+loek: 2024-09-19 15m tooling :: documentation (move to git commit versioning)
+loek: 2024-09-19 30m review :: PR review (+ style guide update)
 loek: 2024-09-22 2h15m docs :: research
 loek: 2024-09-24 1h45m project meeting
-loek: 2024-09-25 3h implementation :: audio facade and API
+loek: 2024-09-25 3h implementation :: audio API
 loek: 2024-09-26 2h project meeting
-loek: 2024-09-25 1h20m implementation :: audio facade and API
-loek: 2024-09-27 20m PR merge and style guide update
-loek: 2024-09-27 55m implementation :: fix library import structure
-loek: 2024-09-28 2h20m implementation :: audio facade and API
+loek: 2024-09-25 1h20m implementation :: audio API
+loek: 2024-09-27 20m review :: PR review (+ style guide update)
+loek: 2024-09-27 55m tooling :: build system (fix library import structure)
+loek: 2024-09-28 2h20m implementation :: audio API
 loek: 2024-09-29 1h55m implementation :: debug logging facilities
-loek: 2024-09-29 20m implementation :: audio facade
-loek: 2024-09-29 45m docs :: audio facade design
+loek: 2024-09-29 20m implementation :: audio API
+loek: 2024-09-29 45m docs :: design :: audio API
 loek: 2024-09-30 1h40m project meeting
 loek: 2024-10-01 2h20m review :: feedback & discussing software design
-loek: 2024-10-01 30m implementation :: audio facade and API
+loek: 2024-10-01 30m implementation :: audio API
 loek: 2024-10-03 1h30m project meeting
 loek: 2024-10-04 15m research :: read others' research
 loek: 2024-10-04 1h15m project meeting
-loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style
+loek: 2024-10-05 1h10m tooling :: unit testing (unify unit tests + update code style)
 loek: 2024-10-06 3h40m implementation :: scripting interface
 loek: 2024-10-07 2h45m project meeting
 loek: 2024-10-08 40m review :: Max' ECS code
 loek: 2024-10-08 5m review :: incorporate feedback and merge PR
 loek: 2024-10-09 25m review :: feedback discussion + code style update
-loek: 2024-10-10 1h05m refacting :: fix build system + update readmes
+loek: 2024-10-10 1h05m tooling :: build system (fix libraries + update readmes)
 loek: 2024-10-10 1h30m project meeting
+loek: 2024-10-12 1h15m implementation :: scripting interface
+loek: 2024-10-13 1h implementation :: scripting interface
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -144,8 +146,13 @@ wouter: 2024-09-30 1h40m project meeting
 wouter: 2024-10-03 1h30m discussing event with seger
 wouter: 2024-10-03 4h developing event poc
 wouter: 2024-10-03 1h30m creating gameloop design
-wouter: 2024-10-04 2h developing event poc
 wouter: 2024-10-03 1h30m project meeting
+wouter: 2024-10-04 2h developing event poc
+wouter: 2024-10-04 1h15m project meeting
+wouter: 2024-10-07 2h45m project meeting
+wouter: 2024-10-08 4h finishing keyboard and mouse events
+wouter: 2024-10-09 3h intergrating gameloop with events for testing
+wouter: 2024-10-10 1h30m project meeting
 
 
 niels: 2024-09-02 1h project meeting :: project kickoff
@@ -187,6 +194,11 @@ niels: 2024-10-01 1h30m try implementating library in git submodule. And refacto
 niels: 2024-10-02 1h finishing adding git submodule and bugs related to compiling external library
 niels: 2024-10-02 4h refacting code further so that textures and spritesheet work and fixing bugs.
 niels: 2024-10-04 1h10m project meeting
+niels: 2024-10-07 2h45m project meeting
+niels: 2024-10-09 2h adding the rendering components to api, and making the rendering system
+niels: 2024-10-09 3h researching and programming,debugging the rendersystem
+niels: 2024-10-10 3h Test jaro/particels branch to improve sdl functionalities. additionally, researching the necessary components
+niels: 2024-10-11 1h30m project meeting
 
 
 
@@ -237,4 +249,13 @@ jaro: 2024-10-01 3h15m research physics + collisions
 jaro: 2024-10-01 1h30m Particels poc
 jaro: 2024-10-03 2h project meeting + project lesson
 jaro: 2024-10-04 1h15m project meeting
+jaro: 2024-10-07 2h particle system
+jaro: 2024-10-07 30m project lesson
+jaro: 2024-10-07 2hm project meeting
+jaro: 2024-10-07 4h30m particle system
+jaro: 2024-10-09 30m particle system with ECS
+jaro: 2024-10-10 3h30m particle system with ECS
+jaro: 2024-10-10 1h30m project meeting
+jaro: 2024-10-11 30m weekly update
+
 # vim:ft=cfg