Commit Graph

368 Commits

Author SHA1 Message Date
r.nikolin 6e2fe651c8 fix mat 2023-10-26 15:32:00 +03:00
r.nikolin 5b1e76779b Little fix start scene 2023-10-26 15:26:22 +03:00
Кичигин Алексей f532b053e7 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-26 15:13:00 +03:00
Кичигин Алексей 3041f8274b road fix 2023-10-26 15:12:52 +03:00
Алексей Козлов a3105ef300 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-26 14:44:28 +03:00
Алексей Козлов 52a6ecdfb5 tunnel uv mapping fix 2023-10-26 14:44:03 +03:00
Кичигин Алексей 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
r.nikolin 1c25e824d9 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-24 15:26:54 +03:00
r.nikolin c095976641 Added new sounds 2023-10-24 15:26:27 +03:00
Алексей Козлов 99f5c2bfe4 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-24 15:16:04 +03:00
Алексей Козлов dfb60b937e podstavka dla monumentov 2023-10-24 15:15:28 +03:00
r.nikolin f2f7714341 Fix checkpoints 2023-10-24 14:59:14 +03:00
r.nikolin 1fa83b8db3 Some fixes 2023-10-24 14:34:33 +03:00
r.nikolin e9b72abde2 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-24 11:17:47 +03:00
r.nikolin f26b30e68b Change Monument sounds + fix dnd tmpro 2023-10-24 11:14:23 +03:00
Кичигин Алексей 6dd82c7fed fixed hologram shader 2023-10-24 10:56:02 +03:00
Кичигин Алексей a09b082353 beauty shader 2023-10-23 19:43:11 +03:00
r.nikolin 9f1524e14d Change barier textures 2023-10-23 17:37:58 +03:00
r.nikolin 07c789fdb9 Little fix DND 2023-10-23 16:46:38 +03:00
r.nikolin 71bd0a5b06 Added sounds to Monument_10 2023-10-23 16:11:56 +03:00
r.nikolin b631a649b4 Added Monument 10 2023-10-23 16:05:01 +03:00
r.nikolin 4a448d4be9 Little bug fix 2023-10-23 12:40:36 +03:00
r.nikolin 27bd4eb9a5 Fix font blurry 2023-10-23 12:27:56 +03:00
r.nikolin ba0261c699 Fix wheel + added sound trigger 2023-10-23 12:07:14 +03:00
r.nikolin 4c93163d74 Fix start data + change game music 2023-10-23 11:40:02 +03:00
r.nikolin 9ca5cfff9c Added Monument preview sounds 2023-10-23 11:19:20 +03:00
r.nikolin 92ab2f2f66 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-23 10:45:59 +03:00
Кичигин Алексей 34366a778e Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-21 15:38:04 +03:00
Кичигин Алексей 3d0bfe9545 final animation monuments 1,2,3 2023-10-21 15:37:45 +03:00
r.nikolin e94459f453 Fix result scene + Rus eng to keyboard 2023-10-21 12:41:36 +03:00
r.nikolin 78b9327ff3 Change Monument description + fix env collision 2023-10-21 12:19:29 +03:00
r.nikolin c77adfd4cf Little fix 2023-10-21 11:46:31 +03:00
r.nikolin 06476db63c Fix 2023-10-21 11:43:39 +03:00
r.nikolin 38c254e267 Fix scenes 2023-10-21 11:43:28 +03:00
r.nikolin 2bd735889f Many fixes 2023-10-21 11:36:49 +03:00
Кичигин Алексей 95adfc62e8 fixed DND materials 2023-10-21 11:34:53 +03:00
r.nikolin b9fa23ffd6 Fix kon material 2023-10-21 10:59:37 +03:00
r.nikolin 0bf5f1f5b0 Fix start scene pos 2023-10-21 10:59:12 +03:00
r.nikolin 4be3ddc009 Change Game prefs 2023-10-21 10:49:21 +03:00
Кичигин Алексей 371f48fcec HDRP final tweaks 2023-10-20 20:03:29 +03:00
Кичигин Алексей 83978c05bf Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-20 16:43:14 +03:00
Кичигин Алексей 7f0d750a51 prolet animation lvl 1 2023-10-20 16:38:53 +03:00
r.nikolin 74591bdbd1 Fix player pos + enemy speed + monument colorize 2023-10-20 16:23:11 +03:00
r.nikolin d504211785 Little fix 2023-10-20 14:30:47 +03:00
r.nikolin 71add3c316 Added LODs and Mesh reduce to Bariers 2023-10-20 14:29:20 +03:00
r.nikolin 66bddd558a Fix GAME prefab 2023-10-20 14:06:46 +03:00
r.nikolin f78b2911f4 Fix global HDRP settings 2023-10-20 13:38:49 +03:00
r.nikolin cecef96c89 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-20 13:30:40 +03:00
r.nikolin b523bba89c Added LOD to Boards and Boosts 2023-10-20 13:29:44 +03:00
Кичигин Алексей 0ba09d0e1e scene exposure settings 2023-10-20 13:26:10 +03:00
r.nikolin e94097cfe7 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-20 12:07:39 +03:00
r.nikolin 9d198621b3 Change start scene 2023-10-20 12:06:16 +03:00
Кичигин Алексей ac8a162664 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-20 11:37:04 +03:00
Кичигин Алексей f957d70d1e performance 2023-10-20 11:32:32 +03:00
r.nikolin f96d7818bf Change Player + Enemy ship model 2023-10-20 11:12:47 +03:00
r.nikolin f702b49cd8 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-20 11:00:26 +03:00
r.nikolin 20a1d5aca3 Added light profiler 2023-10-20 10:44:34 +03:00
r.nikolin ab6be55f67 Change scenes 2023-10-20 10:38:55 +03:00
Алексей Козлов 6a8cb4191f Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-19 18:00:39 +03:00
Алексей Козлов 2f1e53bc94 add sparrow 2023-10-19 18:00:36 +03:00
Кичигин Алексей 6c5b7c220a monuments VFX 2023-10-19 15:28:58 +03:00
r.nikolin 72893f2838 Change HDRP profiler + Env prefab 2023-10-19 15:21:30 +03:00
r.nikolin e5bc5c071e Added new cockpit + bug fix 2023-10-19 13:42:54 +03:00
r.nikolin fa553e9399 Fix bugs 2023-10-19 13:08:23 +03:00
r.nikolin 7ffe22f1d1 Fix bug with UI Fader 2023-10-19 12:40:12 +03:00
Дмитрий Шмегеровский f5394ffe5c Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-19 11:05:45 +03:00
Дмитрий Шмегеровский 295c64b9de added vfx for road stop sign 2023-10-19 11:05:15 +03:00
r.nikolin 6f6baf0f80 Added Vibration Effect 2023-10-19 11:04:15 +03:00
r.nikolin b5e9aa68bf Fix materials 2023-10-18 17:11:47 +03:00
r.nikolin 0f07468022 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 16:52:24 +03:00
Кичигин Алексей e072edcbe7 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 16:51:03 +03:00
r.nikolin cf1184b338 Little fix start scene 2023-10-18 16:45:48 +03:00
Кичигин Алексей 25d5c9ba42 terrain off 2023-10-18 16:44:07 +03:00
Кичигин Алексей 5e939b0478 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 16:33:55 +03:00
Кичигин Алексей 08ddcf4b12 monument dissolve VFX 2023-10-18 16:28:13 +03:00
r.nikolin 0cfd87dce0 Adjust games to new Env 2023-10-18 16:27:53 +03:00
r.nikolin cc3adfe741 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 16:10:14 +03:00
Алексей Козлов 61c23fb496 change obj to fbx 2023-10-18 16:08:04 +03:00
r.nikolin 68f7eb0ec1 Added new Rostok + Monument icons 2023-10-18 16:06:51 +03:00
Алексей Козлов a207608980 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-18 14:42:02 +03:00
Алексей Козлов 2cf5755ce7 color_change 2023-10-18 14:34:16 +03:00
r.nikolin dee7fa0473 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 14:11:55 +03:00
r.nikolin c61a8c4f0a Change UI + fix COCKpit 2023-10-18 13:57:36 +03:00
Влад Бикунов e68ec90d00 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 13:56:26 +03:00
Влад Бикунов 27f9e2d433 Revert "track 1 upgrade"
This reverts commit 94bbbbc2dd.
2023-10-18 13:54:50 +03:00
Кичигин Алексей 09fb661883 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 13:29:15 +03:00
r.nikolin 15d7bcf3e3 little fix road mat 2023-10-18 12:21:18 +03:00
r.nikolin 380deb29bf Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 11:59:36 +03:00
r.nikolin 15218a6698 Added VR/Keyboard input controls 2023-10-18 11:59:26 +03:00
Кичигин Алексей 143af1654a Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-18 11:50:21 +03:00
Кичигин Алексей 6bfcc89ebe added new buildings pn monement_debug2 scene 2023-10-18 11:50:12 +03:00
Влад Бикунов 94bbbbc2dd track 1 upgrade
bonuses added
2023-10-18 11:10:54 +03:00
r.nikolin 20f6616987 Добавлено приветстве 2023-10-18 10:41:04 +03:00
r.nikolin 37d4b4030f Fix game 2023-10-17 17:18:34 +03:00
r.nikolin 8247f94735 Fix dissolve shader 2023-10-17 16:09:53 +03:00
r.nikolin 70532038ea Added trail asset 2023-10-17 15:49:10 +03:00
r.nikolin 59a11ad8b2 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-17 15:13:40 +03:00
r.nikolin 02cec7d705 Little fix 2023-10-17 15:12:51 +03:00
Алексей Козлов d57ab055b7 Merge remote-tracking branch 'origin/hdrp' into hdrp 2023-10-17 15:11:07 +03:00
Алексей Козлов 26f2bdbf7a material on stand 2023-10-17 15:10:42 +03:00
Алексей Козлов a7ed30eaec monument stand_ textures 2023-10-17 15:10:07 +03:00
r.nikolin ae13d98c42 Added Dissolve effect 2023-10-17 14:17:56 +03:00
r.nikolin e22fe3fc30 Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp 2023-10-17 12:48:00 +03:00
r.nikolin 405de73cca Change lb images + bug fix + new monument stand 2023-10-17 12:37:34 +03:00
Дмитрий Шмегеровский 7db0716d42 added NY assets 2023-10-16 11:19:04 +03:00
r.nikolin 9c1e180120 Change boost Model 2023-10-16 11:00:18 +03:00
r.nikolin c63ec5330f Startscene fix 2023-10-13 17:46:20 +03:00
r.nikolin 22bac3c7cb Added Speed particle effect 2023-10-13 17:31:22 +03:00
r.nikolin 869d0f8f47 little fix 2023-10-13 17:12:46 +03:00
r.nikolin 39d613934f little bug fix 2023-10-13 17:11:52 +03:00
r.nikolin 4950f9f05b Change finish checkpoint 2023-10-13 16:58:33 +03:00
r.nikolin 36044b8afd Added Gallery monument 2023-10-13 16:46:59 +03:00
r.nikolin 1d9ce3de6b Little fix 2023-10-13 16:11:01 +03:00
r.nikolin 756fe59840 Bug fix 2023-10-13 15:20:49 +03:00
r.nikolin b75986fc37 Added new GUI 2 2023-10-13 14:13:44 +03:00
r.nikolin e4aed62723 Added new GUI 2023-10-13 12:12:58 +03:00
r.nikolin 538df02896 Change leaderboards 2023-10-12 15:05:48 +03:00
r.nikolin ea375e1775 Little update 2023-10-11 17:59:36 +03:00
r.nikolin b561c6cea6 Fix result scene + bug fix 2023-10-11 17:33:14 +03:00
r.nikolin 549d44e0c5 Fix result scene 2023-10-11 15:44:05 +03:00
r.nikolin c13663d438 Bug fix + change tournament mode 2023-10-11 11:58:06 +03:00
r.nikolin 1b91b53c65 Fixed leaderboard 2023-10-10 17:25:59 +03:00
r.nikolin 64d8d48ce8 Change start scene + added new leaderboard 2023-10-10 15:03:37 +03:00
r.nikolin 0bca754ea1 little sound fix 2023-10-09 17:30:55 +03:00
r.nikolin 327a9cdcbd Remove Curved UI 2023-10-09 17:06:07 +03:00
r.nikolin bf0418bd3c Added sounds_1 2023-10-09 16:51:27 +03:00
r.nikolin e8a80bed64 little fix (TMPro) 2023-10-09 15:40:39 +03:00
r.nikolin 296827fd62 Added display change functionality 2023-10-09 15:12:08 +03:00
r.nikolin 90768172ef little fix 2023-10-09 13:25:12 +03:00
r.nikolin 0b3ce76201 Merge 2023-10-09 12:52:34 +03:00
r.nikolin 85d52d8d59 Remove URP 2023-10-09 12:42:06 +03:00
r.nikolin 7d4ca72760 Remove URP 2023-10-09 12:29:41 +03:00
r.nikolin df7926987b Save changes 2023-10-09 11:57:32 +03:00
r.nikolin fb7676cf63 littlefix 2023-10-06 16:12:39 +03:00
Дмитрий Шмегеровский 9de485f315 updating to HDRP 2023-10-06 14:15:08 +03:00
Rabidus 9b65c3b2e7 Added DateTimeLeaderboard 2023-10-05 17:56:59 +03:00
Rabidus a1397561ac Merge branch 'main' of https://git.bit5.ru/r.nikolin/rabidus-test 2023-10-05 15:58:31 +03:00
Rabidus 9176bbeb9f Added new scenes 2023-10-05 15:56:17 +03:00
Алексей Козлов c809654374 add clock 2023-10-05 15:47:34 +03:00
Алексей Козлов 00e3f436fb add city assets? and old tested location 2023-10-05 12:56:39 +03:00
Rabidus 8622a3efaa Fix start scene 2023-10-04 18:34:34 +03:00
Rabidus 2ed05102e4 little change 2023-10-04 12:49:59 +03:00
Rabidus 508981c264 Changed Idle scene + added debug monument scene 2023-10-03 17:31:06 +03:00
Rabidus 7f69418a92 Changed start scene 2023-10-02 19:12:35 +03:00
Rabidus ef7c6cd893 little fix 2023-09-18 20:41:09 +03:00
Rabidus e2fa2e6b1e new prefab system 2023-09-18 20:09:22 +03:00
Rabidus a3a10ee23e little fix 2023-09-14 13:45:53 +03:00
Rabidus 527f676353 Added new Monument + Road 2023-09-14 13:36:57 +03:00
Rabidus 9a2366e8d7 little fix 2023-09-13 13:35:29 +03:00
Rabidus 354eb4b524 fix game 2023-09-13 13:24:05 +03:00
Rabidus 27f1ea7290 many changes 2023-09-11 15:44:17 +03:00