Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Leon Grünewald 2024-11-05 11:21:32 +01:00
commit 2001d7c134

View file

@ -1,4 +1,4 @@
# This file was generated by GZDoom <unknown version> on 2021-01-28 23:10:22
# This file was generated by GZDoom g4.12.2-m on 2024-08-11 19:07:16
# These are the directories to automatically search for IWADs.
# Each directory should be on a separate line, preceded by Path=
[IWADSearch.Directories]
@ -99,7 +99,7 @@ Path=/home/dhalucario/.config/gzdoom/autoexec.cfg
[doom.id.doom1.ultimate.xbox.Autoload]
[doom.id.doom2.wadsmoosh.Autoload]
[doom.id.wadsmoosh.Autoload]
[doom.id.doom1.unity.Autoload]
@ -163,37 +163,41 @@ Path=/home/dhalucario/.config/gzdoom/autoexec.cfg
[woolball.rotwb.Autoload]
[doom.id.doom2.wadsmoosh.Autoload]
[Shrine.AutoExec]
Path=/home/dhalucario/.config/gzdoom/autoexec.cfg
[LastRun]
Version=221
Version=225
[GlobalSettings]
I_FriendlyWindowTitle=1
adl_bank=1056964608
adl_chips_count=1056964608
adl_custom_bank=
adl_emulator_id=1056964608
adl_fullpan=true
adl_run_at_pcm_rate=true
adl_use_custom_bank=true
adl_volume_model=1056964608
autoloadbrightmaps=false
autoloadlights=false
autoloadwidescreen=true
autosavecount=4
autosavenum=3
autosavenum=0
chase_dist=90
chase_height=-8
cl_capfps=false
cl_defaultconfiguration=0
cl_noprediction=false
cl_oldfreelooklimit=false
cl_predict_lerpscale=0.05000000074505806
cl_predict_lerpscale=0.05
cl_predict_lerpthreshold=2
cl_predict_specials=true
cl_restartondeath=false
cl_rubberband_minmove=20
cl_rubberband_scale=0.3
cl_rubberband_threshold=20
cl_run=false
cl_scaleweaponfov=1
cl_waitforsave=true
con_4bitansi=false
con_buffersize=-1
@ -209,18 +213,18 @@ enablescriptscreenshot=false
fluid_chorus=false
fluid_chorus_depth=8
fluid_chorus_level=1
fluid_chorus_speed=0.30000001192092896
fluid_chorus_speed=0.3
fluid_chorus_type=0
fluid_chorus_voices=3
fluid_gain=0.5
fluid_interp=1
fluid_lib=
fluid_patchset=gzdoom
fluid_patchset=/app/share/games/doom/soundfonts/gzdoom.sf2
fluid_reverb=false
fluid_reverb_damping=0.23000000417232513
fluid_reverb_level=0.5699999928474426
fluid_reverb_roomsize=0.6100000143051147
fluid_reverb_width=0.7599999904632568
fluid_reverb_damping=0.23
fluid_reverb_level=0.57
fluid_reverb_roomsize=0.61
fluid_reverb_width=0.76
fluid_samplerate=0
fluid_threads=1
fluid_voices=128
@ -229,7 +233,7 @@ gl_billboard_faces_camera=false
gl_billboard_mode=0
gl_billboard_particles=true
gl_cachenodes=true
gl_cachetime=0.6000000238418579
gl_cachetime=0.6
gl_debug=false
gl_debug_breakpoint=false
gl_debug_level=0
@ -240,9 +244,9 @@ gl_es=false
gl_finishbeforeswap=false
gl_fxaa=0
gl_lens=false
gl_lens_chromatic=1.1200000047683716
gl_lens_k=-0.11999999731779099
gl_lens_kcube=0.10000000149011612
gl_lens_chromatic=1.12
gl_lens_k=-0.12
gl_lens_kcube=0.1
gl_light_particles=true
gl_light_shadowmap=false
gl_light_sprites=true
@ -254,8 +258,8 @@ gl_multisample=1
gl_multithread=true
gl_no_skyclear=false
gl_particles_style=2
gl_pipeline_depth=0
gl_plane_reflection=true
gl_render_precise=false
gl_satformula=1
gl_seamless=false
gl_shadowmap_filter=1
@ -264,7 +268,7 @@ gl_sort_textures=false
gl_sprite_blend=false
gl_ssao=0
gl_ssao_portals=1
gl_ssao_strength=0.699999988079071
gl_ssao_strength=0.7
gl_texture_filter=4
gl_texture_filter_anisotropic=8
gl_texture_hqresize_maxinputsize=512
@ -278,6 +282,9 @@ gl_usecolorblending=true
gme_stereodepth=0
gus_memsize=0
gus_patchdir=
hw_force_cambbpref=false
i_discordrpc=false
i_pauseinbackground=true
i_soundinbackground=false
inter_subtitles=false
invertmouse=false
@ -287,11 +294,10 @@ longsavemessages=true
lookstrafe=false
m_blockcontrollers=false
m_cleanscale=false
m_filter=false
m_forward=1
m_pitch=1
m_sensitivity_x=4
m_sensitivity_y=2
m_sensitivity_x=0.519687
m_sensitivity_y=0.519687
m_show_backbutton=0
m_showinputgrid=0
m_side=2
@ -311,18 +317,18 @@ mod_interp=2
mod_samplerate=0
mod_volramp=2
mouse_capturemode=1
mus_calcgain=true
mus_enabled=true
mus_usereplaygain=false
nointerscrollabort=false
nomonsterinterpolation=false
opl_core=0
opl_fullpan=false
opl_numchips=0
opl_numchips=1
opn_chips_count=0
opn_custom_bank=
opn_emulator_id=0
opn_fullpan=false
opn_run_at_pcm_rate=false
opn_use_custom_bank=false
os_isanyof=true
png_gamma=0
png_level=5
@ -330,6 +336,10 @@ queryiwad=true
quicksavenum=-1
quicksaverotation=false
quicksaverotationcount=4
r_actorspriteshadow=1
r_actorspriteshadowalpha=0.5
r_actorspriteshadowdist=1500
r_actorspriteshadowfadeheight=0
r_blendmethod=false
r_dynlights=true
r_fakecontrast=1
@ -345,6 +355,7 @@ r_models=true
r_multithreaded=1
r_noaccel=false
r_quakeintensity=1
r_skipmats=false
r_sprite_distance_cull=0
r_spriteadjust=2
r_ticstability=true
@ -363,8 +374,9 @@ snd_backend=openal
snd_buffersize=0
snd_channels=128
snd_efx=true
snd_enabled=true
snd_hrtf=-1
snd_mastervolume=0.049999844282865524
snd_mastervolume=0.496875
snd_mididevice=-5
snd_midiprecache=false
snd_musicvolume=0.5
@ -393,7 +405,7 @@ timidity_reverb=0
timidity_reverb_level=0
timidity_surround_chorus=false
timidity_temper_control=false
timidity_tempo_adjust=0
timidity_tempo_adjust=0.25
turnspeedsprintfast=1280
turnspeedsprintslow=320
turnspeedwalkfast=640
@ -426,10 +438,14 @@ vid_vsync=false
vk_debug=false
vk_debug_callstack=true
vk_device=0
vk_exclusivefullscreen=false
vk_hdr=false
vk_raytrace=false
vr_hunits_per_meter=41
vr_ipd=0.06199999898672104
vr_screendist=0.800000011920929
vr_ipd=0.062
vr_mode=0
vr_screendist=0.8
vr_swap_eyes=false
wildmidi_config=
wildmidi_enhanced_resampling=false
wildmidi_reverb=false
@ -440,12 +456,14 @@ win_x=0
win_y=0
xbrz_centerdirectionbias=4
xbrz_colorformat=0
xbrz_dominantdirectionthreshold=3.5999999046325684
xbrz_dominantdirectionthreshold=3.6
xbrz_equalcolortolerance=30
xbrz_luminanceweight=1
xbrz_steepdirectionthreshold=2.200000047683716
xbrz_steepdirectionthreshold=2.2
[GlobalSettings.Unknown]
gl_render_precise=false
m_filter=false
[Shrine.Player]
autoaim=35
@ -813,3 +831,414 @@ DownArrow=+am_pandown
MWheelUp=am_zoom 1.2
MWheelDown=am_zoom -1.2
[Doom.Player]
autoaim=35
classicflight=false
color=40 cf 00
colorset=0
fov=90
fviewbob=true
gender=male
movebob=0.25
name=Player
neverswitchonpickup=false
playerclass=Fighter
skin=base
stillbob=0
team=255
vertspread=false
wbobfire=0
wbobspeed=1
wi_noautostartmap=false
[Doom.ConsoleVariables]
addrocketexplosion=false
adl_bank=1056964608
adl_custom_bank=
adl_use_custom_bank=true
allcheats=false
am_backcolor=6c 54 40
am_cdwallcolor=4c 38 20
am_colorset=0
am_customcolors=true
am_drawmapback=1
am_efwallcolor=66 55 55
am_emptyspacemargin=0
am_fdwallcolor=88 70 58
am_followplayer=true
am_gridcolor=8b 5a 2b
am_interlevelcolor=ff 00 00
am_intralevelcolor=00 00 ff
am_linealpha=1
am_lineantialiasing=0
am_linethickness=1
am_lockedcolor=00 78 00
am_map_secrets=1
am_markcolor=2
am_markfont=AMMNUMx
am_notseencolor=6c 6c 6c
am_ovcdwallcolor=00 88 44
am_ovefwallcolor=00 88 44
am_overlay=0
am_ovfdwallcolor=00 88 44
am_ovinterlevelcolor=ff ff 00
am_ovlockedcolor=00 88 44
am_ovotherwallscolor=00 88 44
am_ovportalcolor=00 40 22
am_ovsecretsectorcolor=00 ff ff
am_ovsecretwallcolor=00 88 44
am_ovspecialwallcolor=ff ff ff
am_ovtelecolor=ff ff 00
am_ovthingcolor=e8 88 00
am_ovthingcolor_citem=e8 88 00
am_ovthingcolor_friend=e8 88 00
am_ovthingcolor_item=e8 88 00
am_ovthingcolor_monster=e8 88 00
am_ovthingcolor_ncmonster=e8 88 00
am_ovunexploredsecretcolor=00 ff ff
am_ovunseencolor=00 22 6e
am_ovwallcolor=00 ff 00
am_ovyourcolor=fc e8 d8
am_portalcolor=40 40 40
am_portaloverlay=true
am_rotate=0
am_secretsectorcolor=ff 00 ff
am_secretwallcolor=00 00 00
am_showcluster=false
am_showepisode=false
am_showgrid=false
am_showitems=false
am_showkeys=true
am_showkeys_always=false
am_showmaplabel=2
am_showmonsters=true
am_showsecrets=true
am_showthingsprites=0
am_showtime=true
am_showtotaltime=false
am_showtriggerlines=0
am_specialwallcolor=ff ff ff
am_textured=false
am_thingcolor=fc fc fc
am_thingcolor_citem=fc fc fc
am_thingcolor_friend=fc fc fc
am_thingcolor_item=fc fc fc
am_thingcolor_monster=fc fc fc
am_thingcolor_ncmonster=fc fc fc
am_thingrenderstyles=true
am_tswallcolor=88 88 88
am_unexploredsecretcolor=ff 00 ff
am_wallcolor=2c 18 08
am_xhaircolor=80 80 80
am_yourcolor=fc e8 d8
am_zoomdir=0
blood_fade_scalar=1
chat_substitution=false
chatmacro0=No
chatmacro1=I'm ready to kick butt!
chatmacro2=I'm OK.
chatmacro3=I'm not looking too good!
chatmacro4=Help!
chatmacro5=You suck!
chatmacro6=Next time, scumbag...
chatmacro7=Come here!
chatmacro8=I'll take care of it.
chatmacro9=Yes
cl_bbannounce=false
cl_bloodsplats=true
cl_bloodtype=0
cl_custominvulmapcolor1=00 00 1a
cl_custominvulmapcolor2=a6 a6 7a
cl_customizeinvulmap=false
cl_doautoaim=false
cl_gfxlocalization=3
cl_maxdecals=1024
cl_missiledecals=true
cl_nointros=false
cl_pufftype=0
cl_rockettrails=1
cl_showmultikills=true
cl_showsecretmessage=true
cl_showsprees=true
cl_spreaddecals=true
classic_scaling_factor=1
classic_scaling_pixelaspect=1.2
compatmode=0
con_alpha=0.75
con_centernotify=false
con_midtime=3
con_notablist=false
con_notifytime=3
con_pulsetext=false
con_scale=0
con_scaletext=0
crosshair=0
crosshaircolor=ff 00 00
crosshairforce=false
crosshairgrow=false
crosshairhealth=2
crosshairon=true
crosshairscale=0.5
dehload=0
dimamount=-1
dimcolor=ff d7 00
displaynametags=0
dlg_musicvolume=1
dlg_vgafont=false
gl_aalines=false
gl_bandedswlight=false
gl_bloom=false
gl_bloom_amount=1.4
gl_brightfog=false
gl_coronas=true
gl_enhanced_nightvision=true
gl_exposure_base=0.35
gl_exposure_min=0.35
gl_exposure_scale=1.3
gl_exposure_speed=0.05
gl_fogmode=2
gl_fuzztype=0
gl_interpolate_model_frames=true
gl_light_models=true
gl_lightadditivesurfaces=false
gl_lightmode=0
gl_menu_blur=-1
gl_paltonemap_powtable=2
gl_paltonemap_reverselookup=true
gl_precache=false
gl_scale_viewport=true
gl_sclipfactor=1.8
gl_sclipthreshold=10
gl_spriteclip=1
gl_tonemap=0
gl_weaponlight=8
hud_althud=false
hud_althud_forceinternal=false
hud_althudscale=0
hud_ammo_order=0
hud_ammo_red=25
hud_ammo_yellow=50
hud_armor_green=100
hud_armor_red=25
hud_armor_yellow=50
hud_aspectscale=true
hud_berserk_health=true
hud_health_green=100
hud_health_red=25
hud_health_yellow=50
hud_oldscale=true
hud_scale=0
hud_scalefactor=1
hud_showammo=2
hud_showangles=false
hud_showitems=false
hud_showlag=0
hud_showmonsters=true
hud_showscore=false
hud_showsecrets=true
hud_showstats=false
hud_showtime=0
hud_showtimestat=0
hud_showweapons=true
hud_swaphealtharmor=false
hud_timecolor=5
hudcolor_ltim=8
hudcolor_statnames=6
hudcolor_stats=3
hudcolor_time=6
hudcolor_titl=10
hudcolor_ttim=5
hudcolor_xyco=3
inter_classic_scaling=true
log_vgafont=false
lookspring=true
m_quickexit=false
msg=0
msg0color=11
msg1color=5
msg2color=2
msg3color=3
msg4color=3
msgmidcolor=11
msgmidcolor2=4
nametagcolor=5
nocheats=false
opn_custom_bank=
opn_use_custom_bank=false
paletteflash=0
pickup_fade_scalar=1
r_deathcamera=false
r_drawfuzz=1
r_maxparticles=4000
r_portal_recursions=4
r_rail_smartspiral=false
r_rail_spiralsparsity=1
r_rail_trailsparsity=1
r_skymode=2
r_vanillatrans=0
sb_cooperative_enable=true
sb_cooperative_headingcolor=6
sb_cooperative_otherplayercolor=2
sb_cooperative_yourplayercolor=3
sb_deathmatch_enable=true
sb_deathmatch_headingcolor=6
sb_deathmatch_otherplayercolor=2
sb_deathmatch_yourplayercolor=3
sb_teamdeathmatch_enable=true
sb_teamdeathmatch_headingcolor=6
screenblocks=10
setslotstrict=true
show_obituaries=true
snd_menuvolume=0.6
snd_pitched=false
st_oldouch=false
st_scale=0
transsouls=0.75
ui_screenborder_classic_scaling=true
uiscale=0
underwater_fade_scalar=1
vid_allowtrueultrawide=1
vid_cursor=None
vid_nopalsubstitutions=false
wi_cleantextscale=false
wi_percents=true
wi_showtotaltime=true
wipetype=1
[Doom.LocalServerInfo]
compatflags=0
compatflags2=0
forcewater=false
maxviewpitch=90
sv_corpsequeuesize=64
sv_disableautohealth=false
sv_dropstyle=0
sv_portal_recursions=4
sv_smartaim=0
[Doom.ConfigOnlyVariables]
[Doom.UnknownConsoleVariables]
[Doom.ConsoleAliases]
[Doom.Bindings]
1=slot 1
2=slot 2
3=slot 3
4=slot 4
5=slot 5
6=slot 6
7=slot 7
8=slot 8
9=slot 9
0=slot 0
-=sizedown
Equals=sizeup
Tab=togglemap
W=+forward
E=+use
T=messagemode
LeftBracket=invprev
RightBracket=invnext
Enter=invuse
A=+moveleft
S=+back
D=+moveright
`=toggleconsole
Shift=+speed
\=+showscores
X=crouch
Space=+jump
CapsLock=toggle cl_run
F1=menu_help
F2=menu_save
F3=menu_load
F4=menu_options
F5=menu_display
F6=quicksave
F7=menu_endgame
F8=togglemessages
F9=quickload
F10=menu_quit
F11=bumpgamma
F12=spynext
SysRq=screenshot
Pause=pause
Home=land
PgUp=+moveup
End=centerview
PgDn=+lookup
Ins=+movedown
Del=+lookdown
Mouse1=+attack
Mouse2=+altattack
Joy1=+use
Joy4=+jump
Joy5=weapprev
Joy6=weapnext
Joy7=pause
Joy8=menu_main
Joy10=crouch
POV1Up=togglemap
POV1Right=invnext
POV1Down=invuse
POV1Left=invprev
MWheelUp=weapprev
MWheelDown=weapnext
MWheelRight=invnext
MWheelLeft=invprev
Axis3Plus=+altattack
Axis6Plus=+attack
DPadUp=togglemap
DPadDown=invuse
DPadLeft=invprev
DPadRight=invnext
Pad_Start=menu_main
Pad_Back=pause
LThumb=crouch
LShoulder=weapprev
RShoulder=weapnext
LTrigger=+altattack
RTrigger=+attack
Pad_A=+use
Pad_Y=+jump
[Doom.DoubleBindings]
[Doom.AutomapBindings]
0=am_gobig
-=+am_zoomout
Equals=+am_zoomin
P=am_toggletexture
F=am_togglefollow
G=am_togglegrid
C=am_clearmarks
M=am_setmark
KP-=+am_zoomout
KP+=+am_zoomin
UpArrow=+am_panup
LeftArrow=+am_panleft
RightArrow=+am_panright
DownArrow=+am_pandown
Joy1=am_setmark
Joy2=am_clearmarks
Joy3=am_togglefollow
Joy5=+am_zoomout
Joy6=+am_zoomin
POV1Up=+am_panup
POV1Right=+am_panright
POV1Down=+am_pandown
POV1Left=+am_panleft
MWheelUp=am_zoom 1.2
MWheelDown=am_zoom -1.2
DPadUp=+am_panup
DPadDown=+am_pandown
DPadLeft=+am_panleft
DPadRight=+am_panright
LShoulder=+am_zoomout
RShoulder=+am_zoomin
Pad_A=am_setmark
Pad_B=am_clearmarks
Pad_X=am_togglefollow