 karl
|
0fa666e9a2
|
Fix player 1 always losing
|
2020-02-02 16:37:27 +01:00 |
|
|
karl
|
91b3363de1
|
Add imker
|
2020-02-02 16:36:58 +01:00 |
|
|
karl
|
7340be715a
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:34:03 +01:00 |
|
|
karl
|
da0e5b3dc5
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:32:26 +01:00 |
|
|
karl
|
2c60c68cee
|
Arena gravestones (more) and shadow fix
|
2020-02-02 16:32:16 +01:00 |
|
|
karl
|
518376c203
|
More wing fixes
|
2020-02-02 16:27:09 +01:00 |
|
|
karl
|
0d821555a3
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:23:20 +01:00 |
|
|
karl
|
f88b07863a
|
Fix wings height and cost
|
2020-02-02 16:23:07 +01:00 |
|
|
karl
|
5ca5956b70
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:21:33 +01:00 |
|
|
karl
|
564187b979
|
Add graveyard music
|
2020-02-02 16:21:28 +01:00 |
|
|
karl
|
465ef4c3e0
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:18:05 +01:00 |
|
|
karl
|
a2db44ebab
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:16:29 +01:00 |
|
|
karl
|
fc747f6fc7
|
Wing rotation fix
|
2020-02-02 16:16:06 +01:00 |
|
|
karl
|
8ff4e6b905
|
Fix keybindings for head
|
2020-02-02 16:08:18 +01:00 |
|
|
karl
|
ba529f86a1
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:04:20 +01:00 |
|
|
karl
|
8afc31293a
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 16:04:11 +01:00 |
|
|
karl
|
aaf1c23de0
|
Add wings
|
2020-02-02 16:03:44 +01:00 |
|
|
karl
|
47ab973cd4
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 15:29:03 +01:00 |
|
|
karl
|
da63a96403
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 15:26:53 +01:00 |
|
|
karl
|
7041209110
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 15:25:27 +01:00 |
|
|
karl
|
f5738a8418
|
Fix human arm rotation
|
2020-02-02 15:17:51 +01:00 |
|
|
karl
|
d69a5c0c97
|
Fun with the body angular velocity things
|
2020-02-02 15:14:35 +01:00 |
|
|
karl
|
c4e4bdf5a7
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 14:36:27 +01:00 |
|
|
karl
|
8a4009adf8
|
Better torque things
|
2020-02-02 14:36:16 +01:00 |
|
|
karl
|
c679b5a639
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 14:28:05 +01:00 |
|
|
karl
|
de72a3dfc7
|
Add gravestones, update ground
|
2020-02-02 14:22:25 +01:00 |
|
|
karl
|
fbf472ccf7
|
Import files
|
2020-02-02 14:02:56 +01:00 |
|
|
karl
|
2cb527fc7c
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 14:02:34 +01:00 |
|
|
karl
|
0afc2e5e6d
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 14:02:27 +01:00 |
|
|
karl
|
930c79f494
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 14:00:08 +01:00 |
|
|
karl
|
51e3d96722
|
Remove torch in arena, add head
|
2020-02-02 13:59:34 +01:00 |
|
|
karl
|
dc56b6db25
|
Add sounds
|
2020-02-02 13:59:16 +01:00 |
|
|
karl
|
18158fa8de
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 13:02:31 +01:00 |
|
|
karl
|
1538b665e3
|
Fix colliders of torch and fence
|
2020-02-02 13:00:46 +01:00 |
|
|
karl
|
de6f912981
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 12:59:01 +01:00 |
|
|
karl
|
734408c8eb
|
Fix collider of human arm
|
2020-02-02 12:58:39 +01:00 |
|
|
karl
|
8e217bd1e6
|
Fix cost and damage of body parts
|
2020-02-02 12:39:15 +01:00 |
|
|
karl
|
98f1976bab
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 12:34:55 +01:00 |
|
|
karl
|
59df750bbd
|
Add Gorilla Arm and maybe fix human leg collider
|
2020-02-02 12:34:43 +01:00 |
|
|
karl
|
9cb581816f
|
Add frog legs
|
2020-02-02 12:14:27 +01:00 |
|
|
karl
|
416f492b30
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 11:58:12 +01:00 |
|
|
karl
|
cb8e61fb4b
|
Fix default environment mess
|
2020-02-02 11:57:24 +01:00 |
|
|
karl
|
c15d6b0f19
|
Add arena to body building scene
|
2020-02-02 11:47:22 +01:00 |
|
|
karl
|
f7cc3b8ddf
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 11:34:29 +01:00 |
|
|
karl
|
493b171b0f
|
Add costs to body building
|
2020-02-02 11:34:16 +01:00 |
|
|
karl
|
28f004b382
|
Fix torso start positions and rotations
|
2020-02-02 10:51:17 +01:00 |
|
|
karl
|
3ce7e63135
|
Import files
|
2020-02-02 10:44:55 +01:00 |
|
|
karl
|
7f5cdf6255
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 10:44:43 +01:00 |
|
|
karl
|
4b39ff06cc
|
Set keybinds of player 1 and 2
hackyyyy
|
2020-02-02 10:44:11 +01:00 |
|
|
karl
|
c470d84e2a
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-02 10:30:18 +01:00 |
|
|
karl
|
ea7fbd2627
|
Fix body spawn locations
|
2020-02-02 10:21:50 +01:00 |
|
|
karl
|
b93ffa733c
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 22:49:37 +01:00 |
|
|
karl
|
14b60c1e02
|
Fix bug with gravity being lost after menu
|
2020-02-01 22:44:22 +01:00 |
|
|
karl
|
1858ca6288
|
Move key binds for body parts to attachments
|
2020-02-01 22:09:31 +01:00 |
|
|
karl
|
055fe16a46
|
Fix some new issues
|
2020-02-01 21:56:25 +01:00 |
|
|
karl
|
719493e75b
|
Add fabric texture for torches
|
2020-02-01 21:40:31 +01:00 |
|
|
karl
|
2c91dcae29
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 21:35:09 +01:00 |
|
|
karl
|
1c42e7b305
|
Body part tweaks
|
2020-02-01 21:34:31 +01:00 |
|
|
karl
|
4e3dd7041d
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 19:49:19 +01:00 |
|
|
karl
|
32f149ba86
|
Tweaks for arm and leg
|
2020-02-01 19:47:09 +01:00 |
|
|
karl
|
fdcbeeecfb
|
Scale human leg according to all other new things
|
2020-02-01 19:40:11 +01:00 |
|
|
karl
|
9bf34c8cc2
|
Add human arm part (functionality not finished yet)
|
2020-02-01 19:36:41 +01:00 |
|
|
karl
|
8a82a2833f
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 19:18:30 +01:00 |
|
|
karl
|
fa4da5d8e6
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 18:49:21 +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 |
|
|
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 |
|
|
karl
|
626455e870
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 16:51:44 +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 |
|
|
karl
|
3ec9bac0da
|
Fix a thing with impulse offset + new camera
|
2020-02-01 16:07:19 +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 |
|
|
karl
|
dbb43ee5f0
|
Add some graveyard 3D models
|
2020-02-01 13:52:30 +01:00 |
|
|
karl
|
113db3e900
|
Fix player health being subtracted on both bars
|
2020-02-01 13:05:28 +01:00 |
|
|
karl
|
e8c7cb3e33
|
Players can fight each other (but bose lose health)
|
2020-02-01 13:00:25 +01:00 |
|
|
karl
|
c73f181dd5
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 12:49:30 +01:00 |
|
|
karl
|
ee733726e3
|
Fix impulse vector when hitting ground
|
2020-02-01 12:49:20 +01:00 |
|
|
karl
|
153d545550
|
Fix collision shape offset of body part
|
2020-02-01 12:46:35 +01:00 |
|
|
karl
|
a773e5900d
|
Player health UI is bound to singleton
|
2020-02-01 12:22:18 +01:00 |
|
|
karl
|
c8acaf0988
|
Move body parts to outer folder
|
2020-02-01 12:14:28 +01:00 |
|
|
karl
|
1a0e09c1ba
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 12:11:10 +01:00 |
|
|
karl
|
3646d1efb1
|
Basic structure stuff for player health
|
2020-02-01 12:10:36 +01:00 |
|
|
karl
|
9d0bf18030
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-02-01 11:29:53 +01:00 |
|
|
karl
|
bcfdd2c6c6
|
Fix arm
|
2020-02-01 11:29:43 +01:00 |
|
|
karl
|
214a10d794
|
Fix collider issues with body parts
|
2020-02-01 11:16:15 +01:00 |
|
|
karl
|
929f5ec4d3
|
Missing things?
|
2020-02-01 11:09:06 +01:00 |
|
|
karl
|
c495b93197
|
New testing scene
|
2020-02-01 10:59:30 +01:00 |
|
|
karl
|
5e9fcc38d2
|
Add basic arm with new structure
|
2020-02-01 10:49:43 +01:00 |
|
|
karl
|
ee8d7b789d
|
Add some base classes for body building
|
2020-02-01 10:27:48 +01:00 |
|
|
karl
|
993a6c0ca2
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-01-31 23:46:19 +01:00 |
|
|
karl
|
ace68cfa4d
|
Physics proof of concept
|
2020-01-31 23:46:09 +01:00 |
|
|
karl
|
3a9b2ee771
|
Some collision testing
|
2020-01-31 22:34:46 +01:00 |
|
|
karl
|
eec4a4bdce
|
Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
|
2020-01-31 21:39:29 +01:00 |
|
|
karl
|
d43cf6a276
|
Rename project
|
2020-01-31 20:46:46 +01:00 |
|
|
karl
|
49d04bdd22
|
Add empty Godot project
|
2020-01-31 20:36:55 +01:00 |
|