yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,206 Commits 1 Branch 0 Tags 1.1 GiB
C 38%
C# 36.3%
Objective-C 22.5%
JavaScript 1.5%
ShaderLab 0.8%
Other 0.7%
Go to file
koya_15 71898e3e8a Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0 
# Conflicts:
#	popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim
#	popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim
#	popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim
 		2022-06-06 14:23:26 +09:00
popcorn Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0 2022-06-06 14:23:26 +09:00
.gitignore gitignoreを設定 2021-06-15 14:21:39 +09:00