|
|
626455e870
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:51:44 +01:00 |
|
Ententerminator
|
07d6ae0743
|
merge
|
2020-02-01 16:44:37 +01:00 |
|
Ententerminator
|
83463e1a71
|
imports, mathias schuld
|
2020-02-01 16:44:12 +01:00 |
|
mathias
|
c803198bfc
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:31:55 +01:00 |
|
mathias
|
5b84587572
|
Can now rotate the limbs
|
2020-02-01 16:29:58 +01:00 |
|
Ententerminator
|
c6f6fbfac8
|
automerge, fucking git
|
2020-02-01 16:26:32 +01:00 |
|
Ententerminator
|
ffae145aa6
|
nino... weiter
|
2020-02-01 16:25:50 +01:00 |
|
|
|
73ad67b865
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:15:40 +01:00 |
|
|
|
f608c44c02
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:15:37 +01:00 |
|
|
|
0fbfd19bdc
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 15:12:30 +00:00 |
|
|
|
6db23d9368
|
verschiebungen alter blender dateien
|
2020-02-01 15:12:21 +00:00 |
|
|
|
3ec9bac0da
|
Fix a thing with impulse offset + new camera
|
2020-02-01 16:07:19 +01:00 |
|
mathias
|
dce77ae12d
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:02:13 +01:00 |
|
mathias
|
a85cccd56e
|
Fixed error in testint.tscn
|
2020-02-01 16:01:59 +01:00 |
|
buchibob
|
c0353d5e1c
|
modeling hände
|
2020-02-01 15:59:56 +01:00 |
|
buchibob
|
c807801444
|
uv unwrapedd
|
2020-02-01 15:54:41 +01:00 |
|
Ententerminator
|
9073fa0155
|
automerge
|
2020-02-01 15:48:32 +01:00 |
|
Ententerminator
|
03d2923921
|
delete button and stuff
|
2020-02-01 15:47:56 +01:00 |
|
Leon Palluch
|
d9e4f24906
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 15:42:01 +01:00 |
|
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 |
|
