aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:35:34 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:35:34 +0100
commitb26da71a052c2caeadc45862743e0ff3f7ff0484 (patch)
tree4903b08c06ee3284874f2c58c667879c5865d9fc
parentddb8cf8a1de60230b222204bb1d30c20d27ef10f (diff)
parent4b75f73701b9580109e0723422bce0e9dbdb2d4d (diff)
Merge remote-tracking branch 'origin/niels/time-update'
-rw-r--r--time.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/time.txt b/time.txt
index 395ff17..51b9652 100644
--- a/time.txt
+++ b/time.txt
@@ -360,6 +360,18 @@ 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
jaro: 2024-09-02 1h project meeting :: project kickoff
jaro: 2024-09-02 45m project meeting