Commit Graph
324 Commits
Author SHA1 Message Date
Malak 884573de11 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 15:02:33 +02:00
Malak 3244419ed3 dropping animation 2026-06-06 15:02:13 +02:00
go38coz 3b445bdc64 Resolved merge conflicts 2026-06-06 15:01:32 +02:00
go38coz 18c0e2a9d6 Moved fall damage to DamageHandler 2026-06-06 14:54:57 +02:00
orsolya-standGitHub d2e0824725 Merge pull request #16 from orsolya-st/death-scene-branch
hole detah scene, scene management start
2026-06-06 14:52:49 +02:00
orsolya-st 20bf59346f hole detah scene, scene management start 2026-06-06 14:52:12 +02:00
cemt1363 d756be6847 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 14:51:51 +02:00
cemt1363 958dc343b5 infinite branches / leaves / holes 2026-06-06 14:51:42 +02:00
orsolya-st e734df15f7 hole2 update 2026-06-06 14:47:18 +02:00
cemt1363 48c5da2894 no more infinite trees 2026-06-06 14:45:55 +02:00
orsolya-st 0176099ded hole fixup now fr 2026-06-06 14:45:27 +02:00
orsolya-st 4564e89403 hole size fixup 2026-06-06 14:43:51 +02:00
cemt1363 bb4d318ff9 fıxed scenes 2026-06-06 14:34:01 +02:00
orsolya-st cc0ae01f60 Update MainScene.unity 2026-06-06 14:27:32 +02:00
orsolya-st 07d9109bde hole 2026-06-06 14:27:29 +02:00
cemt1363 1468716082 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 14:25:42 +02:00
cemt1363 7677530047 leaf rigid body 2026-06-06 14:24:46 +02:00
orsolya-st 230d5d3dc6 hole 2026-06-06 14:20:25 +02:00
cemt1363 4954b26b36 latest version 2026-06-06 14:12:21 +02:00
go38coz 9d1f04c496 Got updated Scripts from main 2026-06-06 14:10:28 +02:00
go38coz 2acd616217 Merge branch 'main' into damage-handling 2026-06-06 14:08:08 +02:00
orsolya-st 2cc7a0bfc2 hole death scene 2026-06-06 14:06:16 +02:00
orsolya-st 26107d63ca death scene start 2026-06-06 14:02:31 +02:00
cemt1363 09eea50c60 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 13:52:03 +02:00
cemt1363 5094ec04f9 NO MORE HOLE 2026-06-06 13:51:52 +02:00
orsolya-st 62e8944efc Hole mechanism 2026-06-06 13:48:14 +02:00
cemt1363 266277ec7b Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 13:42:38 +02:00
cemt1363 b669d8fa90 BACKGROUNDDD 2026-06-06 13:42:27 +02:00
orsolya-st b405907115 hole prefab 2026-06-06 13:41:49 +02:00
cemt1363 99b0071794 infinite trees!!! 2026-06-06 13:37:33 +02:00
cemt1363 508ca14197 tree prefab again 2026-06-06 13:29:46 +02:00
cemt1363 e738ba8483 tree prefab changed 2026-06-06 13:28:00 +02:00
cemt1363 082a94c665 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 13:26:11 +02:00
cemt1363 af293c1a62 tree sprite added and trying to debug the tree cloning 2026-06-06 13:26:01 +02:00
orsolya-st 8f828515fe fall damage 2026-06-06 13:24:03 +02:00
cemt1363 121dfba58b Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 12:21:21 +02:00
cemt1363 cbfc6e580b added tree fab
as well as the scripts, spawntrigger, spawnpoint and tree cloning
2026-06-06 12:21:16 +02:00
Malak 45d13daf3c Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 12:20:31 +02:00
Malak 27bcb427ab movements 2026-06-06 12:20:29 +02:00
orsolya-st 2ddda61f49 backup 2026-06-06 12:20:01 +02:00
orsolya-st c11efa5f08 camera fix 2026-06-06 11:50:20 +02:00
orsolya-st 8693052109 physics update 2026-06-06 11:46:39 +02:00
orsolya-st 323fbe9453 camera 2026-06-06 11:22:50 +02:00
orsolya-st c62acdf968 bug fix 2026-06-06 11:01:04 +02:00
orsolya-st 5d1f7794dc animation (i messed up smth) 2026-06-06 10:53:59 +02:00
orsolya-st 951b815f5c bottom border --> destroy object 2026-06-06 10:30:04 +02:00
orsolya-st 8de62e2d42 animation 2026-06-06 10:02:11 +02:00
orsolya-st d2f404f87e animation put on droplet 2026-06-06 09:53:42 +02:00
orsolya-st 4b98bd81f3 sprites update 2026-06-06 09:30:11 +02:00
go38coz 7c134446b8 Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-06 02:54:38 +02:00