Commit Graph

84 Commits

Author SHA1 Message Date
eba2a8e0a6 fixed url for rebootkit in submodules 2025-10-24 13:56:32 +02:00
18effac005 working on humbie still 2025-10-24 13:54:27 +02:00
98cf38ac00 updated rkit 2025-10-21 15:25:59 +02:00
cbca728bc3 Merge remote-tracking branch 'origin/astek' 2025-10-18 21:58:34 +02:00
9f0a889eb0 bugfix: camera stuttering when humbie touched the player 2025-10-18 21:57:30 +02:00
b04369531b working on ai still 2025-10-17 10:10:08 +02:00
Bartek
5106d565e2 W.I.P, new skybox, Baked Lightning, detailed vulkan and beach area 2025-10-16 23:25:24 +02:00
0bf2bbfb97 Merge branch 'main' into dev 2025-10-14 16:06:53 +02:00
1d15377885 working on humbies ai 2025-10-14 16:05:57 +02:00
Bartek
7f718f2f6f Hybrid Volumetric Fog + some swamp area test 2025-10-14 16:02:35 +02:00
Bartek
fc4a139d11 Merge branch 'graphics' into astek 2025-10-13 14:56:19 +02:00
Bartek
59d14633a5 VolumetricFog 2.0 2025-10-13 14:55:32 +02:00
34149b9244 Added vegetation models
- Added 3 bush models
- Added 2 flower models
2025-10-13 14:44:26 +02:00
c5f574b05c Merge remote-tracking branch 'origin/astek' 2025-10-10 18:29:12 +02:00
Bartek
395a46a73b Revert "Puszczaj mnie"
This reverts commit c369e31581.
2025-10-10 18:23:07 +02:00
Bartek
c369e31581 Puszczaj mnie 2025-10-10 18:22:51 +02:00
8a2884acb6 Merge remote-tracking branch 'origin/graphics' 2025-10-10 18:20:39 +02:00
477ed62c75 updated rebootkit 2025-10-10 18:09:42 +02:00
128166317d working on zombie ai 2025-10-10 18:08:54 +02:00
37068a5c33 Added enviroment assets 2025-10-10 18:08:31 +02:00
8cee5fbf9e unity version update 2025-10-08 23:22:04 +02:00
625571db27 Merge branch 'astek' 2025-10-08 21:11:38 +02:00
2fab3007ae animancer 2025-10-08 21:07:47 +02:00
Bartek
277dface65 Half-baked universal Liquid Shader 2025-10-08 20:28:22 +02:00
35f1337446 rebootkit update 2025-10-02 00:39:01 +02:00
c3cea92041 replaced zombie model, working on animations 2025-10-02 00:38:29 +02:00
8a84bd459f imported animancer and rainbow folder 2025-10-01 20:11:27 +02:00
c51c07d19b removed old stuff 2025-10-01 20:03:52 +02:00
d9cf8507d0 tet commit 2025-09-28 21:02:32 +02:00
59d521afaf messing with animations 2025-09-24 12:13:56 +02:00
6083935449 astek should be 'playable', kinda... 2025-09-17 01:36:08 +02:00
b56f980dc1 Merge remote-tracking branch 'origin/Jab' into dev2
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset
#	Assets/AddressableAssetsData/Windows/addressables_content_state.bin
#	Assets/HighlightPlus/Runtime/Resources/HighlightPlus/HighlightPlusDepthWrite.mat
#	Assets/Scenes/scn_main.unity
#	Assets/Settings/PC_Renderer.asset
#	Assets/Settings/SampleSceneProfile.asset
#	Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
#	Assets/jelycho/Code/Enemies/ZombieActor.cs.meta
#	Assets/jelycho/Code/Main/JelychoGame.cs
#	Assets/jelycho/Code/Player/FPPCamera.cs
#	Assets/jelycho/Code/Player/PlayerActor.cs
#	Assets/jelycho/Code/Player/PlayerController.cs
#	Assets/jelycho/Worlds/dev/scn_map_dev.unity
#	Assets/jelycho/actors/player/Player Controller.asset
#	Assets/jelycho/core/enemies/Zombie/animator_zombie.controller
#	Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_1.mat
#	Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_eyes.mat
#	Assets/jelycho/core/player/a_player.prefab
#	Assets/jelycho/core/player/animator_player.controller
#	ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset
#	ProjectSettings/Packages/com.unity.probuilder/Settings.json
#	ProjectSettings/ProjectSettings.asset
2025-09-17 00:13:37 +02:00
Bartek
aa216aa1b2 działaj kuirwo
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/TerrainData_082ed354-ddb7-4526-a5c9-d70df8d31f7c.asset
#	Assets/TerrainData_6d6bf880-a71c-4783-a3c9-876acbf47c4c.asset
#	Assets/TerrainData_7954a49e-a14a-4526-88e2-ba297716e67b.asset
#	Assets/TerrainData_9724b08a-9b38-4d5b-8470-8626fd9368aa.asset
#	Assets/TerrainSampleAssets/TerrainLayers/Heather_TerrainLayer.terrainlayer
#	Assets/TerrainSampleAssets/TerrainLayers/Muddy_TerrainLayer.terrainlayer
#	Assets/TerrainSampleAssets/TerrainLayers/Soil_Rocks_TerrainLayer.terrainlayer
#	Assets/Woda Jabłonia/Swamp.mat
#	Assets/jelycho/Code/Abilities/AbilityAsset.cs.meta
#	Assets/jelycho/Code/Enemies/ZombieActor.cs.meta
#	Assets/jelycho/Worlds/rr_astek/scn_map_astek.unity
2025-09-16 21:15:14 +02:00
Bartek
1085d6f12b New Swamp area 2025-09-16 20:59:44 +02:00
16ac0b3c7d working on fixes 2025-09-16 20:48:28 +02:00
735e128a95 trying to figure out a camera stutter bug 2025-09-15 16:24:51 +02:00
Bartek
161133fdd0 Map September 2025. 2025-09-15 16:13:01 +02:00
Bartek
432245b4de September 2025 2025-09-15 15:53:18 +02:00
d8ff9c0964 added 'ts' command to change timescale in debug builds; triplanar mapping for infected area textures 2025-09-15 01:11:41 +02:00
224d55aec6 something is no yes 2025-08-31 20:47:08 +02:00
fb1c3f8290 working on enemies 2025-08-20 05:06:00 +02:00
f6a4db7b4d working on animations 2025-08-08 23:38:03 +02:00
c17ce42700 animations refactor 2025-08-04 09:33:19 +02:00
064268e049 removed left arm rest rig 2025-07-31 17:57:06 +02:00
a0c2a389be working on charging and quick attacks 2025-07-31 09:04:16 +02:00
407454555f working on charging system 2025-07-30 08:26:07 +02:00
61a42bdf10 optimizing 2025-07-30 05:51:52 +02:00
bf94ccb9db refactoring multiplayer 2025-07-21 19:58:20 +02:00
0d8cc0e291 working on multiplayer - still delay with more actors :/ 2025-07-21 09:05:24 +02:00
3c13cc3034 outline 2025-07-18 01:09:30 +02:00