209 Commits

Author SHA1 Message Date
Leon Palluch
ed39efe35e added fonts and button styles to win screen 2020-02-01 15:41:32 +01:00
f984745822 New arena + new torso added 2020-02-01 15:40:30 +01:00
c06eae78c7 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 15:33:51 +01:00
def942a5be Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
# Conflicts:
#	3D Input/Bein_Mensch2.blend
#	3D Input/Bein_Mensch2.blend1
2020-02-01 14:33:02 +00:00
b55123cb35 Torso angemalt 2020-02-01 14:28:56 +00:00
Ententerminator
5509a5d488 automerge 2020-02-01 15:17:54 +01:00
Ententerminator
6127c14f82 mittagessen war gut 2020-02-01 15:17:25 +01:00
Leon Palluch
0f5d388278 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 15:09:16 +01:00
Leon Palluch
677138d145 ugly win screen completed 2020-02-01 15:09:11 +01:00
buchibob
7b1622fcac neues bein model 2020-02-01 14:09:11 +01:00
dbb43ee5f0 Add some graveyard 3D models 2020-02-01 13:52:30 +01:00
Ententerminator
de8777480b fixxed stuff again 2020-02-01 13:52:03 +01:00
Ententerminator
81f5b9d15a mittagessen kommt immer naher 2020-02-01 13:44:14 +01:00
buchibob
44a5f84f9f Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 13:29:47 +01:00
buchibob
3f849283d6 grundkörper gemoddelt 2020-02-01 13:29:37 +01:00
Leon Palluch
7d4d0254d9 win screen basics 2020-02-01 13:26:50 +01:00
8afde2fa4b Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 12:17:26 +00:00
d2b041228d Bein Mensch 2020-02-01 12:17:16 +00:00
113db3e900 Fix player health being subtracted on both bars 2020-02-01 13:05:28 +01:00
e8c7cb3e33 Players can fight each other (but bose lose health) 2020-02-01 13:00:25 +01:00
c73f181dd5 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 12:49:30 +01:00
ee733726e3 Fix impulse vector when hitting ground 2020-02-01 12:49:20 +01:00
Leon Palluch
42cdfce1a1 fixed mouse release in body builder menu 2020-02-01 12:49:08 +01:00
153d545550 Fix collision shape offset of body part 2020-02-01 12:46:35 +01:00
Ententerminator
3ef7ffd031 hoffentlich bald pizza 2020-02-01 12:45:12 +01:00
7f77782e2d pferdbein 2020-02-01 11:41:50 +00:00
3bcadd69ef Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 11:31:07 +00:00
a0c4361b94 Pferbein 2020-02-01 11:30:59 +00:00
a773e5900d Player health UI is bound to singleton 2020-02-01 12:22:18 +01:00
a060264369 Stierkopf 2020-02-01 11:14:53 +00:00
c8acaf0988 Move body parts to outer folder 2020-02-01 12:14:28 +01:00
1a0e09c1ba Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 12:11:10 +01:00
3646d1efb1 Basic structure stuff for player health 2020-02-01 12:10:36 +01:00
Leon Palluch
bfffc3962c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 12:07:55 +01:00
Leon Palluch
3235ac5a23 torso turning and ray casting 2020-02-01 12:07:46 +01:00
mathias
1aa49db766 Removed old BodyBase (Torso) 2020-02-01 12:04:40 +01:00
mathias
6b23bb8af8 Added collision-areas to the AttachmentPoints. Restructured the testing scene with new torso. 2020-02-01 12:02:39 +01:00
mathias
7e7cffab61 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 11:31:46 +01:00
mathias
db62843e0f Added BodyBase class with specific points for attachments 2020-02-01 11:31:24 +01:00
9d0bf18030 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 11:29:53 +01:00
bcfdd2c6c6 Fix arm 2020-02-01 11:29:43 +01:00
Ententerminator
e64bdba994 automerge 2020-02-01 11:28:02 +01:00
Ententerminator
3a7febe17a its better now*= decline 2020-02-01 11:27:04 +01:00
214a10d794 Fix collider issues with body parts 2020-02-01 11:16:15 +01:00
929f5ec4d3 Missing things? 2020-02-01 11:09:06 +01:00
c495b93197 New testing scene 2020-02-01 10:59:30 +01:00
5e9fcc38d2 Add basic arm with new structure 2020-02-01 10:49:43 +01:00
ee8d7b789d Add some base classes for body building 2020-02-01 10:27:48 +01:00
993a6c0ca2 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-01-31 23:46:19 +01:00
ace68cfa4d Physics proof of concept 2020-01-31 23:46:09 +01:00