Commit Graph

9 Commits

Author SHA1 Message Date
b04369531b working on ai still 2025-10-17 10:10:08 +02:00
128166317d working on zombie ai 2025-10-10 18:08:54 +02:00
8cee5fbf9e unity version update 2025-10-08 23:22:04 +02:00
c3cea92041 replaced zombie model, working on animations 2025-10-02 00:38:29 +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
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
a0c2a389be working on charging and quick attacks 2025-07-31 09:04:16 +02:00
c8b66ed3af stuff 2025-07-16 23:04:04 +02:00