|
|
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 |
|
|
|
faf4bd1ca9
|
refactor
|
2025-07-17 06:36:55 +02:00 |
|
|
|
d1239ca70b
|
quickoutline
|
2025-07-17 00:49:04 +02:00 |
|
|
|
c8b66ed3af
|
stuff
|
2025-07-16 23:04:04 +02:00 |
|
|
|
dc998d907c
|
working on inventory
|
2025-07-11 14:40:23 +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 |
|
|
|
04675ce941
|
Merge remote-tracking branch 'origin/graphics' into dev
|
2025-06-30 21:28:25 +02:00 |
|
|
|
a51a7d3c07
|
adding multiplayer
|
2025-06-30 21:28:11 +02:00 |
|
|
|
38d0923a4d
|
Added beacon models
- Beacon - Assets/jelycho/Models/Beacon
- Beacon seed & embryo - Assets/jelycho/Models/Beacon_Seed
|
2025-06-25 21:14:10 +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 |
|
|
|
7b9470598b
|
fixed input controls asset duplication
|
2025-06-18 17:23:50 +02:00 |
|
|
|
cd3c67419b
|
added prefab for ropes_manager
|
2025-06-18 15:02:19 +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 |
|
|
|
fbe3b59773
|
unity dark mode asset, changes to player locomotion, camera bobbing
|
2025-06-09 18:50:01 +02:00 |
|
|
|
a8cdd143ca
|
moved spring math to rebootkit
|
2025-06-07 14:42:50 +02:00 |
|
|
|
e99314d5d8
|
working on fpp locomotion, camera spring
|
2025-06-07 10:39:06 +02:00 |
|
|
|
0abddece7e
|
idk
|
2025-06-03 20:34:16 +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 |
|
|
|
62d340853d
|
idk
|
2025-04-18 11:36:40 +02:00 |
|
|
|
cc0441e7ea
|
refactoring
|
2025-04-14 23:22:05 +02:00 |
|
