mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-24 13:01:48 +00:00
a96d6ab072
# Conflicts: # src/g_level.cpp # src/p_3dfloors.cpp # src/p_lnspec.cpp # src/p_saveg.cpp # src/p_spec.cpp # src/r_bsp.cpp # src/r_data/r_interpolate.cpp # src/r_data/r_translate.cpp # src/r_data/sprites.cpp # src/r_defs.h # src/r_sky.h # src/stats.h # src/textures/texturemanager.cpp # src/textures/textures.h # src/version.h # src/win32/fb_d3d9.cpp # src/win32/hardware.cpp # src/win32/i_system.cpp # wadsrc/static/actors/doom/doomarmor.txt # wadsrc/static/compatibility.txt # wadsrc/static/language.enu # wadsrc/static/mapinfo/common.txt # wadsrc/static/menudef.txt # wadsrc/static/xlat/eternity.txt |
||
|---|---|---|
| .. | ||
| arachnotron.txt | ||
| archvile.txt | ||
| bossbrain.txt | ||
| bruiser.txt | ||
| cacodemon.txt | ||
| cyberdemon.txt | ||
| deadthings.txt | ||
| demon.txt | ||
| doomammo.txt | ||
| doomarmor.txt | ||
| doomartifacts.txt | ||
| doomdecorations.txt | ||
| doomhealth.txt | ||
| doomimp.txt | ||
| doomkeys.txt | ||
| doommisc.txt | ||
| doomplayer.txt | ||
| doomweapons.txt | ||
| fatso.txt | ||
| keen.txt | ||
| lostsoul.txt | ||
| painelemental.txt | ||
| possessed.txt | ||
| revenant.txt | ||
| scriptedmarine.txt | ||
| spidermaster.txt | ||
| stealthmonsters.txt | ||