Commit 34e7f534 authored by Mario's avatar Mario

Merge branch 'master' into Mirio/balance

parents 8ba1f6c6 19eeff94

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -5,6 +5,12 @@ before_script:
- cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
- cd ..
report_cloc:
stage: test
script:
- cloc --force-lang-def=qcsrc/tools/cloc.txt --sql 1 --sql-project xonotic qcsrc | sqlite3 code.db
- sqlite3 code.db 'select file,nCode from t where nCode > 1000 order by nBlank+nComment+nCode desc'
test_compilation_units:
stage: test
script:
......@@ -24,7 +30,7 @@ test_sv_game:
- wget -O data/maps/g-23.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.cache
- wget -O data/maps/g-23.waypoints.hardwired https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.hardwired
- make
- EXPECT=4bd5b0276cdd100c831c73f0400eca71
- EXPECT=37be9dc5489925451eb497390fdf58b9
- HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
| tee /dev/stderr
| grep '^:'
......
......@@ -4,6 +4,7 @@ project(xonotic-data LANGUAGES ASM)
include_directories(qcsrc)
add_definitions(-DXONOTIC=1)
add_definitions(-DNDEBUG=1)
find_package(Git REQUIRED)
......@@ -25,11 +26,11 @@ set_source_files_properties(
)
add_executable(csprogs qcsrc/client/progs.inc)
target_compile_definitions(csprogs PRIVATE -DCSQC)
target_compile_definitions(csprogs PRIVATE -DGAMEQC -DCSQC)
add_dependencies(csprogs gmqcc)
add_executable(progs qcsrc/server/progs.inc)
target_compile_definitions(progs PRIVATE -DSVQC)
target_compile_definitions(progs PRIVATE -DGAMEQC -DSVQC)
add_dependencies(progs gmqcc)
add_executable(menu qcsrc/menu/progs.inc)
......
......@@ -37,13 +37,15 @@ seta hud_panel_engineinfo 0 "enable this panel"
seta hud_panel_infomessages 1 "enable this panel"
seta hud_panel_physics 3 "enable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
seta hud_panel_centerprint 1 "enable this panel"
seta hud_panel_minigameboard 1 "enable this panel"
seta hud_panel_minigamestatus 1 "enable this panel"
seta hud_panel_minigamehelp 1 "enable this panel"
seta hud_panel_minigamemenu 0 "enable this panel"
seta hud_panel_mapvote 1 "enable this panel"
//seta hud_panel_minigameboard 1 "enable this panel"
//seta hud_panel_minigamestatus 1 "enable this panel"
//seta hud_panel_minigamehelp 1 "enable this panel"
//seta hud_panel_minigamemenu 0 "enable this panel"
//seta hud_panel_mapvote 1 "enable this panel"
seta hud_panel_itemstime 2 "enable this panel, 1 = show when spectating, 2 = even playing in warmup stage"
seta hud_panel_quickmenu 1 "enable this panel"
//seta hud_panel_quickmenu 1 "enable this panel"
//seta hud_panel_scoreboard 1 "enable this panel"
seta hud_panel_scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars"
seta hud_panel_weapons_dynamichud 1 "apply the dynamic hud effects to this panel"
seta hud_panel_ammo_dynamichud 1 "apply the dynamic hud effects to this panel"
......@@ -62,6 +64,7 @@ seta hud_panel_infomessages_dynamichud 0 "apply the dynamic hud effects to t
seta hud_panel_physics_dynamichud 1 "apply the dynamic hud effects to this panel"
seta hud_panel_centerprint_dynamichud 1 "apply the dynamic hud effects to this panel"
seta hud_panel_itemstime_dynamichud 1 "apply the dynamic hud effects to this panel"
seta hud_panel_scoreboard_dynamichud 0 "apply the dynamic hud effects to this panel"
seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
......@@ -69,13 +72,18 @@ seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this
seta hud_panel_weapons_ammo_full_plasma 180 "show 100% of the status bar at this ammo count"
seta hud_panel_weapons_ammo_full_rockets 160 "show 100% of the status bar at this ammo count"
seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
seta hud_panel_weapons_hide_ondeath 0 "hide this panel when dead"
seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full"
seta hud_panel_ammo_hide_ondeath 0 "hide this panel when dead"
seta hud_panel_powerups_hide_ondeath 0 "hide this panel when dead"
seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full"
seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full"
seta hud_panel_healtharmor_progressbar_gfx_damage 5 "show damage effect when damaged at least by this amount; 0 disables the effect"
seta hud_panel_healtharmor_progressbar_gfx_lowhealth 40 "health progressbar blinks when health is lower than this amount"
seta hud_panel_healtharmor_hide_ondeath 0 "hide this panel when dead"
seta hud_panel_timer_increment "0" "show elapsed time instead of remaining time"
......@@ -84,17 +92,28 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "
seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
seta hud_panel_physics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
seta hud_panel_physics_speed_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)"
seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
seta hud_panel_itemstime_hidelarge "0" "if 1 hide large armor and health from the panel"
seta hud_panel_itemstime_hidebig "0" "if 1 hide big armor and health from the panel"
seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0 to disable)"
seta hud_panel_quickmenu_translatecommands 0 "when the game is translated, translate strings inside commands too (useful for chat commands)"
seta hud_panel_quickmenu_time 5 "quickmenu expires after this number of seconds in the same page"
seta hud_panel_infomessages_group0 1 "show group 0 messages (showing keys for non-crucial actions you can do while spectating/observing)"
seta hud_panel_infomessages_group_time 6 "number of seconds a message of a group lasts before it gets changed"
seta hud_panel_infomessages_group_fadetime 0.4 "group message fade in/out time"
seta hud_panel_scoreboard_namesize 15 "size limit of player names and relative column (multiplied by fontsize)"
seta hud_panel_scoreboard_maxheight 0.6 "max height of the scoreboard; a few players that wouldn't fit into the scoreboard are listed in the last row"
seta hud_panel_scoreboard_others_showscore 1 "show scores of players listed in the last row when the scoreboard reaches the max height"
seta hud_panel_scoreboard_spectators_showping 1 "show ping of spectators"
seta hud_panel_scoreboard_spectators_aligned 0 "align spectators in columns"
seta hud_panel_scoreboard_minwidth 0.4 "minimum width of the scoreboard"
// hud panel aliases
alias quickmenu "cl_cmd hud quickmenu ${* ?}"
......
......@@ -329,6 +329,7 @@ seta hud_panel_mapvote_bg_color_team "" "override panel color with team color in
seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_mapvote_highlight_border "" "highlight border size of the selected map"
seta hud_panel_itemstime_pos "" "position of this base of the panel"
seta hud_panel_itemstime_size "" "size of this panel"
......@@ -355,3 +356,25 @@ seta hud_panel_quickmenu_bg_alpha "" "if set to something else than \"\" = overr
seta hud_panel_quickmenu_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_quickmenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_quickmenu_align "" "text alignment: 0 left, 0.5 center, 1 right"
seta hud_panel_scoreboard_pos "" "position of this base of the panel"
seta hud_panel_scoreboard_size "" "size of this panel"
seta hud_panel_scoreboard_bg "" "if set to something else than \"\" = override default background"
seta hud_panel_scoreboard_bg_color "" "if set to something else than \"\" = override default panel background color"
seta hud_panel_scoreboard_bg_color_team "" "override panel color with team color in team based games"
seta hud_panel_scoreboard_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
seta hud_panel_scoreboard_bg_border "" "if set to something else than \"\" = override default size of border around the background"
seta hud_panel_scoreboard_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_scoreboard_fadeinspeed "" "speed at which scoreboard fades in, higher is faster (0 = instant)"
seta hud_panel_scoreboard_fadeoutspeed "" "speed at which scoreboard fades out, higher is faster (0 = instant)"
seta hud_panel_scoreboard_respawntime_decimals "" "decimal places to show for the respawntime countdown display on the scoreboard"
seta hud_panel_scoreboard_table_bg_alpha "" "background alpha of a scoreboard table"
seta hud_panel_scoreboard_table_bg_scale "" "scale for the tiled scoreboard background"
seta hud_panel_scoreboard_table_fg_alpha "" "foreground alpha of a scoreboard table"
seta hud_panel_scoreboard_table_fg_alpha_self "" "self foreground alpha of a scoreboard table"
seta hud_panel_scoreboard_table_highlight "" "enable highlighting for rows and columns in scoreboard tables"
seta hud_panel_scoreboard_table_highlight_alpha "" "highlight alpha of a scoreboard table"
seta hud_panel_scoreboard_table_highlight_alpha_self "" "self highlight alpha of a scoreboard table"
seta hud_panel_scoreboard_bg_teams_color_team "" "override panel team color in team tables"
seta hud_panel_scoreboard_accuracy_doublerows "" "use two rows instead of one"
seta hud_panel_scoreboard_accuracy_nocolors "" "don't use colors displaying accuracy stats"
This diff is collapsed.
......@@ -219,6 +219,7 @@ set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0.04
set g_balance_electro_secondary_stick 0
set g_balance_electro_secondary_touchexplode 0
set g_balance_electro_switchdelay_drop 0.15
set g_balance_electro_switchdelay_raise 0.15
......@@ -398,6 +399,7 @@ set g_balance_devastator_remote_damage 105
set g_balance_devastator_remote_edgedamage 40
set g_balance_devastator_remote_force 600
set g_balance_devastator_remote_jump_damage 70
set g_balance_devastator_remote_jump_force 0
set g_balance_devastator_remote_jump_radius 0
set g_balance_devastator_remote_jump_velocity_z_add 400
set g_balance_devastator_remote_jump_velocity_z_max 1500
......@@ -720,7 +722,7 @@ set g_balance_shockwave_melee_traces 10
set g_balance_shockwave_switchdelay_drop 0.15
set g_balance_shockwave_switchdelay_raise 0.15
set g_balance_shockwave_weaponreplace ""
set g_balance_shockwave_weaponstart 1
set g_balance_shockwave_weaponstart 0
set g_balance_shockwave_weaponstartoverride -1
set g_balance_shockwave_weaponthrowable 0
// }}}
......
......@@ -84,7 +84,7 @@ set g_balance_machinegun_reload_time 1.5
set g_balance_machinegun_solidpenetration 13.1
set g_balance_machinegun_spread_add 0.012
set g_balance_machinegun_spread_max 0.05
set g_balance_machinegun_spread_min 0.02
set g_balance_machinegun_spread_min 0
set g_balance_machinegun_sustained_ammo 1
set g_balance_machinegun_sustained_damage 25
set g_balance_machinegun_sustained_force 5
......@@ -219,6 +219,7 @@ set g_balance_electro_secondary_speed 1000
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0.04
set g_balance_electro_secondary_stick 0
set g_balance_electro_secondary_touchexplode 0
set g_balance_electro_switchdelay_drop 0.2
set g_balance_electro_switchdelay_raise 0.2
......@@ -301,7 +302,7 @@ set g_balance_vortex_charge_shot_multiplier 0
set g_balance_vortex_charge_start 0.5
set g_balance_vortex_charge_velocity_rate 0
set g_balance_vortex_primary_ammo 10
set g_balance_vortex_primary_animtime 0.95
set g_balance_vortex_primary_animtime 0.65
set g_balance_vortex_primary_damage 100
set g_balance_vortex_primary_damagefalloff_forcehalflife 0
set g_balance_vortex_primary_damagefalloff_halflife 0
......@@ -324,8 +325,8 @@ set g_balance_vortex_secondary_damagefalloff_maxdist 0
set g_balance_vortex_secondary_damagefalloff_mindist 0
set g_balance_vortex_secondary_force 0
set g_balance_vortex_secondary_refire 0
set g_balance_vortex_switchdelay_drop 0.25
set g_balance_vortex_switchdelay_raise 0.25
set g_balance_vortex_switchdelay_drop 0.2
set g_balance_vortex_switchdelay_raise 0.2
set g_balance_vortex_weaponreplace ""
set g_balance_vortex_weaponstart 0
set g_balance_vortex_weaponstartoverride -1
......@@ -398,6 +399,7 @@ set g_balance_devastator_remote_damage 70
set g_balance_devastator_remote_edgedamage 35
set g_balance_devastator_remote_force 300
set g_balance_devastator_remote_jump_damage 70
set g_balance_devastator_remote_jump_force 0
set g_balance_devastator_remote_jump_radius 0
set g_balance_devastator_remote_jump_velocity_z_add 400
set g_balance_devastator_remote_jump_velocity_z_max 1500
......@@ -776,15 +778,15 @@ set g_balance_arc_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_damage 30
set g_balance_hmg_force 10
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_spread_add 0.005
set g_balance_hmg_spread_max 0.06
set g_balance_hmg_spread_min 0.01
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
......