summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-23* animationchai
2022-06-22- animation layerchai
2022-06-22* Unit Action Datachai
2022-06-22- multilayer\old animation solutionchai
2022-06-22-logchai
2022-06-21* placeholder clipchai
2022-06-21Merge branch 'master' of warmcat.org:/home/git-repo/Erika into HEADchai
# Conflicts: # Erika/Assets/Bundle/Materials/Unit/Effect.meta # Erika/Assets/Bundle/Shaders/Include.meta # Erika/Assets/Bundle/Shaders/Unit/Effect.meta # Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta # Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta # Erika/Assets/Bundle/Unit/NPC.meta # Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta # Erika/Assets/Bundle/Unit/PC/Erika/Models.meta # Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta # Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta # Erika/Assets/Bundle/Unit/Prop.meta # Erika/Assets/Scripts/Managers/ResourceManager.cs # Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs # Erika/Assets/Scripts/Utils/LogHelper.cs # Erika/Assets/Scripts/Utils/LogTag.cs # Erika/Assets/Scripts/Utils/LogTag.cs.meta
2022-06-21+ transition datachai
2022-06-21+transition datachai
2022-06-21* unit statechai
2022-06-21* Resources -> Bundlechai
2022-06-21- metachai
2022-06-20+ animationschai
2022-06-20*miscchai
2022-06-20+ Animationschai
2022-06-20* rename Bundle -> Resourceschai
2022-06-20* changeschai
2022-06-06* miscchai
2022-03-10* move folderchai
2022-03-10*miscchai
2021-10-02*miscchai
2021-10-01*miscchai
2021-10-01*miscchai
2021-10-01*miscchai
2021-09-30*miscchai
2021-09-30*Unit Preprocessingchai
2021-09-29*miscchai
2021-09-29*miscchai
2021-09-28*unit lenschai
2021-09-26*miscchai
2021-09-22*effectchai
2021-09-21*miscchai
2021-09-21*custom rendering pipelinechai
2021-09-20*command bufferchai
2021-09-20*miscchai
2021-09-20+command bufferchai
2021-09-17*miscchai
2021-09-17*miscchai
2021-09-17*miscchai
2021-09-17*unit image effectchai
2021-09-17+glitchchai
2021-09-17+ unit image effect handlechai
2021-09-16+ motion blurchai
2021-09-16+unit effectchai
2021-09-15*miscchai
2021-09-15*rename folderchai
2021-09-15*mv rootmotion folderchai
2021-09-15+bundles.jsonchai
2021-09-15*rename folderchai
2021-09-15-Editorchai