Commit Graph
61 Commits
Author SHA1 Message Date
cemt1363 8214239346 git die 2026-06-06 02:45:51 +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
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
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
cemt1363 af38398c28 dash and jump almost final version 2026-06-06 01:33:59 +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
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
cemt1363 5c49f2b34b baby is coming 2026-06-06 00:49:10 +02:00
cemt1363 3a4d5de03a current correct code inshallah 2026-06-06 00:41:23 +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 74c628a9d1 l 2026-06-05 23:57:38 +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
cemt1363 651bb91014 moving droplet 2026-06-05 23:51:41 +02:00
orsolya-st 3d1c275dbf branch platformer effector 2026-06-05 23:47:25 +02:00
cemt1363 612336fe92 script into prefab game object 2026-06-05 23:43:16 +02:00
cemt1363 6a9a61bc25 messing around with the droplet 2026-06-05 23:33:17 +02:00
cemt1363 70a6485bf7 cems branch movement script 2026-06-05 23:24:30 +02:00
go38coz 379056db46 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-05 23:03:30 +02:00
go38coz 577a917504 Added Prefab folder 2026-06-05 23:03:14 +02:00
cemt1363 6ee3c89f17 Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-05 23:02:14 +02:00
cemt1363 183fc6f2d1 cems scene droplet 2026-06-05 23:02:00 +02:00
go38coz 8a360da70d Created Prefabs folder 2026-06-05 23:01:20 +02:00
cemt1363 08c9dc677a Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626 2026-06-05 22:58:02 +02:00
cemt1363 96378c89b0 cems scene 2026-06-05 22:53:52 +02:00