Commit Graph
301 Commits
Author SHA1 Message Date
go38coz bdfc3eec0b Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-06 02:47:22 +02:00
go38coz 2b6a1ebdf3 try to fix 2026-06-06 02:47:20 +02:00
cemt1363 2104957e34 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 02:46:25 +02:00
orsolya-st 690ac9e8f9 dropdown error fix 2026-06-06 02:46:15 +02:00
cemt1363 c45b3dce08 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 02:46:14 +02:00
cemt1363 8214239346 git die 2026-06-06 02:45:51 +02:00
go38coz 5a421e07d5 try to fix 2026-06-06 02:45:47 +02:00
go38coz d86c98d517 try to fix 2026-06-06 02:44:48 +02:00
orsolya-st baa3e6b911 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 02:43:23 +02:00
orsolya-st b3594dcad4 dropwdown 2026-06-06 02:43:16 +02:00
cemt1363andGitHub 01a64a6303 Merge pull request #14 from orsolya-st/cems-awesome-branch
aa
2026-06-06 02:43:10 +02:00
cemt1363andGitHub 7e5de3b55b Merge branch 'main' into cems-awesome-branch 2026-06-06 02:43:02 +02:00
cemt1363 e426ab37f5 aa 2026-06-06 02:40:47 +02:00
orsolya-st 4e1fa36c79 dropdown 2026-06-06 02:38:40 +02:00
Malak e28c4e3a3e Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 02:19:43 +02:00
Malak 9bc5944ab3 moving sprites
left and right for u guys :P
2026-06-06 02:19:41 +02:00
go38coz eaf6f9b5ee Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 02:13:18 +02:00
go38coz 5af9f6d194 Added effector to prefab; Renamed Branches to Branch 2026-06-06 02:12:40 +02:00
go38coz 9439f205ca Added effector to prefab; Renamed Branches to Branch 2026-06-06 02:11:40 +02:00
orsolya-st e40669b234 dropwdown 2026-06-06 02:10:19 +02:00
cemt1363andGitHub 6dd331b550 Merge pull request #13 from orsolya-st/cems-awesome-branch
added images folder
2026-06-06 02:09:54 +02:00
cemt1363 e04fd16171 added images folder 2026-06-06 02:09:36 +02:00
go38coz 88879c59dd Added effector to prefab; Renamed Branches to Branch 2026-06-06 02:08:59 +02:00
go38coz fa62b74f72 Merge remote-tracking branch 'origin/main' 2026-06-06 01:44:22 +02:00
go38coz eadadff4ac disabled rotation 2026-06-06 01:40:37 +02:00
cemt1363andGitHub e900d778f4 Merge pull request #12 from orsolya-st/cems-awesome-branch
dash correction
2026-06-06 01:39:12 +02:00
cemt1363 adcfb655b1 dash correction 2026-06-06 01:38:56 +02:00
go38coz 455c674477 Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-06 01:35:39 +02:00
cemt1363andGitHub ed6f12fd34 Merge pull request #11 from orsolya-st/cems-awesome-branch
dash and jump almost final version
2026-06-06 01:34:18 +02:00
cemt1363 af38398c28 dash and jump almost final version 2026-06-06 01:33:59 +02:00
go38coz f870d6e4be Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-06 01:10:23 +02:00
go38coz d24920faa2 Merge remote-tracking branch 'origin/cems-awesome-branch' into damage-handling 2026-06-06 01:10:08 +02:00
go38coz 4557e3bfd8 test 2026-06-06 01:10:06 +02:00
cemt1363andGitHub a45c556574 Merge pull request #10 from orsolya-st/cems-awesome-branch
codes combined (dash and jump)
2026-06-06 01:09:56 +02:00
cemt1363 342489922e codes combined (dash and jump) 2026-06-06 01:09:39 +02:00
go38coz 5341fa2dad added .idea to .gitignore 2026-06-06 01:04:35 +02:00
cemt1363andgo38coz e9977b5a80 kms 2026-06-06 01:03:39 +02:00
orsolya-standgo38coz 4ea659a9ec script editing first push helper variables (player) 2026-06-06 01:03:33 +02:00
cemt1363andgo38coz 232ff501f6 jump merge conflict idk 2026-06-06 00:58:40 +02:00
cemt1363andgo38coz 5c57f4b318 trying to figure out how to jump 2026-06-06 00:58:40 +02:00
Malak 6b51bf3c6e my bad
my bad
2026-06-06 00:55:29 +02:00
Malak 1757aecf68 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 00:54:52 +02:00
Malak 30b25348d2 Create idle sprites.PNG
yayayayay
2026-06-06 00:54:50 +02:00
cemt1363andGitHub 19a4f2d991 Merge pull request #9 from orsolya-st/cems-awesome-branch
baby is coming
2026-06-06 00:49:28 +02:00
cemt1363 5c49f2b34b baby is coming 2026-06-06 00:49:10 +02:00
cemt1363andGitHub c7a275e521 Merge pull request #8 from orsolya-st/cems-awesome-branch
current correct code inshallah
2026-06-06 00:41:46 +02:00
cemt1363 3a4d5de03a current correct code inshallah 2026-06-06 00:41:23 +02:00
orsolya-standGitHub d74bc21e87 Merge pull request #5 from orsolya-st/cems-awesome-branch
Cems awesome branch
2026-06-06 00:37:32 +02:00
orsolya-standGitHub 24f9401105 Merge branch 'main' into cems-awesome-branch 2026-06-06 00:37:22 +02:00
cemt1363 1c6c3bd110 jump merge conflict idk 2026-06-06 00:36:37 +02:00