aboutsummaryrefslogtreecommitdiff
path: root/time.txt
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-18 22:59:38 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-18 22:59:38 +0100
commit7438d720f0f956f9f9c90f3b4d3181e6b6c2bb1d (patch)
tree628e324fb51fa4fc148abb5971569b823ce9cbd5 /time.txt
parent132e68bdedeeff71fb859efdc6df97a133d9d7b3 (diff)
parentef2857199e94ae9904931631b46eda2477297017 (diff)
Merge remote-tracking branch 'origin/niels/time-update'
Diffstat (limited to 'time.txt')
-rw-r--r--time.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/time.txt b/time.txt
index b05e916..d97fd4a 100644
--- a/time.txt
+++ b/time.txt
@@ -387,6 +387,14 @@ 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