262 Commits

Author SHA1 Message Date
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
4adffa6638 stierkopf und flügel angemalt 2020-02-02 11:46:05 +00:00
8e217bd1e6 Fix cost and damage of body parts 2020-02-02 12:39:15 +01:00
98f1976bab Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:34:55 +01:00
59df750bbd Add Gorilla Arm and maybe fix human leg collider 2020-02-02 12:34:43 +01:00
Leon Palluch
93857b958c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 12:20:58 +01:00
Leon Palluch
2c3c321b7f fixed camera 2020-02-02 12:20:47 +01:00
9cb581816f Add frog legs 2020-02-02 12:14:27 +01:00
416f492b30 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:58:12 +01:00
cb8e61fb4b Fix default environment mess 2020-02-02 11:57:24 +01:00
e3937ab024 Stierkopf 2020-02-02 10:51:57 +00:00
Ententerminator
cbcd3ff2de Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:48:42 +01:00
c15d6b0f19 Add arena to body building scene 2020-02-02 11:47:22 +01:00
Ententerminator
33e1a0177b no attachment point highlight ingame 2020-02-02 11:47:19 +01:00
buchibob
066ca87857 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:39:47 +01:00