Commit Graph

19 Commits

Author SHA1 Message Date
c51c07d19b removed old stuff 2025-10-01 20:03:52 +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
432245b4de September 2025 2025-09-15 15:53:18 +02:00
fb1c3f8290 working on enemies 2025-08-20 05:06:00 +02:00
c17ce42700 animations refactor 2025-08-04 09:33:19 +02:00
61a42bdf10 optimizing 2025-07-30 05:51:52 +02:00
bf94ccb9db refactoring multiplayer 2025-07-21 19:58:20 +02:00
3c13cc3034 outline 2025-07-18 01:09:30 +02:00
faf4bd1ca9 refactor 2025-07-17 06:36:55 +02:00
315661ed8d multiplayer stuff 2025-07-01 18:57:49 +02:00
a51a7d3c07 adding multiplayer 2025-06-30 21:28:11 +02:00
40d07041fa working on steam multiplayer 2025-06-24 14:45:26 +02:00
7b9470598b fixed input controls asset duplication 2025-06-18 17:23:50 +02:00
9482216a11 working on guts and player fpp model 2025-06-17 23:40:21 +02:00
c3e9f8abe8 refactor 2025-05-14 10:51:59 +02:00
62d340853d idk 2025-04-18 11:36:40 +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