Commit Graph

371 Commits

Author SHA1 Message Date
Кичигин Алексей 8ca90d9ae5 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-26 14:35:01 +03:00
Кичигин Алексей 38dba5d6f3 static monuments 2023-10-26 14:34:27 +03:00
Алексей Козлов 0f2466c72c materials for tunnel 2023-10-26 13:05:07 +03:00
Алексей Козлов 47f09c8576 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-26 13:00:40 +03:00
Алексей Козлов 00591b948c tunnel reimport 2023-10-26 12:59:57 +03:00
r.nikolin 7f63d498b4 fix enemy dissapear +fix vibration after finish 2023-10-26 12:38:04 +03:00
r.nikolin ac39345a39 Fix interract colliders 2023-10-26 12:33:27 +03:00
r.nikolin 200a3b3f17 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-26 12:09:35 +03:00
r.nikolin 1d4c496691 Fix monument stand + added tunnel 2023-10-26 12:09:17 +03:00
Кичигин Алексей dd34a26ddb new hologram color 2023-10-26 12:03:37 +03:00
r.nikolin 1c27462761 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-26 11:18:51 +03:00
r.nikolin 4d141274ce Added zagotovka dla rasstanovok trass 2023-10-26 11:15:58 +03:00
Алексей Козлов 97d6cbbaac Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-26 11:04:32 +03:00
Алексей Козлов 2f7d591279 add monument placeholder 2023-10-26 11:04:08 +03:00
Алексей Козлов 213347d949 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-26 10:25:09 +03:00
r.nikolin 744fc6bdc9 Fix player ship sit 2023-10-26 10:24:28 +03:00
Алексей Козлов 9e03018764 del some faces in cockpit 2023-10-26 10:22:28 +03:00
r.nikolin 4db92fdf19 Fix cockpit materials 2023-10-26 10:20:25 +03:00
Кичигин Алексей 571cfe673c Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-25 19:56:28 +03:00
Кичигин Алексей caf750d2d5 fixed visual 2023-10-25 19:46:41 +03:00
Алексей Козлов 905827bbc2 change sparrow 2023-10-25 18:40:58 +03:00
Алексей Козлов d020e3fc71 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-25 18:06:50 +03:00
r.nikolin c7914a089f Added new monument podium 2023-10-25 17:56:43 +03:00
Алексей Козлов bed9162b20 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-25 17:51:15 +03:00
Алексей Козлов fd90815557 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-25 17:48:49 +03:00
Алексей Козлов cebe2f51c6 add tunel 2023-10-25 17:48:42 +03:00
r.nikolin f10627c4d0 Added Big Monument podium 2023-10-25 16:43:42 +03:00
r.nikolin 9153f9d9f5 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-25 15:23:37 +03:00
r.nikolin dbd28d4bf5 Apply changes to prefabs 2023-10-25 15:22:31 +03:00
a.gorbunov 1317e2a107 fix ci. 2023-10-25 15:09:49 +03:00
a.gorbunov 5f7a915438 Add ci. 2023-10-25 15:02:47 +03:00
r.nikolin 795933f789 little enemy fix 2023-10-25 14:49:43 +03:00
r.nikolin d22f1a6647 Addede instant enemies 2023-10-25 14:47:39 +03:00
Алексей Козлов 1a6a5937e6 sparrow materials change 2023-10-25 14:37:55 +03:00
r.nikolin 545bec00b4 Little fix DnD monuments 2023-10-25 14:37:11 +03:00
r.nikolin 7c425e9638 Added new Monument preview display text variant 2023-10-25 13:46:39 +03:00
r.nikolin ccb7c8199e Decrease slow zone collider width 2023-10-25 12:43:10 +03:00
r.nikolin eee26fe4e6 Fix Start LB Values + Random Name generator 2023-10-25 12:09:15 +03:00
Алексей Козлов 422116f282 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-25 11:57:26 +03:00
r.nikolin da4cd8991e Change SlowZone collider + Added loadmap progressbar 2023-10-25 11:36:03 +03:00
r.nikolin 457dfe9c83 little scene fix 2023-10-25 11:08:25 +03:00
Алексей Козлов 525ec72acf cockpit_add_penzenskie_uzori 2023-10-24 16:31:21 +03:00
r.nikolin 8eadf3400a fix monument_10 materail 2023-10-24 16:17:42 +03:00
Кичигин Алексей 7310cf598e Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-24 16:06:10 +03:00
r.nikolin 2ad1e33d8b Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-24 16:05:20 +03:00
Кичигин Алексей b87e1d1551 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-24 16:04:27 +03:00
Кичигин Алексей 8c529f5448 updated monument 1,3,7,9 2023-10-24 16:03:32 +03:00
r.nikolin 8c51342e72 little change 2023-10-24 15:55:12 +03:00
Алексей Козлов 3349612497 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-24 15:33:54 +03:00
Алексей Козлов adfd2d3583 block texture change 2023-10-24 15:33:33 +03:00