Commit Graph

297 Commits

Author SHA1 Message Date
Sveske Juice 9cd094d158 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-21 09:49:02 +02:00
Sveske Juice 30514f80fb fix audio 2024-04-21 09:48:56 +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
kimrdd 063c754417 render cells 2024-04-21 09:39:00 +02:00
BOT Alex 89673b8e9b Fixed placement again 2024-04-21 09:36:18 +02:00
OliverS e9cb1330bb Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 09:21:25 +02:00
OliverS 3655bda70c l 2024-04-21 09:21:19 +02:00
kimrdd 380028dc13 shakeinpro 2024-04-21 09:19:38 +02:00
OliverS fa377978a9 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 09:13:34 +02:00
OliverS f82daebd6b audio fix 2024-04-21 09:13:21 +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 794da4150d fix order in lyaer traj 2024-04-21 07:21:52 +02:00
Sveske Juice 3a229bdecd fix sliders order in layer 2024-04-21 07:20:59 +02:00
Sveske Juice 06192aab53 Revert "idk lol"
This reverts commit 3a89b55917.
2024-04-21 07:17:32 +02:00
Sveske Juice ad55ed8a81 fix trash 2024-04-21 07:11:46 +02:00
OliverS 3a89b55917 idk lol 2024-04-21 07:05:33 +02:00
Sveske Juice e1ccd7f8ff music intesinity 2024-04-21 06:59:36 +02:00
BOT Alex 25e41b210a Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 06:56:21 +02:00
BOT Alex 000f72bc7a Enemy drop money on dealth 2024-04-21 06:56:15 +02:00
OliverS d68f217dc6 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 06:48:59 +02:00
OliverS 617102ec1e jjj 2024-04-21 06:48:53 +02:00
BOT Alex dc1dfeee67 Spawn time is now spawn interval 2024-04-21 06:45:20 +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
kimrdd facd72e73d Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 06:20:41 +02:00
kimrdd ed469dd98d sceneTransitionsss 2024-04-21 06:20:36 +02:00
Sveske Juice 323b0ef4c4 show non affordable 2024-04-21 06:17:12 +02:00
BOT Alex 29fb5aba30 Merged start and next button to play 2024-04-21 06:16:13 +02:00
BOT Alex 258b467857 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 06:13:41 +02:00
BOT Alex cd0d00af48 Added start, autoplay, Next buttons support 2024-04-21 06:13:36 +02:00
Sveske Juice f632ee471a economy shit 2024-04-21 06:13:14 +02:00
kimrdd 318e534531 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 06:07:48 +02:00
kimrdd 071a9f73d0 scenetransitionanimation 2024-04-21 06:07:43 +02:00
BOT Alex 6a197d9da6 Imported to game scene 2024-04-21 06:06:58 +02:00
BOT Alex b7bcf44f38 Scriptable object change 2024-04-21 06:03:33 +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 8567144c9e Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-21 05:13:41 +02:00
BOT Alex 332e028fea Typo 2024-04-21 05:13:33 +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 22febf0087 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 04:54:01 +02:00
BOT Alex deeb5fc633 Functional waypoint system 2024-04-21 04:53:57 +02:00
OliverS 64bdf9d9d3 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 04:44:00 +02:00
OliverS b8df3e753e Main Menu 2024-04-21 04:43:55 +02:00
kimrdd 5b46c1d3c3 offset fix 2024-04-21 04:37:42 +02:00
Sveske Juice 676a6935f7 tower col 2024-04-21 04:14:39 +02:00
Sveske Juice a29568067f de-select 2024-04-21 04:09:41 +02:00
Sveske Juice 4a3336b4e5 tower collection 2024-04-21 04:06:13 +02:00
kimrdd 2b7b89e4f8 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 04:01:04 +02:00
kimrdd 924c43d904 camera should be kinda working 2024-04-21 04:00:56 +02:00
Sveske Juice 681882c381 build sfx 2024-04-21 03:49:10 +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 d60ab75afb Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 03:23:00 +02:00
kimrdd 630f3398fa sync 2024-04-21 03:22:56 +02:00
Sveske Juice 99bc1cac0c bullet bounce sfx 2024-04-21 03:22:20 +02:00
BOT Alex 23d2a439c4 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 03:21:27 +02:00
BOT Alex e81daa0302 tried to fix bug with silhouette 2024-04-21 03:21:23 +02:00
Sveske Juice dfd199f101 black hole sfx done 2024-04-21 03:10:37 +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
OliverS 00252e2163 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 03:04:48 +02:00
OliverS e806f1ac6e sfx 2024-04-21 03:04:40 +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
BOT Alex 1a04482283 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 02:25:24 +02:00
BOT Alex 51d699a7d6 Now exits build mode after placing 2024-04-21 02:25:19 +02:00
Sveske Juice 61fd4ae374 tesla done 2024-04-21 02:24:21 +02:00
BOT Alex 8dd3dcefab Only use placement system if is build mode 2024-04-21 02:21:51 +02:00
BOT Alex 05555ed075 Placemnet system: patch 2024-04-21 02:16:52 +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
BOT Alex 982f98324e Shop semi working 2024-04-21 02:04:08 +02:00
OliverS b3b9684d93 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense 2024-04-21 01:54:15 +02:00
OliverS aa17dc30ab sfx imprt 2024-04-21 01:54:08 +02:00
Sveske Juice 2e75428e6f delete towers 2024-04-21 01:45:54 +02:00
BOT Alex c440affdd0 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 01:43:30 +02:00
BOT Alex 7cdf72cf24 Better ui and placement soon done 2024-04-21 01:43:22 +02:00
kimrdd 98875fed2f Import audiomanager 2024-04-21 01:22:49 +02:00
kimrdd 4959ccdc8d sync 2024-04-21 01:19:36 +02:00
Sveske Juice 585688b1e2 health bar look at cam 2024-04-21 01:19:08 +02:00
OliverS 9741ce2904 music import 2024-04-21 01:17:07 +02:00
Sveske Juice d513ad1a87 health bar 2024-04-21 01:12:48 +02:00
Sveske Juice 8da3cf1739 kinda fixed draggable on opposite side still kinda scuff but idgaf 2024-04-21 00:51:48 +02:00
kimrdd db1a2b1a9d game manager added 2024-04-21 00:49:12 +02:00
BOT Alex 1a6280101f I forgor... 2024-04-21 00:43:55 +02:00
BOT Alex 11eb6e8708 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 00:42:45 +02:00
BOT Alex 5ef18aebbf Added managers prefab 2024-04-21 00:42:41 +02:00
kimrdd e54843751a gameScene stuff not done 2024-04-21 00:40:14 +02:00
BOT Alex 8b015c4d33 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-21 00:39:39 +02:00
BOT Alex 28af0a8085 grid spawner now debug respawnable 2024-04-21 00:39:24 +02:00
Sveske Juice 30e7df55e6 fix? 2024-04-21 00:38:10 +02:00
Sveske Juice 1315f5c035 mr lazer done 2024-04-21 00:14:46 +02:00
BOT Alex b13cdcd02d shop progress 2024-04-21 00:02:41 +02:00
BOT Alex 0b0d2594cd Tower collection now available 2024-04-20 23:55:50 +02:00
BOT Alex c71750a059 Grid spawner gap now x and y independendt 2024-04-20 23:35:35 +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 9ad8d6ee3e gm 2024-04-20 22:20:20 +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
BOT Alex cd259ed458 Changed gamemanager folder to manager 2024-04-20 22:07:34 +02:00
BOT Alex 8356f4ae10 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-20 22:05:08 +02:00
BOT Alex a0f3b673bb Rework of UI + gamemanager instance 2024-04-20 22:05:01 +02:00
Sveske Juice 73e2459342 projectile bounce 2024-04-20 21:55:03 +02:00
kimrdd 2ace1d04ad Camera smoothing 2024-04-20 20:55:22 +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
BOT Alex 60ca297352 Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/3DTD 2024-04-20 20:12:11 +02:00
BOT Alex c6e5e09696 Placement system done 2024-04-20 20:12:06 +02:00
Sveske Juice 3b804215bc Black hole 2024-04-20 19:38:01 +02:00
Sveske Juice ac1b5dccfa Move tower aim to projectile tower 2024-04-20 19:33:01 +02:00