Commit Graph

370 Commits

Author SHA1 Message Date
Luca Warmenhoven
b85219d013 Commit crack cocaine 2024-05-28 11:47:42 +02:00
Luca Warmenhoven
8d5cecce27 updated gay 2024-05-25 19:34:58 +02:00
Luca Warmenhoven
ff5d1ed31f killed my brain doing literature 2024-05-25 19:31:13 +02:00
SebasKoedam
8b02096a98 chore: Update image path in sprint report 2024-05-25 11:27:05 +02:00
SebasKoedam
d69701b60d added missing image 2024-05-25 11:16:35 +02:00
Niels Gras
a62b46fcf9 added retro image 2024-05-24 14:36:43 +02:00
SebasKoedam
856f0af4b2 chore: Update image path in sprint report 2024-05-24 14:32:42 +02:00
Niels Gras
5462a6fbcc Added help activity 2024-05-24 13:41:53 +02:00
dd91639fb2 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-24 12:27:11 +02:00
02c2cff330 updated lateralraises animation 2024-05-24 12:24:58 +02:00
1fb1d5d02d Added class and intergrated it into code 2024-05-24 12:24:48 +02:00
82731ee176 added library and videoview 2024-05-24 12:24:24 +02:00
Luca Warmenhoven
04bdf656f4 Merge remote-tracking branch 'origin/main' 2024-05-24 12:20:53 +02:00
Luca Warmenhoven
38e70e3b53 Fixed more shit 2024-05-24 12:20:49 +02:00
Niels Gras
a8e7f6d8b8 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-24 12:04:45 +02:00
Niels Gras
f96d6ec394 chore: Update navigation menu with Colors research page 2024-05-24 12:04:43 +02:00
Luca Warmenhoven
f5900bf50e Merge remote-tracking branch 'origin/main' 2024-05-24 11:52:17 +02:00
Luca Warmenhoven
04054c862b Fixed some shit and removed ugly ass shit 2024-05-24 11:52:12 +02:00
3ee81d0e48 fitnesscycle class it plays the animation a given amount of reps 2024-05-24 11:29:40 +02:00
Luca Warmenhoven
cb53000eb3 Added NodeJS Server files 2024-05-24 10:53:14 +02:00
fdfb216617 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-23 19:57:26 +02:00
1a62421c90 added comment to animation class 2024-05-23 19:56:39 +02:00
SebasKoedam
25f9f098b0 improved main and fitness layout 2024-05-23 18:09:43 +02:00
SebasKoedam
9795ccb490 removed unsed files 2024-05-23 18:09:19 +02:00
SebasKoedam
8cc571bb3b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-23 15:51:34 +02:00
SebasKoedam
58f8ff0054 chore: Update activity_main.xml and misc.xml 2024-05-23 15:50:53 +02:00
b4a69ed975 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-23 15:31:45 +02:00
869164b2d6 docs about robotMovement 2024-05-23 15:31:30 +02:00
73f563249e fixed last error 2024-05-23 14:20:53 +02:00
3f6f61fb27 corrected pages 2024-05-23 14:09:01 +02:00
71871661ca Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-23 13:44:05 +02:00
062a793552 Updated pages 2024-05-23 13:43:55 +02:00
Niels
372beceeae spel fouten gefixt in persoonlijke reflectie 2024-05-22 17:20:35 +02:00
Niels
b0caed783f persoonlijke reflectie 2024-05-22 17:19:36 +02:00
9925fcd637 edited code for video 2024-05-22 15:50:43 +02:00
40cf9f37fc made video work using ffmpeg 2024-05-22 15:50:27 +02:00
Niels Gras
981b4670e3 Merge remote-tracking branch 'origin/main' 2024-05-22 15:06:37 +02:00
Niels Gras
390bd3c667 changed video format 2024-05-22 15:06:28 +02:00
6d79b0f762 kinda fix for main activity still needs better layout 2024-05-22 15:03:16 +02:00
Niels Gras
60747d07c5 Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' into 'main'
Fixed crashing errors

Closes #55

See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!11
2024-05-22 14:57:56 +02:00
Niels Gras
60fa1cec2c Fixed crashing errors 2024-05-22 14:47:01 +02:00
Niels Gras
54df52736f Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' into 'main'
Resolve "Als gebruiker wil ik oefeningen te zien krijgen met een instructie video zodat ik weet wat ik moet doen"

Closes #55

See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!9
2024-05-22 14:20:55 +02:00
Niels Gras
bc8763927b chore: Update background color in activity_fitness.xml 2024-05-22 14:20:26 +02:00
Niels Gras
5552865fd2 Merge branch '55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik 2024-05-22 14:19:37 +02:00
Niels Gras
bcf394ef29 test 2024-05-22 14:12:29 +02:00
SebasKoedam
fdd67d3e7e stipje weggehaald 2024-05-22 11:54:21 +02:00
SebasKoedam
4a904be8f0 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-22 11:45:22 +02:00
SebasKoedam
904e4e98ed reflectie blok 1,2 en 3 skill ontwikkeling 2024-05-22 11:45:21 +02:00
Luca Warmenhoven
f72879d66e Merge remote-tracking branch 'origin/main' 2024-05-22 11:48:13 +03:00
Luca Warmenhoven
7064fa3b97 Updated PersonalMotionPreviewElement and FitnessActivity to match functionality 2024-05-22 11:48:02 +03:00