265 Commits

Author SHA1 Message Date
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
buchibob
4d4be75f9f stier kopf 2020-02-02 11:35:32 +01:00
f7cc3b8ddf Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:34:29 +01:00
493b171b0f Add costs to body building 2020-02-02 11:34:16 +01:00
mathias
c0074f7141 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 11:28:29 +01:00
mathias
c3e127aa7c New gravity and impulses for the torso. 2020-02-02 11:27:37 +01:00
Leon Palluch
508b6d1fcd starting with main menu 2020-02-02 11:15:30 +01:00
Ententerminator
62b688f83d 2nd try main menu push 2020-02-02 11:03:21 +01:00
28f004b382 Fix torso start positions and rotations 2020-02-02 10:51:17 +01:00
3ce7e63135 Import files 2020-02-02 10:44:55 +01:00
7f5cdf6255 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 10:44:43 +01:00
4b39ff06cc Set keybinds of player 1 and 2
hackyyyy
2020-02-02 10:44:11 +01:00
55c65880d0 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 09:43:17 +00:00
0651896453 Pferd glb 2020-02-02 09:43:03 +00:00
98094b609d Pferdefuß angemalt und animiert 2020-02-02 09:42:20 +00:00
c470d84e2a Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 10:30:18 +01:00
mathias
ba8689916b Changed the rotations in loading screen and ingame. First implementation for rolly tolly toy. 2020-02-02 10:28:45 +01:00
ea7fbd2627 Fix body spawn locations 2020-02-02 10:21:50 +01:00
67f2e044ae Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-02 09:14:15 +00:00
4aa762f84f erster Commit sonntag nur zur überprüfung 2020-02-02 09:13:17 +00:00
Ententerminator
00ac3cb984 merge 2020-02-01 23:12:17 +01:00
Ententerminator
f5e03044ec added non working main menu 2020-02-01 23:11:05 +01:00
Leon Palluch
56f491f68e Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 23:08:52 +01:00
Leon Palluch
d2f639dc14 added player count to ui 2020-02-01 23:08:48 +01:00
b93ffa733c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 22:49:37 +01:00
14b60c1e02 Fix bug with gravity being lost after menu 2020-02-01 22:44:22 +01:00
Leon Palluch
d3eb64493c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 22:35:49 +01:00
Leon Palluch
9f5593b8d7 multiple character creations 2020-02-01 22:35:36 +01:00
1858ca6288 Move key binds for body parts to attachments 2020-02-01 22:09:31 +01:00
055fe16a46 Fix some new issues 2020-02-01 21:56:25 +01:00
719493e75b Add fabric texture for torches 2020-02-01 21:40:31 +01:00
2c91dcae29 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 21:35:09 +01:00
1c42e7b305 Body part tweaks 2020-02-01 21:34:31 +01:00
8ab2ce5a91 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 20:32:33 +00:00
160f09e211 Frosch fuss 2020-02-01 20:32:23 +00:00
buchibob
bce0f73c15 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 20:49:14 +01:00
buchibob
0a30f8420c pferd bein model 2020-02-01 20:49:04 +01:00
Leon Palluch
3e82a3d102 merge 2020-02-01 20:33:09 +01:00
Leon Palluch
eeee538703 torso not lost on scene transition 2020-02-01 20:30:27 +01:00
buchibob
606cc05ce8 normals fixed 2020-02-01 20:23:07 +01:00
23963ed6a5 frosch angemalt 2020-02-01 19:17:47 +00:00
34c3750884 gorilla textur 2020-02-01 18:56:24 +00:00
ca2d047efe Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 18:55:54 +00:00
e74be65b99 Gorilla angemalt und animiert 2020-02-01 18:55:41 +00:00
buchibob
bbe863642a Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 19:54:07 +01:00
buchibob
0789fdf8b7 frosch beine 2020-02-01 19:53:56 +01:00
4e3dd7041d Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 19:49:19 +01:00
32f149ba86 Tweaks for arm and leg 2020-02-01 19:47:09 +01:00