Merge branch 'niels/time-update' of github.com:lonkaars/crepe-docs into jaro/research

3 files changed, 12 insertions, 5 deletions

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
--- /dev/null
+++ b/img/facade-audio-eps-converted-to.pdf
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 58206e0..342cda8 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