Commit b5f01eea authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.9

parents 7f4ea565 c4888580
Pipeline #270178881 passed with stages
in 60 minutes and 6 seconds
......@@ -230,8 +230,10 @@ build_server_32:
# macOS builds need a special runner, but can start early.
# iIt should build directly from git content, the prepared linux source directories have soft links that won't work.
build_macos:
needs: []
dependencies: []
needs:
- build_prepare
dependencies:
- build_prepare
tags:
- macos
stage: build_main
......@@ -241,6 +243,7 @@ build_macos:
- when: on_success
script:
- docker/scripts/obsolete.sh || exit 0
- ./bootstrap.sh || exit 0
- gitlab_build/docker/build/make_ci.sh macOS -j`nproc || echo 3`
artifacts:
paths:
......
......@@ -18,7 +18,7 @@ armagetron.kdevelop armagetron.kdevelop.pcs armagetron.kdevses tron.ico \
models sound textures bootstrap.sh music \
acinclude.d/accustomdir.m4 acinclude.d/ax_boost_base.m4 acinclude.d/ax_boost_system.m4 acinclude.d/ax_boost_thread.m4\
fingerprint \
win32 major_version Dockerfile
win32 major_version Dockerfile language
# language/update.py
# resource is included as a subdir for the purpose of keeping this makefile short and delegating
......@@ -41,6 +41,9 @@ nobase_dist_language_DATA=language/languages.txt.in $(languagedata) language/upd
# What gets installed
nobase_language_DATA=language/languages.txt language/english_base.txt language/english_base_notranslate.txt language/american.txt language/british.txt\
language/deutsch.txt language/french.txt language/spanish.txt language/polish.txt language/russian.txt
if NEEDDATA
# install media data only when it is needed
nobase_texture_DATA=textures/cycle_body.png textures/cycle_wheel.png textures/dir_wall.png\
......@@ -117,8 +120,6 @@ nobase_music_DATA=music/titletrack.ogg music/when.ogg music/doIknowyou.ogg\
nobase_model_DATA=models/cycle_body.mod models/cycle_front.mod models/cycle_rear.mod
endif
nobase_language_DATA=language/languages.txt $(languagedata)
doxy:
cd src/doc && doxygen Doxyfile
cd ../../
......
......@@ -5514,13 +5514,13 @@ void ePlayerNetID::RemoveFromGame()
}
se_PlayerNetIDs.Remove(this, listID);
if ( sn_GetNetState() == nCLIENT )
if( (sn_GetNetState() == nCLIENT) && (currentTeam || nextTeam) )
{
SetTeamWish( NULL );
SetTeam( NULL );
UpdateTeam();
currentTeam = NULL;
}
SetTeam( NULL );
UpdateTeam();
ControlObject( NULL );
if( logLeave )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment