 go38coz
|
a3651923df
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-07 11:41:58 +02:00 |
|
|
go38coz
|
2809689fa1
|
Tree alignment 5 levels
|
2026-06-07 11:41:34 +02:00 |
|
|
go38coz
|
d9f673fb9f
|
Tree alignment
|
2026-06-07 11:40:03 +02:00 |
|
|
go38coz
|
55eb6ec5ca
|
Set timer to 1:30; Everything works
|
2026-06-07 10:08:26 +02:00 |
|
|
go38coz
|
63c8ac4ec0
|
Made winning reset tree counter; Dry leaf duration 2 -> 1
|
2026-06-07 07:54:04 +02:00 |
|
|
go38coz
|
51ffe15c95
|
Fixed dry leaves
|
2026-06-07 04:23:32 +02:00 |
|
|
go38coz
|
82557f5d00
|
deleted duplicates
|
2026-06-07 04:12:26 +02:00 |
|
|
go38coz
|
80d2de9b2b
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-07 04:05:34 +02:00 |
|
|
go38coz
|
eca53d3889
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-07 04:02:49 +02:00 |
|
|
go38coz
|
c8feef78e0
|
merged changes to end
|
2026-06-07 04:02:07 +02:00 |
|
|
go38coz
|
96a193ae14
|
Merge branch 'TreeEnd'
|
2026-06-07 03:58:09 +02:00 |
|
|
go38coz
|
a7d8dbb6f1
|
tree end final
|
2026-06-07 03:51:43 +02:00 |
|
|
go38coz
|
60891d503a
|
TreeEnd - kinda working
|
2026-06-07 02:08:44 +02:00 |
|
|
go38coz
|
4e8abbff3c
|
Made EndTree
|
2026-06-07 01:26:00 +02:00 |
|
|
go38coz
|
95e381c2c7
|
Removed Tree Decorator Script
|
2026-06-07 00:35:41 +02:00 |
|
|
go38coz
|
dfc13437cf
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 22:22:11 +02:00 |
|
|
go38coz
|
2a11f1498f
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 22:17:07 +02:00 |
|
|
go38coz
|
bb9d0832ab
|
Leave dissolve
|
2026-06-06 22:16:53 +02:00 |
|
|
go38coz
|
a62b769059
|
Test
|
2026-06-06 22:16:35 +02:00 |
|
|
go38coz
|
68d28bd8be
|
Made dissolving leafs
|
2026-06-06 22:07:17 +02:00 |
|
|
go38coz
|
cf94423d46
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 20:35:07 +02:00 |
|
|
go38coz
|
1614c41cfe
|
added Platform to all platforms
|
2026-06-06 20:34:54 +02:00 |
|
|
go38coz
|
42cf65f331
|
fallingAnimationThreshold introtuced; moved activation to damageHandler
|
2026-06-06 20:04:15 +02:00 |
|
|
go38coz
|
c3a795090d
|
updated fallingThreshold
|
2026-06-06 19:48:59 +02:00 |
|
|
go38coz
|
805e3f223d
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 19:45:07 +02:00 |
|
|
go38coz
|
ccd3a3b636
|
dhjshd
|
2026-06-06 19:44:55 +02:00 |
|
|
go38coz
|
aff4b38d64
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 19:38:59 +02:00 |
|
|
go38coz
|
23648a0474
|
fixed Falling animation threshold
|
2026-06-06 19:38:41 +02:00 |
|
|
go38coz
|
70a9923db2
|
Minidroplets fixed
|
2026-06-06 18:28:47 +02:00 |
|
|
go38coz
|
b868459d86
|
Fixed minidroplet
|
2026-06-06 18:22:06 +02:00 |
|
|
go38coz
|
f896d85549
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 17:42:06 +02:00 |
|
|
go38coz
|
47d1816f7e
|
scene
|
2026-06-06 17:41:40 +02:00 |
|
|
go38coz
|
afbb289591
|
Merge branch 'damage-handling'
|
2026-06-06 16:47:15 +02:00 |
|
|
go38coz
|
d2cd3240d6
|
Added maximum falling time
|
2026-06-06 16:46:57 +02:00 |
|
|
go38coz
|
ac78a6fbf8
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 16:10:01 +02:00 |
|
|
go38coz
|
674d5bf28b
|
deleted old code
|
2026-06-06 16:09:49 +02:00 |
|
|
go38coz
|
7110fba09f
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-06 16:06:38 +02:00 |
|
|
go38coz
|
bfd0ce923c
|
fixed velocity handling for bounciness
|
2026-06-06 16:05:21 +02:00 |
|
|
go38coz
|
f944111a52
|
put branches in front
|
2026-06-06 15:50:01 +02:00 |
|
|
go38coz
|
418a73236e
|
put branches in front
|
2026-06-06 15:48:13 +02:00 |
|
|
go38coz
|
92f38b9da3
|
Adjusted minSize
|
2026-06-06 15:46:58 +02:00 |
|
|
go38coz
|
c678d930c5
|
Default values for DamageHandler
|
2026-06-06 15:39:39 +02:00 |
|
|
go38coz
|
4c5230027e
|
Stop horizontal velocity whe dropping down
|
2026-06-06 15:37:54 +02:00 |
|
|
go38coz
|
899d7d7f01
|
Merge branch 'damage-handling'
|
2026-06-06 15:31:32 +02:00 |
|
|
go38coz
|
7686716961
|
Implemented fall damage and dying
|
2026-06-06 15:30:39 +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 |
|
|
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 |
|
|
go38coz
|
7c134446b8
|
Merge remote-tracking branch 'origin/main' into damage-handling
|
2026-06-06 02:54:38 +02:00 |
|
|
go38coz
|
6f76a4c04f
|
try to fix
|
2026-06-06 02:48:23 +02:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
go38coz
|
455c674477
|
Merge remote-tracking branch 'origin/main' into damage-handling
|
2026-06-06 01:35:39 +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 |
|
|
go38coz
|
5341fa2dad
|
added .idea to .gitignore
|
2026-06-06 01:04:35 +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 |
|
|
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 |
|
|
go38coz
|
5899c500ba
|
Merge remote-tracking branch 'origin/main' into damage-handling
|
2026-06-05 23:53:30 +02:00 |
|
|
go38coz
|
5701623f26
|
Merge remote-tracking branch 'origin/main' into damage-handling
|
2026-06-05 23:49:30 +02:00 |
|
|
go38coz
|
4ac3cdf94b
|
Merge remote-tracking branch 'origin/cems-awesome-branch'
|
2026-06-05 23:44:36 +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 |
|
|
go38coz
|
0cb0213b31
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-05 23:01:48 +02:00 |
|
|
go38coz
|
8a360da70d
|
Created Prefabs folder
|
2026-06-05 23:01:20 +02:00 |
|
|
go38coz
|
b0f8daae3f
|
Added NikolaScene
|
2026-06-05 22:53:28 +02:00 |
|
|
go38coz
|
a5b7883e23
|
Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
|
2026-06-05 22:46:45 +02:00 |
|
|
go38coz
|
501b35d38a
|
hjdhad
|
2026-06-05 22:45:49 +02:00 |
|
|
go38coz
|
a1405fe53f
|
Prefabs for player and platform
|
2026-06-05 22:35:36 +02:00 |
|
|
go38coz
|
ffe79cb1d3
|
Prefabs for player and platform
|
2026-06-05 22:32:18 +02:00 |
|
|
go38coz
|
ca2276f001
|
Prefabs for player and platform
|
2026-06-05 22:32:08 +02:00 |
|
|
go38coz
|
103faa065b
|
Added Player, Obstacle and Background, also Colliders on Player and Obstacle
|
2026-06-05 22:28:42 +02:00 |
|
|
go38coz
|
354d30a160
|
Added Player, Obstacle and Background, also Colliders on Player and Obstacle
|
2026-06-05 22:25:27 +02:00 |
|
|
go38coz
|
deafbf3cde
|
Added Player, Obstacle and Background, also Colliders on Player and Obstacle
|
2026-06-05 22:20:18 +02:00 |
|