226 Commits

Author SHA1 Message Date
c4e4bdf5a7 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:36:27 +01:00
8a4009adf8 Better torque things 2020-02-02 14:36:16 +01:00
Ententerminator
26bd9c953a Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:31:28 +01:00
Ententerminator
9de159accd escape button 2020-02-02 14:30:51 +01:00
c679b5a639 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:28:05 +01:00
mathias
2d08ddc8c1 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:27:38 +01:00
mathias
50e582f6d3 Shapes 2020-02-02 14:26:35 +01:00
de72a3dfc7 Add gravestones, update ground 2020-02-02 14:22:25 +01:00
ba2d08d289 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:14:54 +00:00
a9b3c586ee huhn textur 2020-02-02 13:14:26 +00:00
Ententerminator
cba4826e2c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:03:24 +01:00
fbf472ccf7 Import files 2020-02-02 14:02:56 +01:00
Ententerminator
cec9469228 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:02:45 +01:00
2cb527fc7c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:02:34 +01:00
0afc2e5e6d Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:02:27 +01:00
Ententerminator
d6eb9d63d9 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:02:23 +01:00
buchibob
c1e6b54ff9 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:02:22 +01:00
buchibob
8c759949fe a 2020-02-02 14:02:13 +01:00
Ententerminator
55431a3311 main menu background 2020-02-02 14:01:57 +01:00
Leon Palluch
0cb0dcd974 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:01:39 +01:00
Leon Palluch
ffae483803 swapped player starting positions 2020-02-02 14:01:17 +01:00
930c79f494 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:00:08 +01:00
51e3d96722 Remove torch in arena, add head 2020-02-02 13:59:34 +01:00
dc56b6db25 Add sounds 2020-02-02 13:59:16 +01:00
buchibob
ad2c6fe7ce Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:58:43 +01:00
buchibob
1eea674b78 einiges 2020-02-02 13:58:24 +01:00
Leon Palluch
d6d2240540 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:18:31 +01:00
Leon Palluch
bf76603c08 deleted colliders now freed properly 2020-02-02 13:18:18 +01:00
buchibob
d829c90c87 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:12:36 +01:00
buchibob
5781762f89 unwrapped huhn 2020-02-02 13:12:25 +01:00
mathias
84a4d375ca Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:06:26 +01:00
mathias
71efbbdf93 Head can be included, prints out 2020-02-02 13:06:02 +01:00
c2fa4e36ba Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:05:56 +00:00
91d22f687b Kopf textur bearbeitet 2020-02-02 12:05:42 +00:00
18158fa8de Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:02:31 +01:00
1538b665e3 Fix colliders of torch and fence 2020-02-02 13:00:46 +01:00
mathias
dda48bf22f Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 13:00:10 +01:00
mathias
d278bf5552 Fixes and blue light instead of red 2020-02-02 12:59:47 +01:00
de6f912981 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:59:01 +01:00
734408c8eb Fix collider of human arm 2020-02-02 12:58:39 +01:00
buchibob
3de699cf2f Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:57:08 +01:00
buchibob
705476f432 hendl model 2020-02-02 12:56:09 +01:00
mathias
9defb29c04 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:52:18 +01:00
a5e15b9ccd Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:52:07 +00:00
534150b5a4 Mensch Kopf Animation 2020-02-02 11:51:58 +00:00
mathias
37669f141f Added a true testing scene and applied more rolly tolly :() 2020-02-02 12:51:45 +01:00
Leon Palluch
cdee834e00 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:47:14 +01:00
Leon Palluch
a24b5058b2 fixed scene change bug 2020-02-02 12:46:54 +01:00
81eee34cb9 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:46:35 +00:00
8af63730dd flügel angemalt 2020-02-02 11:46:26 +00:00