Commit Graph

149 Commits

Author SHA1 Message Date
BOT Alex b29fc6867a Applied prefabs 2024-04-21 09:49:53 +02:00
BOT Alex 77d0c74302 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 09:48:33 +02:00
BOT Alex 6f8bcced08 First enemies spawning and moving with waypoints 2024-04-21 09:47:50 +02:00
Sveske Juice 554f9cc65a feet offset 2024-04-21 09:40:42 +02:00
BOT Alex 89673b8e9b Fixed placement again 2024-04-21 09:36:18 +02:00
BOT Alex 1267eecf05 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 08:57:25 +02:00
BOT Alex 57ad97246e I tried to work on waypoint sysytem 2024-04-21 08:57:14 +02:00
Sveske Juice 8c294ea60a rm zhens scene change in prev commit 2024-04-21 08:54:37 +02:00
Sveske Juice 06ac262719 tower explosion + sfx 2024-04-21 08:03:18 +02:00
BOT Alex b00d81ddd6 Idk, kim stupid 2024-04-21 07:59:48 +02:00
OliverS 2ee601aeb5 tool tips 2024-04-21 07:55:44 +02:00
Sveske Juice a2a3193253 player health + game over 2024-04-21 07:50:06 +02:00
Sveske Juice cd5e6f75be Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-21 07:37:07 +02:00
Sveske Juice a28ac97b38 prob. player health display 2024-04-21 07:33:18 +02:00
BOT Alex 108b2f9560 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 07:31:15 +02:00
BOT Alex a4903b7060 Added buttons 2024-04-21 07:31:09 +02:00
Sveske Juice 3a229bdecd fix sliders order in layer 2024-04-21 07:20:59 +02:00
Sveske Juice ad55ed8a81 fix trash 2024-04-21 07:11:46 +02:00
Sveske Juice e1ccd7f8ff music intesinity 2024-04-21 06:59:36 +02:00
BOT Alex 000f72bc7a Enemy drop money on dealth 2024-04-21 06:56:15 +02:00
BOT Alex d7d4e0f02c Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 06:36:48 +02:00
BOT Alex 0f3cfcc364 Extra tooltip exit collider 2024-04-21 06:36:44 +02:00
OliverS d3b77eb91f Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 06:33:24 +02:00
OliverS cec90bfcb3 particles + secne changes 2024-04-21 06:33:22 +02:00
Sveske Juice 8fe082ea95 order inlyae fix 2024-04-21 06:28:03 +02:00
Sveske Juice f632ee471a economy shit 2024-04-21 06:13:14 +02:00
BOT Alex 6a197d9da6 Imported to game scene 2024-04-21 06:06:58 +02:00
BOT Alex 14fac4f4db Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 05:59:35 +02:00
BOT Alex 704c52e460 Path and enemy spawner done 2024-04-21 05:59:29 +02:00
Sveske Juice 51146ad553 fix ui shit i will kill my self 2024-04-21 05:53:02 +02:00
OliverS c45c0544f0 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 05:20:33 +02:00
OliverS 56cd95fb90 smoke fix + laser particles 2024-04-21 05:20:23 +02:00
Sveske Juice 9320cf3dc2 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-21 05:12:06 +02:00
Sveske Juice bca62cdc01 black hole fix 2024-04-21 05:12:01 +02:00
BOT Alex deeb5fc633 Functional waypoint system 2024-04-21 04:53:57 +02:00
Sveske Juice 4a3336b4e5 tower collection 2024-04-21 04:06:13 +02:00
Sveske Juice 133bba34fb gripper fix 2024-04-21 03:44:27 +02:00
Sveske Juice 0294f74ac5 gripper sfx 2024-04-21 03:40:38 +02:00
kimrdd 596d4dd400 tower camera 2024-04-21 03:38:28 +02:00
Sveske Juice eb233df679 use correct bullets 2024-04-21 03:36:14 +02:00
kimrdd 630f3398fa sync 2024-04-21 03:22:56 +02:00
BOT Alex de408cf3d9 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 03:07:47 +02:00
BOT Alex 6243d7e225 Cancel buildmode done 2024-04-21 03:07:29 +02:00
Sveske Juice 84d7a134dc black hole sfx maybe?? 2024-04-21 03:03:15 +02:00
OliverS 3546ad3684 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 02:59:37 +02:00
OliverS 6984f86d78 plasma particles fix 2024-04-21 02:59:35 +02:00
Sveske Juice fa227bebd5 turret, lazer, tesla sfx 2024-04-21 02:56:51 +02:00
OliverS 8c5fd613db Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 02:54:55 +02:00
OliverS 479085d1df particles 2024-04-21 02:54:52 +02:00
Sveske Juice a1140a60b7 tower dmg 2024-04-21 02:47:54 +02:00
OliverS f431a52d28 plasma bullet 2024-04-21 02:40:38 +02:00
Sveske Juice 430da56a0f low health tower particles 2024-04-21 02:34:45 +02:00
Sveske Juice 61fd4ae374 tesla done 2024-04-21 02:24:21 +02:00
BOT Alex db9ecadd86 Fixed benjamin's fucked prefab 2024-04-21 02:12:07 +02:00
kimrdd 49c6a3b1fa Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 02:09:43 +02:00
kimrdd 7ca4332244 cinemachine + gameui 2024-04-21 02:09:30 +02:00
OliverS e4297c4bc5 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 02:07:37 +02:00
OliverS d89b6b601e particles 2024-04-21 02:07:30 +02:00
BOT Alex 9c8e732d3a Placements now changable 2024-04-21 02:06:29 +02:00
Sveske Juice 2e75428e6f delete towers 2024-04-21 01:45:54 +02:00
kimrdd 4959ccdc8d sync 2024-04-21 01:19:36 +02:00
Sveske Juice d513ad1a87 health bar 2024-04-21 01:12:48 +02:00
BOT Alex 5ef18aebbf Added managers prefab 2024-04-21 00:42:41 +02:00
Sveske Juice 1315f5c035 mr lazer done 2024-04-21 00:14:46 +02:00
Sveske Juice 55d2181ebd fixes + gripper done 2024-04-20 23:32:42 +02:00
BOT Alex b28bdc2e27 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-20 23:26:49 +02:00
BOT Alex 7ec0e68d55 Started on shop 2024-04-20 23:26:44 +02:00
kimrdd 2106458d16 gameScene beginning 2024-04-20 23:18:34 +02:00
Sveske Juice edd234916b outline on selected 2024-04-20 22:54:08 +02:00
Sveske Juice 0ac1402616 select unselect tower 2024-04-20 22:42:06 +02:00
Sveske Juice 5f1bf2b735 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-20 22:19:29 +02:00
Sveske Juice ac03089c25 wip 2024-04-20 22:19:23 +02:00
kimrdd 236e529d6d Outline Import
aplied to tower base too
2024-04-20 22:16:40 +02:00
Sveske Juice 73e2459342 projectile bounce 2024-04-20 21:55:03 +02:00
Sveske Juice 0db4c49568 projectile damaging + robots can die:) 2024-04-20 20:48:38 +02:00
Sveske Juice 666e6269a8 trajectory done 2024-04-20 20:33:02 +02:00
Sveske Juice ba61a4fe43 projectile trajectory 2024-04-20 20:27:06 +02:00
Sveske Juice 3b804215bc Black hole 2024-04-20 19:38:01 +02:00
BOT Alex e67416be15 Fixed transforms 2024-04-20 19:27:43 +02:00
Sveske Juice d77149c6c1 import models 2024-04-20 19:22:52 +02:00
Sveske Juice 0e717ffa28 Aiming system done 2024-04-20 18:12:49 +02:00
kimrdd 2c2036c2c9 prefab apply 2024-04-20 17:30:53 +02:00
Sveske Juice 2799c4ffa3 col fix zhen 2024-04-20 17:19:34 +02:00
kimrdd a884f97aee Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-20 16:52:45 +02:00
kimrdd 67deee74e3 camera cinemachine 2024-04-20 16:52:39 +02:00
Sveske Juice 5d0152f823 Support 360 aim 2024-04-20 16:49:40 +02:00
Sveske Juice 4e68e8bd46 temp trajectory path 2024-04-20 16:28:46 +02:00
BOT Alex c229215211 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-20 16:28:03 +02:00
BOT Alex c36dde7278 Debug turrets now placable 2024-04-20 16:27:58 +02:00
Sveske Juice 8c862f1cec Turret aiming almost working 2024-04-20 15:56:26 +02:00
Sveske Juice 481d431d94 other angle vertical aim 2024-04-20 14:23:55 +02:00
Sveske Juice 5303db9a59 Rotate turret barrel 2024-04-20 13:15:33 +02:00
Sveske Juice e7b14349d5 Prettify arcs 2024-04-20 12:14:25 +02:00
Sveske Juice 5b27866ef1 Fix arc sampling (chat gpt is stupid) + draggable sliders for turret aiming 2024-04-20 11:58:46 +02:00
BOT Alex 72aad9f46d Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-20 01:51:19 +02:00
BOT Alex abaecb4a5b Started on placement manager 2024-04-20 01:51:12 +02:00
Sveske Juice 74402a8a2a Support vertical min max linerenderer sample 2024-04-20 01:47:17 +02:00
Sveske Juice 838ac1d272 Editor Gizmos + horizontal min max linerenderer sampler 2024-04-20 01:40:53 +02:00
Sveske Juice 8e0cfa572d Base Tower Script + Base Tower prefab placeholder 2024-04-19 23:32:37 +02:00