Commit Graph

339 Commits

Author SHA1 Message Date
6961801a67 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-28 15:39:28 +02:00
Luca Warmenhoven
3c0e07336d Attempt to make good 2024-05-28 15:37:26 +02:00
48848de44d Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-28 15:28:21 +02:00
Luca Warmenhoven
c527289c68 Attempt to make good 2024-05-28 15:28:09 +02:00
83b233e275 dead code removal 2024-05-28 15:16:04 +02:00
Luca Warmenhoven
80ef0ac99e Pep crack cocaine 2024-05-28 15:06:54 +02:00
Luca Warmenhoven
565d19ec00 Pep crack cocaine 2024-05-28 15:04:17 +02:00
Luca Warmenhoven
62e1320b3c Pep crack cocaine 2024-05-28 15:00:48 +02:00
Luca Warmenhoven
31135d1aa7 poep 2024-05-28 14:36:48 +02:00
Luca Warmenhoven
4c9a256d6c Pep crack cocaine 2024-05-28 14:15:30 +02:00
bcfc622c90 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-28 14:08:19 +02:00
9397028c1b Added port config 2024-05-28 14:08:12 +02:00
Luca Warmenhoven
d9c05b2975 But crack 2024-05-28 14:08:12 +02:00
Luca Warmenhoven
8c1e4332aa Commit balls 2024-05-28 13:50:35 +02:00
Luca Warmenhoven
eb6ffcf4c8 Merge remote-tracking branch 'origin/main' 2024-05-28 13:47:09 +02:00
Luca Warmenhoven
976d5b1ef1 Gitter Committer Crack balls 2024-05-28 13:46:59 +02:00
Niels Gras
20906379d3 tekst to string 2024-05-28 13:04:58 +02:00
Niels Gras
1b955baf6b added help tekst 2024-05-28 13:01:42 +02:00
df8a7a6395 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-28 12:59:35 +02:00
f66f167812 Refactor package import in FitnessCycle.java 2024-05-28 12:59:31 +02:00
2be0efc37e Disabled websocket in favour of other protocol 2024-05-28 12:58:01 +02:00
Niels Gras
fcb5c7f61b Made the buttons functional and cleaned up start button in main 2024-05-28 12:44:48 +02:00
Niels Gras
c3cf6e3cf9 styled help activity 2024-05-28 12:33:01 +02:00
Luca Warmenhoven
d1e0c5b08e Crack butt 2024-05-28 12:12:34 +02:00
Luca Warmenhoven
29944bce57 Crack butt 2024-05-28 12:07:07 +02:00
Luca Warmenhoven
caa7599518 Commit war crimes in formal Yugoslavia 2024-05-28 11:53:28 +02:00
Luca Warmenhoven
b85219d013 Commit crack cocaine 2024-05-28 11:47:42 +02:00
Luca Warmenhoven
ff5d1ed31f killed my brain doing literature 2024-05-25 19:31:13 +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
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