Merge remote-tracking branch 'origin/master' into Optimizations
This commit is contained in:
commit
d6f94ccc47
|
@ -120,9 +120,15 @@ if $DO_COPY_FILES ; then
|
|||
cp -v ./Docs/Example.CarlaSettings.ini ${DESTINATION}/Example.CarlaSettings.ini
|
||||
|
||||
rsync -vhr --delete --delete-excluded \
|
||||
--exclude "__pycache__" \
|
||||
--exclude "*.egg-info" \
|
||||
--exclude "*.log" \
|
||||
--exclude "*.pyc" \
|
||||
--exclude ".*" \
|
||||
--exclude ".tags*" \
|
||||
--exclude "__pycache__" \
|
||||
--exclude "_benchmarks_results*" \
|
||||
--exclude "_images*" \
|
||||
--exclude "_out*" \
|
||||
PythonClient/ ${DESTINATION}/PythonClient
|
||||
|
||||
echo
|
||||
|
|
|
@ -96,7 +96,7 @@ pushd "$UNREAL_PROJECT_FOLDER" >/dev/null
|
|||
# This command usually fails but normally we can continue anyway.
|
||||
set +e
|
||||
log "Generate Unreal project files..."
|
||||
${UE4_ROOT}/GenerateProjectFiles.sh -project="${PWD}/CarlaUE4.uproject" -game -engine
|
||||
${UE4_ROOT}/GenerateProjectFiles.sh -project="${PWD}/CarlaUE4.uproject" -game -engine -makefiles
|
||||
set -e
|
||||
|
||||
log "Build CarlaUE4 project..."
|
||||
|
|
|
@ -8,4 +8,4 @@
|
|||
0.6.0: 1Gw8sw01hDEV4FtpHEZZwvS-6XN0jmaLT
|
||||
0.7.0: 11PKC_lG7L80L1ZxiMlzV17utU45UcRnT
|
||||
0.7.1: 1gf3YaFIjwr1EaK6qxq2V-a510Brt9Imq
|
||||
Latest: 1Coa1iX19TKR5DMxPPQSWsT83l-Ize0Jk
|
||||
Latest: 1_kSLT8Q05I7zC_X0q4ABMIB8gRd-W-ZF
|
||||
|
|
Loading…
Reference in New Issue