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

2 files changed, 95 insertions, 2 deletions

diff --git a/notulen/wk12-1.txt b/notulen/wk12-1.txt
new file mode 100644
index 0000000..86e2d89
--- /dev/null
+++ b/notulen/wk12-1.txt
@@ -0,0 +1,30 @@
+	Documents
+		Research Document
+			-
+		Project plan
+			-
+		Document standard
+			Add updates when needed
+		Requirement
+			-
+		design document
+			-
+	Git
+		Code standard -> LOEK update
+			Show updates
+ 	Environments
+		-
+	Research (POC)
+		-
+	Design
+		-
+	Product
+		see miro for tickets.
+	Test
+		[closed] unit tests? will add per system/manager when needed
+	Question Bob
+		-
+	Overig
+		[closed] Timers voor systems (profiler van systems)
+
+
diff --git a/time.txt b/time.txt
index 69fed00..c3c3554 100644
--- a/time.txt
+++ b/time.txt
@@ -131,6 +131,28 @@ 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)
 
 max: 2024-09-02 1h project kickoff
 max: 2024-09-02 45m first project meeting
@@ -298,8 +320,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
@@ -370,6 +400,26 @@ 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
+niels: 2024-11-18 20m merging master with niels/rendering_color branch
+niels: 2024-11-18 15m merging master with niels/sortig_rendering and building
+niels: 2024-11-18 45m programming sorts based on order in layer and sorting in layer
+niels: 2024-11-18 15m merging master with niels/rendering branch (stopped because of a lot off compiler errors)
+niels: 2024-11-18 1h researching from world position to pixel coordinates
+niels: 2024-11-18 1h20m programming from world position to pixel coordinates
+niels: 2024-11-18 1h30m debugging world positons to pixel coordinates
+niels: 2024-11-18 1h20m implementing feedback on PR's(#31,35,28)
 
 jaro: 2024-09-02 1h project meeting :: project kickoff
 jaro: 2024-09-02 45m project meeting
@@ -453,5 +503,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