Commit Graph

385 Commits

Author SHA1 Message Date
8aa8c674d9 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-07 11:56:57 +02:00
4778622f46 coding conventions 2024-06-07 11:56:51 +02:00
Niels
c7fdda9cb1 removed unused activity 2024-06-06 14:09:38 +02:00
Niels
b2ead915ef added comments to Connectivity class 2024-06-06 13:59:38 +02:00
SebasKoedam
36b0d079b2 removed button 2024-06-05 18:01:15 +02:00
SebasKoedam
7f21c3c81b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 18:00:41 +02:00
SebasKoedam
9295f548db chore: Update layout of activity_end_screen.xml 2024-06-05 18:00:40 +02:00
ff61ba4645 yes 2024-06-05 18:00:36 +02:00
5537230b49 Changes 2024-06-05 17:36:01 +02:00
3b7352aa4c Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 16:57:17 +02:00
e30fe9d108 luca 2024-06-05 16:57:12 +02:00
SebasKoedam
ad7a9eddc7 ajdkajkdj 2024-06-05 16:56:41 +02:00
f53d628d3b Luca stuff 2024-06-05 16:16:10 +02:00
Luca Warmenhoven
8e57713152 Fixed more issues, added more logging 2024-06-05 15:44:55 +02:00
Luca Warmenhoven
7320e10513 Fixed more issues, added more logging 2024-06-05 15:42:15 +02:00
798ba87e4d extra logs 2024-06-05 15:36:53 +02:00
28dee7de99 small changes 2024-06-05 15:25:53 +02:00
Niels Gras
89dfee5ac9 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 15:08:20 +02:00
Niels Gras
9896bcefba added speech to helpscreen 2024-06-05 15:07:56 +02:00
SebasKoedam
819f04f59e Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 15:07:26 +02:00
SebasKoedam
e90abbfe9a removed shimmer effect due to compatebility with rest of the code 2024-06-05 15:07:25 +02:00
Luca Warmenhoven
9eadbf3ad3 Merge remote-tracking branch 'origin/main' 2024-06-05 15:07:17 +02:00
Luca Warmenhoven
3ed4db39c0 Fixed thread issues 2024-06-05 15:07:13 +02:00
Niels Gras
e63767d828 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:51:38 +02:00
Niels Gras
68e688bb0e added pepper animation using class 2024-06-05 14:50:50 +02:00
Luca Warmenhoven
612d411c3f Merge remote-tracking branch 'origin/main' 2024-06-05 14:50:09 +02:00
Luca Warmenhoven
cca91461f3 Fixed issues 2024-06-05 14:50:05 +02:00
b0fd9eb89e Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:44:16 +02:00
bbb8e3d84c disabled animation stuff 2024-06-05 14:44:13 +02:00
SebasKoedam
ab00985863 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:43:46 +02:00
SebasKoedam
711cf922b7 added a stop for the shimmer 2024-06-05 14:43:45 +02:00
81cef9ce0b Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:34:32 +02:00
Luca Warmenhoven
2b631bd600 Added error checking 2024-06-05 14:34:04 +02:00
a55e5d56cc Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:33:21 +02:00
8fde16bac1 fix run ui thread 2024-06-05 14:32:37 +02:00
Luca Warmenhoven
f4cbf50821 Added error checking 2024-06-05 14:32:06 +02:00
Luca Warmenhoven
e0bb86d0e9 Merge remote-tracking branch 'origin/main' 2024-06-05 14:23:33 +02:00
Luca Warmenhoven
3265ea308e Added error checking 2024-06-05 14:23:29 +02:00
SebasKoedam
53a6b647c3 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:22:32 +02:00
SebasKoedam
83d2db6473 added shimmer animation 2024-06-05 14:22:31 +02:00
933986947c Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:16:35 +02:00
SebasKoedam
eacadfde5d het sloopte wel :((( 2024-06-05 14:13:44 +02:00
SebasKoedam
e33313fe2b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 14:08:18 +02:00
SebasKoedam
b5d2e057c3 hoppelijk sloopt dit niks 2024-06-05 14:08:17 +02:00
Luca Warmenhoven
53e839ff4a Merge remote-tracking branch 'origin/main' 2024-06-05 14:07:00 +02:00
Luca Warmenhoven
0a2999afa1 Added faulty movement checking function 2024-06-05 14:06:57 +02:00
bb9e67a57e Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:56:33 +02:00
d0c74c4e25 comments and cleanup 2024-06-05 13:56:23 +02:00
Niels Gras
bf651cd92b Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-05 13:45:03 +02:00
Niels Gras
213af5e6fb Fixed animation placement 2024-06-05 13:45:00 +02:00