248 Commits

Author SHA1 Message Date
buchibob
98b14166fd Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 16:03:07 +01:00
buchibob
d974a4d623 imker unwarpped 2020-02-02 16:02:58 +01:00
mathias
2ebc50625f Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 16:00:37 +01:00
mathias
5a3e52270e Bullhead playing animation 2020-02-02 15:59:50 +01:00
Ententerminator
42f4fcce24 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 15:59:20 +01:00
Ententerminator
8533df9b3e added bodypart costs and damage 2020-02-02 15:58:10 +01:00
50e3f8eb2d Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:57:33 +00:00
06a1a46fe2 hendl gesaved 2020-02-02 14:57:17 +00:00
mathias
01b33b3ae4 BullHead 2020-02-02 15:57:10 +01:00
buchibob
236c36e03b Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 15:32:48 +01:00
buchibob
86bc9045a3 imker 2020-02-02 15:32:40 +01:00
mathias
8fb80a3e83 Added into BodypartLoader 2020-02-02 15:28:02 +01:00
mathias
2e18e9e193 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 15:27:26 +01:00
7bd7cd11a8 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:26:39 +00:00
mathias
d3acd8c09c Horseleg inclueded 2020-02-02 15:26:02 +01:00
Leon Palluch
72835fd4ac menu button spacing 2020-02-02 15:17:36 +01:00
9c2287db4c huhn animation 2020-02-02 14:11:52 +00:00
4850815a3b Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:07:33 +00:00
102428f715 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
# Conflicts:
#	3D Input/hühnchen kopf unwrapped.blend
#	3D Input/hühnchen kopf unwrapped.blend1
2020-02-02 14:07:17 +00:00
Ententerminator
61c9a8634d Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 14:54:28 +01:00
Ententerminator
2375df837b beatiful buttons 2020-02-02 14:54:22 +01:00
e8b55e821c huhn fail 2020-02-02 13:52:51 +00:00
buchibob
43d8553b22 umbennen 2020-02-02 14:52:10 +01:00
buchibob
9ebfbd9fe9 bones 2020-02-02 14:49:40 +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