diff options
author | Max-001 <80035972+Max-001@users.noreply.github.com> | 2024-11-25 16:43:52 +0100 |
---|---|---|
committer | Max-001 <80035972+Max-001@users.noreply.github.com> | 2024-11-25 16:43:52 +0100 |
commit | bc16f9da5e22b8792f62cdb8cb8994ce51306678 (patch) | |
tree | 2553a6278d48b0f06fddba7e93aa71c780650ea0 /time.txt | |
parent | 865dcd6f6db1935843d4bc173f3871d739c965f3 (diff) | |
parent | 5a4453c2a354607ea9f4af0d41267a5f7e6a816b (diff) |
Merge remote-tracking branch 'origin/master' into max/time
Diffstat (limited to 'time.txt')
-rw-r--r-- | time.txt | 49 |
1 files changed, 49 insertions, 0 deletions
@@ -154,6 +154,13 @@ loek: 2024-11-21 40m implementation :: script (more utilities) loek: 2024-11-21 50m review :: PR review (#39, #43 and #47) loek: 2024-11-21 15m review :: PR review (merge #39 + update #47) loek: 2024-11-21 30m review :: PR review (#47, #48) +loek: 2024-11-22 1h15m project meeting +loek: 2024-11-22 20m review :: PR review (#47, #48, #49) +loek: 2024-11-22 2h30m docs :: doxygen +loek: 2024-11-22 1h docs :: presentation (validation plan) +loek: 2024-11-24 10m review :: PR review (#50, #51, #54) +loek: 2024-11-25 55m project meeting +loek: 2024-11-25 1h15m docs :: presentation (prepare testing/validation presentation) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting @@ -282,6 +289,7 @@ wouter: 2024-09-05 1h30m first group meeting wouter: 2024-09-05 20m setting up research document wouter: 2024-09-05 1h researching game enigne wouter: 2024-09-06 3h researching game enigne +wouter: 2024-09-09 14h afwezigheid wouter: 2024-09-09 2h researching SDL and SFML2 wouter: 2024-09-10 1h30m third project meeting wouter: 2024-09-10 45m project videos @@ -342,6 +350,15 @@ wouter: 2024-11-13 4h testing eventManager using example + fixing code standard wouter: 2024-11-13 3h starting with inputSystem wouter: 2024-11-14 55m project meeting wouter: 2024-11-16 3h implementing feedback and improving eventManager +wouter: 2024-11-18 1h30m twenty-first project meeting +wouter: 2024-11-18 2h working on input system +wouter: 2024-11-18 20m reviewing rendering colors (PR #35) +wouter: 2024-11-19 2h working on eventManager feedback +wouter: 2024-11-19 2h working on input system +wouter: 2024-11-19 1h eight project lesson +wouter: 2024-11-19 1h50m twenty-second project meeting +wouter: 2024-11-20 9h working on big eventManager changes +wouter: 2024-11-22 2h checking gameLoop problem and checking timing code niels: 2024-09-02 1h project meeting :: project kickoff niels: 2024-09-02 45m project meeting @@ -424,6 +441,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 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 @@ -432,6 +450,19 @@ 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) +niels: 2024-11-19 2h programming unit tests for rendering (feedback PR) +niels: 2024-11-19 1h discussing camera component with loek +niels: 2024-11-19 1h project guidance +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 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 +niels: 2024-11-22 1h40m programming decoupling the world units and pixel in rendering +niels: 2024-11-22 1h15m project meeting jaro: 2024-09-02 1h project meeting :: project kickoff jaro: 2024-09-02 45m project meeting @@ -528,5 +559,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 |