Commit aca03cc2 authored by BuddyFriendGuy's avatar BuddyFriendGuy

Merge branch 'master' into BuddyFriendGuy/reorganize_scoreboard

parents fc1db86e ab814154
Pipeline #56773119 passed with stage
in 10 minutes and 42 seconds
......@@ -29,7 +29,7 @@ test_sv_game:
- wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
- wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
- make
- EXPECT=1c17d1c4e3c98de30d9bec68a635f600
- EXPECT=c8d03ccf79956060c1a52637c74bb655
- HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
| tee /dev/stderr
| grep '^:'
......
Tue Jan 15 07:24:12 CET 2019
Sun Apr 14 07:25:31 CEST 2019
......@@ -187,6 +187,7 @@ seta hud_shownames_crosshairdistance_antioverlap 0 "allow antioverlap to work as
seta hud_shownames_self 0 "also include your own name to be shown when third person camera mode is on (chase_active/cl_eventchase)"
seta hud_shownames_status 1 "1 = draw health/armor status of teammates"
seta hud_shownames_statusbar_height 4 "height of status bar"
seta hud_shownames_statusbar_highlight 1 "Always highlight values of health and armor from 0 to half status bar"
seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"
seta hud_shownames_fontsize 12 "font size"
seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always"
......
//bot configuration:
// default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink
// use -1 for shirt-color or pants-color to get random colors
// note: only one tab is allowed as separator
// enable indentation with elastic tab stops if you want to make sense of it all
//
// WARNING: Only ONE tab is allowed as separator.
//
// TIP: Enable indentation with elastic tab stops if you want to make sense of it all.
//
//name model skin shirt pants team keyboard use moving dodging ping weapon use aggressivity range aiming calmhand mouse fightthink aithink
Hellfire ignis 0 4 0 0 0 0 -0.5 -1 1 1 -0.5 -1 -1 2 0.5 -1
Toxic gakmasked 0 14 7 0 -1 -1.5 -0.5 0 1 0 0 0 2 -0.5 -0.5 1
......
......@@ -117,9 +117,9 @@ alias menu_showquitdialog "menu_cmd directmenu Quit"
alias menu_showmonstertools "menu_cmd directmenu MonsterTools"
// command executed before loading a map by the menu
// makes sure maxplayers is at least minplayers or bot_number + 1
// makes sure maxplayers is at least minplayers or minplayers_per_team * 4 or bot_number + 1
alias _menu_loadmap_prepare_maxpl "maxplayers $_menu_loadmap_maxplayers"
alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow"
alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max minplayers_per_team 4 mul max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow"
// ==========================================================
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5632,7 +5632,7 @@ effect tr_hagar
trailspacing 16
underwater
velocityjitter 16 16 16
effect damage_laser
effect damage_blaster
type smoke
airfriction -0.350000
alpha 128 16 128
......@@ -5667,7 +5667,7 @@ effect damage_shotgun
originjitter 1 1 1
size 8 16
tex 0 8
effect damage_shotgun_alien
effect alien_damage_shotgun
type blood
airfriction 1
alpha 256 256 64
......@@ -5681,7 +5681,7 @@ effect damage_shotgun_alien
tex 24 32
velocityjitter 64 64 64
velocitymultiplier 5
effect damage_shotgun_alien
effect alien_damage_shotgun
type alphastatic
alpha 100 256 400
color 0x000000 0x204010
......@@ -5689,7 +5689,7 @@ effect damage_shotgun_alien
originjitter 1 1 1
size 8 16
tex 0 8
effect damage_shotgun_robot
effect robot_damage_shotgun
type blood
airfriction 1
alpha 256 256 64
......@@ -5703,7 +5703,7 @@ effect damage_shotgun_robot
tex 24 32
velocityjitter 64 64 64
velocitymultiplier 5
effect damage_shotgun_robot
effect robot_damage_shotgun
type alphastatic
alpha 100 256 400
color 0x000000 0x301860
......@@ -5711,7 +5711,7 @@ effect damage_shotgun_robot
originjitter 1 1 1
size 8 16
tex 0 8
effect damage_uzi
effect damage_machinegun
type blood
airfriction 1
alpha 256 256 64
......@@ -5725,14 +5725,14 @@ effect damage_uzi
tex 24 32
velocityjitter 32 32 32
velocitymultiplier 5
effect damage_uzi
effect damage_machinegun
type alphastatic
alpha 100 256 400
color 0x000000 0x420000
count 1
size 6 12
tex 0 8
effect damage_uzi_alien
effect alien_damage_machinegun
type blood
airfriction 1
alpha 256 256 64
......@@ -5746,14 +5746,14 @@ effect damage_uzi_alien
tex 24 32
velocityjitter 32 32 32
velocitymultiplier 5
effect damage_uzi_alien
effect alien_damage_machinegun
type alphastatic
alpha 100 256 400
color 0x000000 0x204010
count 1
size 6 12
tex 0 8
effect damage_uzi_robot
effect robot_damage_machinegun
type blood
airfriction 1
alpha 256 256 64
......@@ -5767,7 +5767,7 @@ effect damage_uzi_robot
tex 24 32
velocityjitter 32 32 32
velocitymultiplier 5
effect damage_uzi_robot
effect robot_damage_machinegun
type alphastatic
alpha 100 256 400
color 0x000000 0x301860
......@@ -5798,7 +5798,7 @@ effect damage_minelayer
size 4 8
tex 0 8
velocityjitter 11 11 50
effect damage_grenadelauncher
effect damage_mortar
type smoke
alpha 512 64 1024
color 0x8f0d00 0xff5a00
......@@ -5810,7 +5810,7 @@ effect damage_grenadelauncher
size 4 8
tex 48 55
velocityjitter 22 22 50
effect damage_grenadelauncher
effect damage_mortar
type alphastatic
alpha 128 32 128
color 0x000000 0x111111
......@@ -5822,6 +5822,46 @@ effect damage_grenadelauncher
size 4 8
tex 0 8
velocityjitter 11 11 50
effect damage_arc
type static
airfriction -0.650000
alpha 48 8 48
color 0x66ffff 0x2288ff
count 2
gravity -0.000100
liquidfriction 0.600000
notunderwater
originjitter 2 2 2
rotate 180 360 -30 30
sizeincrease -14
size 4 8
tex 47 47
velocityjitter 6 6 12
effect damage_arc
type smoke
airfriction -0.500000
alpha 64 16 64
color 0x2244ff 0x002266
count 4
notunderwater
originjitter 3 3 3
rotate 0 180 -30 30
sizeincrease 10
size 3 6
tex 0 8
velocityjitter 0.3 0.3 0.5
effect damage_arc
type spark
airfriction 1
alpha 768 64 256
bounce 1.500000
color 0x003090 0x00CCFF
count 0.500000
gravity 0.150000
liquidfriction 0.600000
size 1 1
tex 66 68
velocityjitter 24 24 24
effect damage_electro
type static
airfriction -0.500000
......@@ -5914,7 +5954,7 @@ effect damage_hlac
size 2 4
tex 0 8
velocityjitter 0.4 0.4 0.6
effect damage_nex
effect damage_vortex
type static
airfriction -0.500000
alpha 64 8 64
......@@ -5928,7 +5968,7 @@ effect damage_nex
size 5 10
tex 47 47
velocityjitter 8 8 16
effect damage_nex
effect damage_vortex
type smoke
airfriction -0.350000
alpha 64 16 64
......@@ -5940,7 +5980,7 @@ effect damage_nex
size 4 8
tex 0 8
velocityjitter 0.5 0.5 0.8
effect damage_nex
effect damage_vortex
type spark
airfriction 2
alpha 255 255 112
......@@ -5953,7 +5993,7 @@ effect damage_nex
tex 41 41
velocityjitter 100 100 300
velocitymultiplier 3
effect damage_minstanex
effect damage_vaporizer
type static
airfriction -0.500000
alpha 64 8 64
......@@ -5967,7 +6007,7 @@ effect damage_minstanex
size 5 10
tex 47 47
velocityjitter 8 8 16
effect damage_minstanex
effect damage_vaporizer
type smoke
airfriction -0.350000
alpha 64 16 64
......@@ -5979,7 +6019,7 @@ effect damage_minstanex
size 4 8
tex 0 8
velocityjitter 0.5 0.5 0.8
effect damage_minstanex
effect damage_vaporizer
type spark
airfriction 2
alpha 255 255 112
......@@ -6127,7 +6167,7 @@ effect damage_fireball
size 4 8
tex 0 8
velocityjitter 11 11 50
effect damage_rocketlauncher
effect damage_devastator
type smoke
alpha 512 64 1024
color 0x8f0c00 0xff2a00
......@@ -6139,7 +6179,7 @@ effect damage_rocketlauncher
size 5 10
tex 48 55
velocityjitter 22 22 30
effect damage_rocketlauncher
effect damage_devastator
type alphastatic
alpha 128 32 128
color 0x000000 0x111111
......
This diff is collapsed.
This diff is collapsed.
/html/
/*.pk3
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
......@@ -115,7 +115,7 @@ void Announcer_Gamestart()
previous_game_starttime = startTime;
}
#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN { \
#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \
if(announcer_##minute##min) { \
if(timeleft > minute * 60) \
announcer_##minute##min = false; \
......@@ -125,7 +125,7 @@ void Announcer_Gamestart()
Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
} \
} \
} MACRO_END
MACRO_END
void Announcer_Time()
{
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.