yuchen
pushed to master at git/tetrees
68a5230b5b Merge branch 'master' of http://pi.killf.info:9966/git/tetrees
# Conflicts:
# Config/DefaultEngine.ini
# Content/__ExternalActors__/treefall/2/0/0N/Z5HIL68TL28A16KWXVNNEV.uasset
# Content/__ExternalActors__/treefall/2/0/30/WKRIC0A3YTL370X223UKD0.uasset
# Content/__ExternalActors__/treefall/2/0/3M/3QOA8SAGHGZ1C6JX5VWCLU.uasset
# Content/__ExternalActors__/treefall/2/1/A4/E0GGSFFKI1WIZG76N4SLBS.uasset
# Content/__ExternalActors__/treefall/2/1/FE/RJ2OL4OS94LNIJ3VFXI3KS.uasset
# Content/__ExternalActors__/treefall/2/1/GO/YY0HHADH0CMYHX9NU24O5C.uasset
# Content/__ExternalActors__/treefall/2/1/GR/K0Z7KW0X412YNCZ1Q8TUFH.uasset
# Content/__ExternalActors__/treefall/2/2/42/XXCUJCWOKL6C5H6VQA9CUY.uasset
# Content/__ExternalActors__/treefall/2/2/4Z/8LAH2DFGX5WJPJHTKIG0JL.uasset
# Content/__ExternalActors__/treefall/2/2/52/VHM0CAYPP2MKCN7N9A6ON5.uasset
# Content/__ExternalActors__/treefall/2/2/5F/IFLELHM6YSXZREC5AUOFMX.uasset
# Content/__ExternalActors__/treefall/2/2/WN/2072BZK7G3TU8LZX8AF7JN.uasset
# Content/__ExternalActors__/treefall/2/3/83/7SFSL3HK0RLP93MF18F08B.uasset
# Content/__ExternalActors__/treefall/2/3/ZF/GYIBE55TRWD79L311KK587.uasset
# Content/__ExternalActors__/treefall/2/4/5E/DJDYD76ISJIBNMAF7AUP0I.uasset
# Content/__ExternalActors__/treefall/2/4/ZG/EZBEZVPF649E8OQPDZ3XY6.uasset
# Content/__ExternalActors__/treefall/2/5/6Y/3CPZN87AAJ6BXM1LGE049C.uasset
# Content/__ExternalActors__/treefall/2/5/HH/5YH3FYYFVCRUFWRDQRKAUD.uasset
# Content/__ExternalActors__/treefall/2/6/I2/QR7MGFJ5MLDOWG5GU2PSGJ.uasset
# Content/__ExternalActors__/treefall/2/6/PF/QY552212M74C1G88XULPZZ.uasset
# Content/__ExternalActors__/treefall/2/7/60/TT3DDR38GWLV9U9NUWEK8P.uasset
# Content/__ExternalActors__/treefall/2/7/7A/5BA1B5BBGZOZERUM2W6587.uasset
# Content/__ExternalActors__/treefall/2/7/ZR/LFE2BW8R38GNS9GO0Q2EXF.uasset
# Content/__ExternalActors__/treefall/2/8/BH/6ND0ZL3DVF1UICO8B05GE4.uasset
# Content/__ExternalActors__/treefall/2/8/DB/N8XOQB43K7GRZ1OHHNEMAC.uasset
# Content/__ExternalActors__/treefall/2/9/2K/823SNEVHOGAS1T1EX2QBMG.uasset
# Content/__ExternalActors__/treefall/2/9/6K/KGH9ZSISWP4M6EIK1Q82QD.uasset
# Content/__ExternalActors__/treefall/2/9/DD/V1QBN66S9EL8EWE3EAG8AH.uasset
# Content/__ExternalActors__/treefall/2/9/RK/LJ7QNEIR6RQNIZNHKQJ5NV.uasset
# Content/__ExternalActors__/treefall/2/9/YJ/S713B6DQIZP05F97CQR8UA.uasset
# Content/__ExternalActors__/treefall/2/A/8J/K8HM8MLGP1AXBHFNC021E8.uasset
# Content/__ExternalActors__/treefall/2/B/8U/TMN9DSVO5RXH7OEZE2ESHX.uasset
# Content/__ExternalActors__/treefall/2/B/I2/WFU9REAL59CO7VSTOABJWK.uasset
# Content/__ExternalActors__/treefall/2/C/2X/LFHUU3EIWGLDXYGX5HQE7N.uasset
# Content/__ExternalActors__/treefall/2/C/G5/YARVH7MJWX7AOXDMTVP7T2.uasset
# Content/__ExternalActors__/treefall/2/C/NY/084621GNUJL0NQ07O4VLHW.uasset
# Content/__ExternalActors__/treefall/2/C/UE/LDTFKKGR35PBBFB9NOQRNH.uasset
# Content/__ExternalActors__/treefall/2/D/38/8NQXNQDFHLO4W1KM56OLWV.uasset
# Content/__ExternalActors__/treefall/2/D/C7/GTE7SIIBCQQTYJ0BLUA31P.uasset
# Content/__ExternalActors__/treefall/2/D/ES/WAYZT4K6F9BHC5JZTXSOL8.uasset
# Content/__ExternalActors__/treefall/2/D/R4/J4YQYJQHWPF5DERPMRXQZ9.uasset
# Content/__ExternalActors__/treefall/2/D/UO/RE6ZCCTC16E0FPXRRILYVV.uasset
# Content/__ExternalActors__/treefall/2/E/04/H99ESR8PJQ785Z3WKQV2UG.uasset
# Content/__ExternalActors__/treefall/2/E/96/7OZXJN0TQHKEX0D4ZKLL7J.uasset
# Content/__ExternalActors__/treefall/2/E/EP/6YSB2RXLDXQX1ZNX516OKP.uasset
# Content/__ExternalActors__/treefall/2/E/HK/9IEDFKPW6NZW7A29PNRRK8.uasset
# Content/__ExternalActors__/treefall/2/E/L9/GNKSFH1X3M94IQQIEPHNLG.uasset
# Content/__ExternalActors__/treefall/2/E/V2/4RP8W5FYYH09O37U710294.uasset
# Content/__ExternalActors__/treefall/2/F/32/QKXCDT2TM45J7IFS01OBOK.uasset
# Content/treefall/2.umap
- 009f16fa8d no message
- 29ac4a1135 燃烧的tree
- View comparison for these 3 commits »
1 year ago
1951eb3c4c 1.删除Map11的空气墙 2.调整Map12的陨石位置和胜利逻辑 3.添加演员角色
1d19d1f5a3 [音频] 音乐位置信息 临时解决方案 Map05实现