298 Commits
Author SHA1 Message Date
Leon Palluch 1690239782 scene transitions 2020-02-01 18:36:42 +01:00
karl 18018c3de5 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 18:17:28 +01:00
karl 544c87a115 Maybe make human leg rotation better 2020-02-01 18:17:12 +01:00
mathias 2ededa4069 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 18:13:31 +01:00
mathias c1be55e64f Foot limbs corrected 2020-02-01 18:13:17 +01:00
karl 767335f7e4 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 18:07:27 +01:00
karl 11d78259bc Add human leg functionality 2020-02-01 18:07:20 +01:00
buchibob 4286a4ce83 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 18:06:25 +01:00
buchibob f485b1e430 gorilla hand model und uvs 2020-02-01 18:06:16 +01:00
Merlar 79bd4d348b Kopf Mensch 2020-02-01 17:00:37 +00:00
Merlar 26138d0b6c Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 16:45:35 +00:00
Merlar e52b7a7927 Hand rig 2020-02-01 16:45:27 +00:00
buchibob fb6775dded Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 17:14:56 +01:00
buchibob b17c50e250 modeling hand 2020-02-01 17:14:44 +01:00
Leon Palluch 07d2eb94ce Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 17:01:26 +01:00
Leon Palluch 4b1abe1e13 fixed unfixed fix 2020-02-01 17:01:21 +01:00
Merlar 0511733ffe Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 16:00:32 +00:00
Merlar 4b1e83210e Mensch bein anmalen und Animation 2020-02-01 16:00:22 +00:00
Leon Palluch fffc3d0355 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 16:54:58 +01:00
Leon Palluch 7c3fd134e7 mmmhh 2020-02-01 16:54:53 +01:00
karl 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
karl 73ad67b865 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 16:15:40 +01:00
karl f608c44c02 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 16:15:37 +01:00
Merlar 0fbfd19bdc Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 15:12:30 +00:00
Merlar 6db23d9368 verschiebungen alter blender dateien 2020-02-01 15:12:21 +00:00
karl 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
karl f984745822 New arena + new torso added 2020-02-01 15:40:30 +01:00
karl c06eae78c7 Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter 2020-02-01 15:33:51 +01:00
Merlar 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
Merlar 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
karl dbb43ee5f0 Add some graveyard 3D models 2020-02-01 13:52:30 +01:00