Commit Graph

17 Commits

Author SHA1 Message Date
Bartek
59d14633a5 VolumetricFog 2.0 2025-10-13 14:55:32 +02:00
8cee5fbf9e unity version update 2025-10-08 23:22:04 +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
432245b4de September 2025 2025-09-15 15:53:18 +02:00
c8b66ed3af stuff 2025-07-16 23:04:04 +02:00
0d69e37385 working on actors 2025-07-03 05:52:52 +02:00
315661ed8d multiplayer stuff 2025-07-01 18:57:49 +02:00
40d07041fa working on steam multiplayer 2025-06-24 14:45:26 +02:00
b67178e36c test punch anim 2025-06-22 12:12:46 +02:00
c8cfb28a7b working on fpp character animations 2025-06-22 10:45:09 +02:00
71c1dd043e merge 2025-06-18 14:49:48 +02:00
Bartek
34bb94ca13 initial version 2025-06-18 14:46:54 +02:00
9482216a11 working on guts and player fpp model 2025-06-17 23:40:21 +02:00
62cb740f69 restored from pc, added .editorconfig 2025-05-26 17:08:43 +02:00
c3e9f8abe8 refactor 2025-05-14 10:51:59 +02:00
cc0441e7ea refactoring 2025-04-14 23:22:05 +02:00
004d8f3e65 the jelito begins here 2025-03-30 12:39:50 +02:00