162 Commits

Author SHA1 Message Date
FlorianU
28971fd9db Merge branch 'main' into feature/startup-scene 2025-03-19 10:37:18 +01:00
FlorianU
e2f30e63d6 fixed menu alignment and added images 2025-03-19 10:35:05 +01:00
ernestoagc
ad220d9163 removing delay on transition animation 2025-03-19 09:52:51 +01:00
FlorianU
5faf935d79 Merge branch 'main' into feature/startup-scene 2025-03-19 09:28:34 +01:00
Antonio
3ac8fe3afd
Merge pull request #39 from ernestoagc/feature/startup-scene
implemented button call to movement
2025-03-19 09:28:20 +01:00
FlorianU
1649bc20c1 implemented button call to movement 2025-03-19 09:28:00 +01:00
ernestoagc
08814d3e9b disabling wait transition on walking animation 2025-03-19 09:27:16 +01:00
ernestoagc
a8f3734183 enable and disable walking 2025-03-19 02:22:08 +01:00
FlorianU
c1c8cd1355
Merge pull request #38 from ernestoagc/feature/startup-scene
fixed build settings and people hitboxes
2025-03-19 00:59:48 +01:00
FlorianU
519ddb285c fixed build settings and people hitboxes 2025-03-19 00:59:35 +01:00
FlorianU
a5d13af954
Merge pull request #37 from ernestoagc/feature/startup-scene
fixes in menu
2025-03-19 00:44:46 +01:00
FlorianU
c537f71a19 fixes in menu 2025-03-19 00:44:31 +01:00
FlorianU
39ad3176a4
Merge pull request #36 from ernestoagc/feature/startup-scene
small fix
2025-03-19 00:35:14 +01:00
FlorianU
54cbdcb875 small fix 2025-03-19 00:34:59 +01:00
ernestoagc
00729775ea Merge branch 'main' of https://github.com/ernestoagc/su-det-2025-group-1 2025-03-19 00:34:55 +01:00
ernestoagc
c2c370f031 enable emergency button 2025-03-19 00:34:36 +01:00
FlorianU
03737561a5
Merge pull request #35 from ernestoagc/feature/startup-scene
Feature/startup scene
2025-03-19 00:28:07 +01:00
FlorianU
e9d8c5dd1a clean up, added buttons for movement to menu 2025-03-19 00:27:49 +01:00
FlorianU
4d4f4c6798 cleanup 2025-03-19 00:00:41 +01:00
FlorianU
e36dabf915
Merge pull request #34 from ernestoagc/feature/startup-scene
Feature/startup scene
2025-03-18 23:49:48 +01:00
FlorianU
77c97f2844 Merge branch 'main' into feature/startup-scene 2025-03-18 23:49:33 +01:00
FlorianU
54ccb398d6 implemented menu, fixed hands 2025-03-18 23:49:26 +01:00
FlorianU
bdec1b3bd0 implemented tutorial with opening menu per hand 2025-03-18 22:55:58 +01:00
FlorianU
4fb26486b5 implemented tutorial page 2025-03-18 21:54:58 +01:00
Evgeniia (Zhenya) Dolgikh
f17dfb2d22
Merge pull request #33 from ernestoagc/feature/ui-design-environment
light flickr fixed
2025-03-18 21:50:16 +01:00
zhenyadolgikh
6b8bb3da97 light flickr fixed 2025-03-18 21:49:50 +01:00
FlorianU
83b9dfb2b1 Merge branch 'main' into feature/startup-scene 2025-03-18 21:33:17 +01:00
FlorianU
f128dd5145 implemented hand menu 2025-03-18 21:32:34 +01:00
Evgeniia (Zhenya) Dolgikh
8074e78a7b
Merge pull request #32 from ernestoagc/feature/ui-design-environment
light and sound buttons are functional now
2025-03-18 21:28:35 +01:00
zhenyadolgikh
3477c67e7b light and sound buttons are functional now 2025-03-18 21:28:12 +01:00
Antonio
a4dafc7b90
Merge pull request #31 from ernestoagc/feature/ui-interaction
Feature/UI interaction
2025-03-18 20:38:35 +01:00
FlorianU
bab7eb544a Merge branch 'main' into feature/ui-interaction 2025-03-18 20:35:29 +01:00
FlorianU
fc8b741b5c menu working in classroom scene 2025-03-18 20:24:33 +01:00
Evgeniia (Zhenya) Dolgikh
5d4a570e13
Merge pull request #29 from ernestoagc/feature/ui-design-environment
small update for canvas with panel
2025-03-18 20:24:25 +01:00
zhenyadolgikh
ec3c7bf531 small update for canvas with panel 2025-03-18 20:24:04 +01:00
FlorianU
6c67cd2795 Merge branch 'feature/ui-interaction' of https://github.com/ernestoagc/su-det-2025-group-1 into feature/ui-interaction 2025-03-18 18:38:33 +01:00
FlorianU
7697d066b4 Merge branch 'main' into feature/ui-interaction 2025-03-18 18:38:29 +01:00
Antonio
721e206dcc
Merge pull request #27 from ernestoagc/feature/ui-interaction
Feature/UI interaction
2025-03-18 18:36:06 +01:00
Antonio
c6efd17758
Merge branch 'main' into feature/ui-interaction 2025-03-18 18:36:00 +01:00
FlorianU
42c8c4f2d5 menu 2025-03-18 18:32:50 +01:00
FlorianU
dac8ea0f50 Menu, scene buttons work 2025-03-18 18:13:43 +01:00
FlorianU
71becba9a4
Merge pull request #28 from ernestoagc/feature/startup-scene
Implemented start scene with disclaimer
2025-03-18 17:47:44 +01:00
FlorianU
1bcc9ea92a
Merge branch 'main' into feature/startup-scene 2025-03-18 17:46:19 +01:00
FlorianU
ee2caf29f5 Implemented start scene with disclaimer 2025-03-18 17:45:20 +01:00
FlorianU
f5cb402deb ray menu works 2025-03-18 17:20:07 +01:00
FlorianU
9b96475e1f build settings 2025-03-18 16:31:20 +01:00
ernestoagc
9344067f92 calling websocket when person collide to camera 2025-03-18 15:44:48 +01:00
ernestoagc
30aa4330b0 adding safety environment 2025-03-17 14:53:59 +01:00
Kizza00232Jera
34cdd6ef6a scenemanager update 2025-03-17 14:34:40 +01:00
ernestoagc
78fdbe0896 missing files move action 2025-03-17 10:21:14 +01:00