 Sveske_Juice
|
f9498f9d2a
|
revive build fix
|
2024-02-04 17:06:35 +01:00 |
|
Sveske_Juice
|
916994f143
|
Fix revive and game over
|
2024-02-04 16:55:37 +01:00 |
|
Sveske_Juice
|
175c7ca086
|
Fix all errors
|
2024-02-04 16:32:14 +01:00 |
|
Sveske Juice
|
a798ad9ac9
|
final buidæ
|
2024-02-04 03:05:48 -08:00 |
 OliverS
|
97325abdb2
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 11:59:54 +01:00 |
|
OliverS
|
0d10e3727c
|
fix
|
2024-02-04 11:59:49 +01:00 |
SpoodyTheOne
|
d98d62d4c3
|
FUCK
|
2024-02-04 11:58:37 +01:00 |
BOT Alex
|
ff6fcee62e
|
Merge fix
|
2024-02-04 11:56:48 +01:00 |
|
OliverS
|
9236097855
|
ui
|
2024-02-04 11:53:18 +01:00 |
|
OliverS
|
4e48a5b284
|
pause
|
2024-02-04 11:52:16 +01:00 |
 kimrdd
|
bc988ab60e
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 11:49:52 +01:00 |
|
kimrdd
|
786ee0b837
|
pause thing
|
2024-02-04 11:49:51 +01:00 |
|
SpoodyTheOne
|
f320603800
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 11:48:50 +01:00 |
|
SpoodyTheOne
|
89af403895
|
Dont tick red when positive damage
|
2024-02-04 11:48:46 +01:00 |
|
Sveske Juice
|
b228433eaa
|
fix blod regen
|
2024-02-04 02:48:24 -08:00 |
|
Sveske Juice
|
e47966e8e1
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 02:47:31 -08:00 |
|
BOT Alex
|
84cf78921f
|
Build settings
|
2024-02-04 11:46:40 +01:00 |
|
SpoodyTheOne
|
e1e2fd9069
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 11:45:49 +01:00 |
|
SpoodyTheOne
|
98d3fc2436
|
Fixed mop being random
|
2024-02-04 11:45:45 +01:00 |
|
Sveske Juice
|
89028df5c2
|
w
|
2024-02-04 02:45:02 -08:00 |
|
BOT Alex
|
c829d04a19
|
Ready unity build
|
2024-02-04 11:41:27 +01:00 |
|
kimrdd
|
33e61d1a25
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 11:39:08 +01:00 |
|
kimrdd
|
8417084fe9
|
pause
|
2024-02-04 11:39:08 +01:00 |
|
OliverS
|
abb00667e0
|
controller support menu
|
2024-02-04 11:37:29 +01:00 |
|
SpoodyTheOne
|
7a33995eb3
|
Revive text!
|
2024-02-04 11:35:13 +01:00 |
|
SpoodyTheOne
|
b61de5cd28
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 11:32:15 +01:00 |
|
SpoodyTheOne
|
eb0a259b48
|
Upgrades!!
|
2024-02-04 11:32:07 +01:00 |
|
Sveske Juice
|
7550cd6c19
|
Enemy projectile shooting
|
2024-02-04 02:29:04 -08:00 |
|
BOT Alex
|
588fba9663
|
Update GameScene.unity
|
2024-02-04 11:27:47 +01:00 |
|
BOT Alex
|
357f5dff65
|
Added minimal screenshake
|
2024-02-04 11:25:54 +01:00 |
|
SpoodyTheOne
|
4806f8f79a
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 11:13:58 +01:00 |
|
SpoodyTheOne
|
1f7f4adcda
|
STUFF!
|
2024-02-04 11:13:51 +01:00 |
|
kimrdd
|
cb442a9acc
|
player mop ani
|
2024-02-04 11:09:26 +01:00 |
|
BOT Alex
|
ca80f88c55
|
Update HealthComponent.cs
|
2024-02-04 10:40:05 +01:00 |
|
BOT Alex
|
4dbe23fb69
|
Update AudioLibrary.asset
|
2024-02-04 10:33:41 +01:00 |
|
SpoodyTheOne
|
3ac2466bd4
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 10:31:56 +01:00 |
|
SpoodyTheOne
|
f4db945309
|
nig
|
2024-02-04 10:31:50 +01:00 |
|
kimrdd
|
10e5c818ab
|
pausedisablesfornow
|
2024-02-04 10:29:51 +01:00 |
|
BOT Alex
|
043c7142f7
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 10:25:02 +01:00 |
|
kimrdd
|
7612251f7e
|
pause in progress
|
2024-02-04 10:24:51 +01:00 |
|
BOT Alex
|
f54efe80be
|
Im bouta fall asleep!!!
|
2024-02-04 10:24:38 +01:00 |
|
OliverS
|
0c65f6e965
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 10:16:15 +01:00 |
|
OliverS
|
e0345b257f
|
scale ui
|
2024-02-04 10:16:11 +01:00 |
|
SpoodyTheOne
|
6b07e3b115
|
Added script for returning to main menu on game over screen
|
2024-02-04 10:12:07 +01:00 |
|
SpoodyTheOne
|
46e292ba9e
|
FUCK
|
2024-02-04 10:09:52 +01:00 |
|
SpoodyTheOne
|
d661d14bbc
|
game ove rscene
|
2024-02-04 10:08:35 +01:00 |
|
OliverS
|
1bab20ec5b
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 10:05:19 +01:00 |
|
OliverS
|
521d8a7436
|
gjgjgj
|
2024-02-04 10:05:15 +01:00 |
|
SpoodyTheOne
|
cf815d6594
|
other shit
|
2024-02-04 10:04:07 +01:00 |
|
SpoodyTheOne
|
8da3b6cf35
|
did shit
|
2024-02-04 10:04:01 +01:00 |
|
OliverS
|
adcf1b9f3e
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 10:03:34 +01:00 |
|
OliverS
|
df22e55ef5
|
TutorialScene
|
2024-02-04 10:03:28 +01:00 |
|
SpoodyTheOne
|
071bd617b6
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 09:53:07 +01:00 |
|
SpoodyTheOne
|
162ce61132
|
FUCK JER
|
2024-02-04 09:52:47 +01:00 |
|
kimrdd
|
40e6f277b0
|
animations
|
2024-02-04 09:44:58 +01:00 |
|
SpoodyTheOne
|
402df68975
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 09:29:56 +01:00 |
|
SpoodyTheOne
|
a70473e7e8
|
Bloodmanager now has seperate values for blood mopped for both players
|
2024-02-04 09:29:52 +01:00 |
|
kimrdd
|
5e86a91499
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 09:28:55 +01:00 |
|
kimrdd
|
49595cfc6e
|
facetransition
|
2024-02-04 09:28:49 +01:00 |
|
BOT Alex
|
7bdd06ab2a
|
Update PrefabTest.unity
|
2024-02-04 09:28:03 +01:00 |
|
BOT Alex
|
37a75b5c15
|
Sync
|
2024-02-04 09:27:46 +01:00 |
|
Sveske Juice
|
ff0ee1a1b6
|
L
|
2024-02-04 00:24:51 -08:00 |
|
kimrdd
|
2708deb2b9
|
fade not done
|
2024-02-04 09:19:18 +01:00 |
|
SpoodyTheOne
|
54b6c3115c
|
fuck
|
2024-02-04 09:12:58 +01:00 |
|
SpoodyTheOne
|
3cc55a9b74
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 09:12:16 +01:00 |
|
OliverS
|
b793cd8ab7
|
ui tweaks
|
2024-02-04 09:10:07 +01:00 |
|
OliverS
|
b32d4cd952
|
fuckery
|
2024-02-04 09:07:05 +01:00 |
|
Sveske Juice
|
a0c10fec3e
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 00:00:45 -08:00 |
|
Sveske Juice
|
9411d68c1f
|
swing trail
|
2024-02-04 00:00:38 -08:00 |
|
BOT Alex
|
1773acb3ef
|
Added disabling of rumble
|
2024-02-04 08:50:27 +01:00 |
|
OliverS
|
875701c68e
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 08:40:13 +01:00 |
|
OliverS
|
0a142cffbc
|
music setup
|
2024-02-04 08:40:08 +01:00 |
|
BOT Alex
|
05a8e5fd3c
|
idk tweaks
|
2024-02-04 08:36:45 +01:00 |
|
Sveske Juice
|
26958be925
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 23:35:16 -08:00 |
|
Sveske Juice
|
e10e52248d
|
fix font warning, minor adjustment
|
2024-02-03 23:35:08 -08:00 |
|
OliverS
|
6690ff0b44
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 08:28:53 +01:00 |
|
Sveske Juice
|
6903b3602a
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 23:27:56 -08:00 |
|
Sveske Juice
|
849f45cc0b
|
player damages in swing attack
|
2024-02-03 23:27:38 -08:00 |
|
BOT Alex
|
a5bb3c6864
|
Polished WaveUI
|
2024-02-04 08:23:13 +01:00 |
|
OliverS
|
ae415cc858
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 08:20:55 +01:00 |
|
BOT Alex
|
3d1f783f19
|
Added stop all Audio
|
2024-02-04 08:19:38 +01:00 |
|
OliverS
|
5367994b77
|
adui
|
2024-02-04 08:16:54 +01:00 |
|
BOT Alex
|
d75a0c74a6
|
Added audiomanager to mainmanu
|
2024-02-04 08:05:43 +01:00 |
|
BOT Alex
|
1c10e953f8
|
Tried to finish WaveUI
|
2024-02-04 08:04:26 +01:00 |
|
BOT Alex
|
2129a89a6a
|
Finished waveUI
|
2024-02-04 07:59:28 +01:00 |
|
OliverS
|
3140d6880e
|
timer
|
2024-02-04 07:54:34 +01:00 |
|
OliverS
|
7233b1054e
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 07:49:49 +01:00 |
|
BOT Alex
|
2fc1c61e27
|
Started WAveUI
|
2024-02-04 07:49:39 +01:00 |
|
OliverS
|
911ea891df
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 07:39:59 +01:00 |
|
BOT Alex
|
62295cb0cf
|
Applied all overrides
|
2024-02-04 07:35:52 +01:00 |
|
BOT Alex
|
1f16c9a113
|
Changed ui to prefab
|
2024-02-04 07:33:39 +01:00 |
|
BOT Alex
|
793733b81a
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 07:16:14 +01:00 |
|
BOT Alex
|
d6ee4f477a
|
A nice amount of difficulty increase
|
2024-02-04 07:16:08 +01:00 |
|
Sveske Juice
|
85af588eac
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 22:15:29 -08:00 |
|
Sveske Juice
|
b07650b7f0
|
more damage when swinging
|
2024-02-03 22:15:21 -08:00 |
|
BOT Alex
|
4c1ad8e585
|
Removed old debug.log
|
2024-02-04 06:57:12 +01:00 |
|
BOT Alex
|
678eb955c7
|
Scaling back some rubmling
|
2024-02-04 06:53:35 +01:00 |
|
BOT Alex
|
71c1471a4e
|
Now ignoring this error
|
2024-02-04 06:51:07 +01:00 |
|
BOT Alex
|
31aeb72f27
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 06:50:38 +01:00 |
|
BOT Alex
|
ca210eed69
|
Added more rumbling!!!
|
2024-02-04 06:50:33 +01:00 |
|
Sveske Juice
|
434c2e84cf
|
rm dbg
|
2024-02-03 21:37:43 -08:00 |
|
Sveske Juice
|
629fe00866
|
rope pull
|
2024-02-03 21:36:04 -08:00 |
|
Sveske Juice
|
6dcf165a94
|
pull animation
|
2024-02-03 21:27:28 -08:00 |
|
BOT Alex
|
c97c58c400
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 06:13:24 +01:00 |
|
BOT Alex
|
74adab7b52
|
Added vibration manager
|
2024-02-04 06:12:13 +01:00 |
|
Sveske Juice
|
dd827bee2f
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 20:50:16 -08:00 |
|
Sveske Juice
|
d2830b8e59
|
rope pull animation
|
2024-02-03 20:40:23 -08:00 |
|
kimrdd
|
4706818ca4
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 05:05:59 +01:00 |
|
kimrdd
|
e269c0920a
|
try runble
|
2024-02-04 05:05:52 +01:00 |
|
BOT Alex
|
145fe769fb
|
Update PlayerMovement.cs
|
2024-02-04 04:56:53 +01:00 |
|
BOT Alex
|
f927a71fab
|
Sync
|
2024-02-04 04:56:01 +01:00 |
|
kimrdd
|
dce16ef235
|
music stuff
|
2024-02-04 04:48:33 +01:00 |
|
kimrdd
|
205b507cb4
|
Enemy animations and health amount tweak done
|
2024-02-04 04:16:09 +01:00 |
|
kimrdd
|
f23fd47b18
|
enemy animations almost done
|
2024-02-04 04:04:25 +01:00 |
|
kimrdd
|
34238a6630
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 04:04:08 +01:00 |
|
BOT Alex
|
dfe3685e06
|
Rope sound done. Good enough
|
2024-02-04 04:03:19 +01:00 |
|
SpoodyTheOne
|
3576b9c942
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 03:25:19 +01:00 |
|
SpoodyTheOne
|
a33af23270
|
Playro dmange and gmage mananger
|
2024-02-04 03:25:01 +01:00 |
|
OliverS
|
92218e2f68
|
splash screen
|
2024-02-04 03:14:55 +01:00 |
|
kimrdd
|
157e603674
|
enemy RB
|
2024-02-04 03:08:42 +01:00 |
|
kimrdd
|
10e8167b12
|
enemy animations fixes
|
2024-02-04 03:07:44 +01:00 |
|
SpoodyTheOne
|
952abb457a
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 02:58:37 +01:00 |
|
SpoodyTheOne
|
5504771236
|
Bluh
|
2024-02-04 02:58:23 +01:00 |
|
kimrdd
|
6b1299d394
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:58:18 +01:00 |
|
Sveske Juice
|
dbef2ea752
|
fix err
|
2024-02-03 17:57:37 -08:00 |
|
kimrdd
|
2d12abe695
|
Enemy Animation fixes
|
2024-02-04 02:57:34 +01:00 |
|
Sveske Juice
|
b6be35168e
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 17:56:16 -08:00 |
|
Sveske Juice
|
52cdc284ba
|
l
|
2024-02-03 17:56:12 -08:00 |
|
kimrdd
|
000d1e6b0e
|
enemy hp customization
|
2024-02-04 02:53:32 +01:00 |
|
OliverS
|
b1f6b2fc04
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:52:13 +01:00 |
|
OliverS
|
e779649fb5
|
pillar import
|
2024-02-04 02:52:05 +01:00 |
|
SpoodyTheOne
|
6f510ebeaa
|
Merge remote-tracking branch 'origin/main'
|
2024-02-04 02:49:38 +01:00 |
|
kimrdd
|
62e8769965
|
error fix
|
2024-02-04 02:48:52 +01:00 |
|
SpoodyTheOne
|
6517c26fc3
|
Added upgrade descriptions to upgrader
|
2024-02-04 02:45:51 +01:00 |
|
BOT Alex
|
b1e67478f6
|
Converted some ojbects to prefabs
|
2024-02-04 02:40:16 +01:00 |
|
OliverS
|
728ca8f99e
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:38:49 +01:00 |
|
OliverS
|
bbde7bde04
|
ui setup
|
2024-02-04 02:38:42 +01:00 |
|
kimrdd
|
4e4c4eff5d
|
Animation tweaks and enemy tag
|
2024-02-04 02:36:52 +01:00 |
|
kimrdd
|
e0e2e1c6d7
|
Animation tweaks and enemy tag
|
2024-02-04 02:34:23 +01:00 |
|
Sveske Juice
|
e6ba08e34a
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 17:26:19 -08:00 |
|
Sveske Juice
|
5dc812c55f
|
Fixed blood and also made blood better
|
2024-02-03 17:26:11 -08:00 |
|
BOT Alex
|
adfadafb50
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:21:03 +01:00 |
|
BOT Alex
|
6e3aee1811
|
Update FootStepSounder.cs
|
2024-02-04 02:20:57 +01:00 |
|
OliverS
|
b80c9d960f
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:20:31 +01:00 |
|
OliverS
|
8277314729
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:20:09 +01:00 |
|
BOT Alex
|
32459bec81
|
Added footsteps
|
2024-02-04 02:20:08 +01:00 |
|
OliverS
|
af81f33e6b
|
post processing
|
2024-02-04 02:19:46 +01:00 |
|
Sveske Juice
|
8f7d31d742
|
Merge remote-tracking branch 'origin/main'
|
2024-02-03 17:11:46 -08:00 |
|
Sveske Juice
|
fdd5a5d3a3
|
damage text white orange red
|
2024-02-03 17:11:43 -08:00 |
|
kimrdd
|
6eb226b015
|
Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
|
2024-02-04 02:02:59 +01:00 |