Commit Graph
130 Commits
Author SHA1 Message Date
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
cemt1363 46c7885cab trying to figure out how to jump 2026-06-06 00:32:10 +02:00
go38coz 09f49bd7e8 Merge remote-tracking branch 'origin/cems-awesome-branch' into damage-handling 2026-06-06 00:27:28 +02:00
go38coz 37c4c7f258 DamageHandling script 2026-06-06 00:22:13 +02:00
orsolya-st 852020cc72 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-06 00:14:11 +02:00
orsolya-st 08e29b2e70 script editing first push helper variables (player) 2026-06-06 00:14:04 +02:00
cemt1363 ededa45b72 Merge branch 'main' into cems-awesome-branch 2026-06-06 00:11:26 +02:00
cemt1363 0c96678640 idk what i changed 2026-06-06 00:09:48 +02:00
go38coz a909a58def adjusted gravity 2026-06-06 00:09:10 +02:00
go38coz 1f37480ce2 Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-06 00:08:57 +02:00
go38coz 74c628a9d1 l 2026-06-05 23:57:38 +02:00
orsolya-st e25a720fba picture folder 2026-06-05 23:56:47 +02:00
orsolya-standGitHub f3244b39a5 Merge pull request #4 cems branch
cams branch
2026-06-05 23:54:56 +02:00
go38coz 5899c500ba Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-05 23:53:30 +02:00
cemt1363andGitHub 6fe7239b9c Merge pull request #3 from orsolya-st/cems-awesome-branch
Cems awesome branch
2026-06-05 23:53:03 +02:00
Malak d919291693 Create background draft.jpeg
background
2026-06-05 23:52:15 +02:00
cemt1363 651bb91014 moving droplet 2026-06-05 23:51:41 +02:00
go38coz 5701623f26 Merge remote-tracking branch 'origin/main' into damage-handling 2026-06-05 23:49:30 +02:00
orsolya-standGitHub 666cf3bcdc Merge pull request #2 from orsolya-st/orsi's-branch
Orsi's branch
2026-06-05 23:48:01 +02:00
orsolya-st 3d1c275dbf branch platformer effector 2026-06-05 23:47:25 +02:00
go38coz 4ac3cdf94b Merge remote-tracking branch 'origin/cems-awesome-branch' 2026-06-05 23:44:36 +02:00
cemt1363 612336fe92 script into prefab game object 2026-06-05 23:43:16 +02:00