Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 082a94c665 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 cemt1363 2026-06-06 13:26:11 +02:00
• af293c1a62 tree sprite added and trying to debug the tree cloning cemt1363 2026-06-06 13:26:01 +02:00
• 8f828515fe fall damage orsolya-st 2026-06-06 13:24:03 +02:00
• 121dfba58b Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 cemt1363 2026-06-06 12:21:21 +02:00
• cbfc6e580b added tree fab cemt1363 2026-06-06 12:21:16 +02:00
• 45d13daf3c Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 12:20:31 +02:00
• 27bcb427ab movements Malak 2026-06-06 12:20:29 +02:00
• 2ddda61f49 backup orsolya-st 2026-06-06 12:20:01 +02:00
• c11efa5f08 camera fix orsolya-st 2026-06-06 11:50:20 +02:00
• a5c8e8288b Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 orsolya-st 2026-06-06 11:46:47 +02:00
• 8693052109 physics update orsolya-st 2026-06-06 11:46:39 +02:00
• ea0e4e6269 fixed left dash Malak 2026-06-06 11:38:07 +02:00
• 5d3a048eea Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 11:29:55 +02:00
• 97ea58021b dashing sprites Malak 2026-06-06 11:29:47 +02:00
• 0d795046c4 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 orsolya-st 2026-06-06 11:22:57 +02:00
• 323fbe9453 camera orsolya-st 2026-06-06 11:22:50 +02:00
• 12e4704fc5 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 11:15:33 +02:00
• 4feb89d616 tree base Malak 2026-06-06 11:15:30 +02:00
• da89a40539 Merge pull request #15 from orsolya-st/temp-branch orsolya-standGitHub 2026-06-06 11:02:59 +02:00
• c62acdf968 bug fix orsolya-st 2026-06-06 11:01:04 +02:00
• 5d1f7794dc animation (i messed up smth) orsolya-st 2026-06-06 10:53:59 +02:00
• 951b815f5c bottom border --> destroy object orsolya-st 2026-06-06 10:30:04 +02:00
• 533589597a fixed left movement Malak 2026-06-06 10:18:46 +02:00
• 8dcfe5f171 fixed move right animation Malak 2026-06-06 10:16:58 +02:00
• 8de62e2d42 animation orsolya-st 2026-06-06 10:02:11 +02:00
• d2f404f87e animation put on droplet orsolya-st 2026-06-06 09:53:42 +02:00
• 4b98bd81f3 sprites update orsolya-st 2026-06-06 09:30:11 +02:00
• e5f6435e15 Update idle sprites fixed.png Malak 2026-06-06 09:29:41 +02:00
• 834a86329c Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 02:55:32 +02:00
• 4febb95dc8 Create idle sprites fixed.png Malak 2026-06-06 02:55:29 +02:00
• 7c134446b8 Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-06 02:54:38 +02:00
• cc7876ff8a Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 orsolya-st 2026-06-06 02:50:50 +02:00
• f727ac4f31 drop-jump error fix orsolya-st 2026-06-06 02:50:43 +02:00
• e01ad94de8 last version for day" cemt1363 2026-06-06 02:50:36 +02:00
• 6f76a4c04f try to fix go38coz 2026-06-06 02:48:23 +02:00
• bdfc3eec0b Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-06 02:47:22 +02:00
• 2b6a1ebdf3 try to fix go38coz 2026-06-06 02:47:20 +02:00
• 2104957e34 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 cemt1363 2026-06-06 02:46:25 +02:00
• 690ac9e8f9 dropdown error fix orsolya-st 2026-06-06 02:46:15 +02:00
• c45b3dce08 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 cemt1363 2026-06-06 02:46:14 +02:00
• 8214239346 git die cemt1363 2026-06-06 02:45:51 +02:00
• 5a421e07d5 try to fix go38coz 2026-06-06 02:45:47 +02:00
• d86c98d517 try to fix go38coz 2026-06-06 02:44:48 +02:00
• baa3e6b911 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 orsolya-st 2026-06-06 02:43:23 +02:00
• b3594dcad4 dropwdown orsolya-st 2026-06-06 02:43:16 +02:00
• 01a64a6303 Merge pull request #14 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 02:43:10 +02:00
• 7e5de3b55b Merge branch 'main' into cems-awesome-branch cemt1363andGitHub 2026-06-06 02:43:02 +02:00
• e426ab37f5 aa cemt1363 2026-06-06 02:40:47 +02:00
• 4e1fa36c79 dropdown orsolya-st 2026-06-06 02:38:40 +02:00
• e28c4e3a3e Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 02:19:43 +02:00
• 9bc5944ab3 moving sprites Malak 2026-06-06 02:19:41 +02:00
• eaf6f9b5ee Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 go38coz 2026-06-06 02:13:18 +02:00
• 5af9f6d194 Added effector to prefab; Renamed Branches to Branch go38coz 2026-06-06 02:12:40 +02:00
• 9439f205ca Added effector to prefab; Renamed Branches to Branch go38coz 2026-06-06 02:11:40 +02:00
• e40669b234 dropwdown orsolya-st 2026-06-06 02:10:19 +02:00
• 6dd331b550 Merge pull request #13 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 02:09:54 +02:00
• e04fd16171 added images folder cemt1363 2026-06-06 02:09:36 +02:00
• 88879c59dd Added effector to prefab; Renamed Branches to Branch go38coz 2026-06-06 02:08:59 +02:00
• fa62b74f72 Merge remote-tracking branch 'origin/main' go38coz 2026-06-06 01:44:22 +02:00
• eadadff4ac disabled rotation go38coz 2026-06-06 01:40:37 +02:00
• e900d778f4 Merge pull request #12 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 01:39:12 +02:00
• adcfb655b1 dash correction cemt1363 2026-06-06 01:38:56 +02:00
• 455c674477 Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-06 01:35:39 +02:00
• ed6f12fd34 Merge pull request #11 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 01:34:18 +02:00
• af38398c28 dash and jump almost final version cemt1363 2026-06-06 01:33:59 +02:00
• f870d6e4be Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-06 01:10:23 +02:00
• d24920faa2 Merge remote-tracking branch 'origin/cems-awesome-branch' into damage-handling go38coz 2026-06-06 01:10:08 +02:00
• 4557e3bfd8 test go38coz 2026-06-06 01:10:06 +02:00
• a45c556574 Merge pull request #10 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 01:09:56 +02:00
• 342489922e codes combined (dash and jump) cemt1363 2026-06-06 01:09:39 +02:00
• 5341fa2dad added .idea to .gitignore go38coz 2026-06-06 01:04:35 +02:00
• e9977b5a80 kms cemt1363andgo38coz 2026-06-06 00:41:23 +02:00
• 4ea659a9ec script editing first push helper variables (player) orsolya-standgo38coz 2026-06-06 00:14:04 +02:00
• 232ff501f6 jump merge conflict idk cemt1363andgo38coz 2026-06-06 00:36:37 +02:00
• 5c57f4b318 trying to figure out how to jump cemt1363andgo38coz 2026-06-06 00:32:10 +02:00
• 6b51bf3c6e my bad Malak 2026-06-06 00:55:29 +02:00
• 1757aecf68 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 Malak 2026-06-06 00:54:52 +02:00
• 30b25348d2 Create idle sprites.PNG Malak 2026-06-06 00:54:50 +02:00
• 19a4f2d991 Merge pull request #9 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 00:49:28 +02:00
• 5c49f2b34b baby is coming cemt1363 2026-06-06 00:49:10 +02:00
• c7a275e521 Merge pull request #8 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-06 00:41:46 +02:00
• 3a4d5de03a current correct code inshallah cemt1363 2026-06-06 00:41:23 +02:00
• d74bc21e87 Merge pull request #5 from orsolya-st/cems-awesome-branch orsolya-standGitHub 2026-06-06 00:37:32 +02:00
• 24f9401105 Merge branch 'main' into cems-awesome-branch orsolya-standGitHub 2026-06-06 00:37:22 +02:00
• 1c6c3bd110 jump merge conflict idk cemt1363 2026-06-06 00:36:37 +02:00
• 46c7885cab trying to figure out how to jump cemt1363 2026-06-06 00:32:10 +02:00
• 09f49bd7e8 Merge remote-tracking branch 'origin/cems-awesome-branch' into damage-handling go38coz 2026-06-06 00:27:28 +02:00
• 37c4c7f258 DamageHandling script go38coz 2026-06-06 00:22:13 +02:00
• 852020cc72 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 orsolya-st 2026-06-06 00:14:11 +02:00
• 08e29b2e70 script editing first push helper variables (player) orsolya-st 2026-06-06 00:14:04 +02:00
• ededa45b72 Merge branch 'main' into cems-awesome-branch cemt1363 2026-06-06 00:11:26 +02:00
• 0c96678640 idk what i changed cemt1363 2026-06-06 00:09:48 +02:00
• a909a58def adjusted gravity go38coz 2026-06-06 00:09:10 +02:00
• 1f37480ce2 Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-06 00:08:57 +02:00
• 74c628a9d1 l go38coz 2026-06-05 23:57:38 +02:00
• e25a720fba picture folder orsolya-st 2026-06-05 23:56:47 +02:00
• f3244b39a5 Merge pull request #4 cems branch orsolya-standGitHub 2026-06-05 23:54:56 +02:00
• 5899c500ba Merge remote-tracking branch 'origin/main' into damage-handling go38coz 2026-06-05 23:53:30 +02:00
• 6fe7239b9c Merge pull request #3 from orsolya-st/cems-awesome-branch cemt1363andGitHub 2026-06-05 23:53:03 +02:00
• d919291693 Create background draft.jpeg Malak 2026-06-05 23:52:15 +02:00