aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-22 17:29:11 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-22 17:29:11 +0100
commit2e18a046fe2a063f60c5007cd3d71ca9d672b679 (patch)
tree19b7a53eb82355190a54f28be9655eeb410a4936
parent05a392a6e6b0fd5f5a457abf7563d74099f51c6f (diff)
parentc4862b3d51677b00dc9f6cfbcc14b2072f609ae1 (diff)
Merge remote-tracking branch 'origin/jaro/time-update'HEADmaster
-rw-r--r--time.txt22
1 files changed, 20 insertions, 2 deletions
diff --git a/time.txt b/time.txt
index ebf4460..b4f81fd 100644
--- a/time.txt
+++ b/time.txt
@@ -434,7 +434,7 @@ 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 1h30m meeting
+niels: 2024-11-18 1h30m meeting
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
@@ -450,7 +450,7 @@ niels: 2024-11-19 2h30m project meeting
niels: 2024-11-20 2h implementing feedback on PR niels/RenderingParticle
niels: 2024-11-20 15m implementing feedback on PR niels/color
niels: 2024-11-20 2h implementing feedback on PR niels/sortig_rendering
-niels: 2024-11-20 2h call with jaro about PR's
+niels: 2024-11-20 2h call with jaro about PR's
niels: 2024-11-20 45m researching more about 2d camera
niels: 2024-11-21 1h merging master (problems with git submodule whereami)
niels: 2024-11-21 1h researching more about 2d camera
@@ -552,5 +552,23 @@ 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.
+jaro: 2024-11-17 20m weekly update
+jaro: 2024-11-17 25m feedback scene wouter
+jaro: 2024-11-18 1h30m project meeting
+jaro: 2024-11-18 30m preparing presentation
+jaro: 2024-11-19 1h30m project lesson
+jaro: 2024-11-19 1h20m project meeting
+jaro: 2024-11-19 2h45m collision system struct info and doxygen comments
+jaro: 2024-11-20 30m merge master collision
+jaro: 2024-11-20 20m script system integration collision system unit test
+jaro: 2024-11-20 30m SceneManager fix for test game
+jaro: 2024-11-20 45m unit test collision
+jaro: 2024-11-20 45m review particle rendering
+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
# vim:ft=cfg