From 1e95409dc041f29d0edecc08edd4a2eb21149182 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Sat, 26 Oct 2024 20:05:19 +0200
Subject: weekly update
---
img/facade-audio-eps-converted-to.pdf | Bin 0 -> 15315 bytes
img/facade-audio.puml | 2 +-
time.txt | 15 +++++++++++----
3 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 img/facade-audio-eps-converted-to.pdf
diff --git a/img/facade-audio-eps-converted-to.pdf b/img/facade-audio-eps-converted-to.pdf
new file mode 100644
index 0000000..476cf38
Binary files /dev/null and b/img/facade-audio-eps-converted-to.pdf differ
diff --git a/img/facade-audio.puml b/img/facade-audio.puml
index 60af60f..d3e732b 100644
--- a/img/facade-audio.puml
+++ b/img/facade-audio.puml
@@ -1,5 +1,5 @@
@startuml
-!include theme.ipuml
+!include ../img/theme.ipuml
skinparam Linetype ortho
package crepe {
diff --git a/time.txt b/time.txt
index 7fde818..235eb37 100644
--- a/time.txt
+++ b/time.txt
@@ -231,10 +231,17 @@ niels: 2024-10-09 2h adding the rendering components to api, and making the rend
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
-
-
-
-
+niels: 2024-10-21 3h design of asset manager and rendering
+niels: 2024-10-21 1h merging new master
+niels: 2024-10-22 2h adjusted rendering to new master
+niels: 2024-10-23 2h merge jaro/poc-physics branch to niels/rendering
+niels: 2024-10-23 1h finalize rendering
+niels: 2024-10-24 1h20m project meeting
+niels: 2024-10-25 2h camera programming
+niels: 2024-10-25 2h researching camera
+niels: 2024-10-26 2h merge wouter events branch to niels/rendering
+niels: 2024-10-26 1h fix my own git camera mistake
+niels: 2024-10-26 2h programming camera poc with movement and script
jaro: 2024-09-02 1h project meeting :: project kickoff
jaro: 2024-09-02 45m project meeting
--
cgit v1.2.3
From 34a57ededa7e3368ca10b05742e155fb80af17e0 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 27 Oct 2024 12:34:55 +0100
Subject: remove converted pdf file
---
img/facade-audio-eps-converted-to.pdf | Bin 15315 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 img/facade-audio-eps-converted-to.pdf
diff --git a/img/facade-audio-eps-converted-to.pdf b/img/facade-audio-eps-converted-to.pdf
deleted file mode 100644
index 476cf38..0000000
Binary files a/img/facade-audio-eps-converted-to.pdf and /dev/null differ
--
cgit v1.2.3
From 83475e6e8121756306917b9345c35091631732ce Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 27 Oct 2024 12:36:34 +0100
Subject: merge time.txt from loek/design into master
---
time.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/time.txt b/time.txt
index 235eb37..d7e00b1 100644
--- a/time.txt
+++ b/time.txt
@@ -85,6 +85,7 @@ loek: 2024-10-24 1h20m project meeting
loek: 2024-10-24 30m review :: PR review (merge only, #8 and #11)
loek: 2024-10-25 30m implementation :: scripting interface
loek: 2024-10-25 20m review :: PR review (+errands, merge only, #12 and #13)
+loek: 2024-10-26 3h20m implementation :: save manager
max: 2024-09-02 1h project kickoff
max: 2024-09-02 45m first project meeting
--
cgit v1.2.3