exec the other configs at the end

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index ea4b42fcc7510436b16b57fa3fff6724226473f2..fd8a77068bc49e3b3aa97c18ef969de83af03791 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -369,7 +369,6 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
 
 // use default physics
 set sv_friction_on_land 0

-exec physicsNoQWBunny-xpmbased.cfg

 
 set sv_player_viewoffset "0 0 42" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
 
 set sv_player_viewoffset "0 0 42" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"


@@ -698,8 +697,6 @@ set g_ctf_flag_pickup_effects 1
 set g_ctf_flag_capture_effects 1
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
 
 set g_ctf_flag_capture_effects 1
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"
 

-exec ctfscoring-ai.cfg
-

 // runematch
 set g_runematch                                                0 "Runematch: pick up and hold the runes, special items that give you points, a special power (rune) and a disadvantage (curse)"
 set g_runematch_pointrate                              5
 // runematch
 set g_runematch                                                0 "Runematch: pick up and hold the runes, special items that give you points, a special power (rune) and a disadvantage (curse)"
 set g_runematch_pointrate                              5


@@ -871,11 +868,6 @@ set g_nexball_trail_color     254  "1-256 for different colors (Quake palette, 2
 
 set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the radar  0: only show teammates and the ball on the radar"
 
 
 set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the radar  0: only show teammates and the ball on the radar"
 

-// server game balance settings
-// powerup balance settings
-// weapon balance settings follow
-exec balanceXonotic.cfg
-

 set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 1      "serverside footstep sounds"
 set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 1      "serverside footstep sounds"


@@ -923,7 +915,6 @@ r_glsl_offsetmapping_reliefmapping 0
 r_glsl_offsetmapping_scale 0.02
 // execute effects-normal.cfg to make sure that all effect settings are reset
 alias menu_sync "" // will be re-aliased later
 r_glsl_offsetmapping_scale 0.02
 // execute effects-normal.cfg to make sure that all effect settings are reset
 alias menu_sync "" // will be re-aliased later

-exec effects-normal.cfg

 
 // misc
 fs_empty_files_in_pack_mark_deletions 1 // makes patches able to delete files
 
 // misc
 fs_empty_files_in_pack_mark_deletions 1 // makes patches able to delete files


@@ -1380,12 +1371,6 @@ seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mod
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 

-// hud cvar descriptions
-exec _hud_descriptions.cfg
-// exec the default skin config
-// please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency
-exec hud_luminos.cfg
-

 // user preference cvars (i.e. shouldn't be adjusted by a skin config) 
 seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon"
 seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out"
 // user preference cvars (i.e. shouldn't be adjusted by a skin config) 
 seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon"
 seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out"


@@ -1624,8 +1609,6 @@ set sv_clones 0   "number of clones a player may make (reset by the \"kill\" comma
 
 set cl_handicap 1      "the higher, the more damage you will receive (client setting)"
 
 
 set cl_handicap 1      "the higher, the more damage you will receive (client setting)"
 

-exec turrets.cfg
-

 // must be at the bottom of this file:
 // alias for switching the teamselect menu
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 // must be at the bottom of this file:
 // alias for switching the teamselect menu
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"


@@ -2026,3 +2009,16 @@ r_polygonoffset_decals_factor 0
 // this is mainly for _decal entities (their shaders should use "polygonoffset" shader parameter) - this is "good enough" as it seems, but smaller than the decals one so these don't zfight decals
 mod_q3shader_default_polygonoffset -50
 mod_q3shader_default_polygonfactor 0
 // this is mainly for _decal entities (their shaders should use "polygonoffset" shader parameter) - this is "good enough" as it seems, but smaller than the decals one so these don't zfight decals
 mod_q3shader_default_polygonoffset -50
 mod_q3shader_default_polygonfactor 0

+
+// other config files
+exec balanceXonotic.cfg
+exec ctfscoring-ai.cfg
+exec effects-normal.cfg
+exec physicsNoQWBunny-xpmbased.cfg
+exec turrets.cfg
+
+// hud cvar descriptions
+exec _hud_descriptions.cfg
+// exec the default skin config
+// please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency
+exec hud_luminos.cfg