]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorotta8634 <k9wolf@pm.me>
Sat, 25 Jan 2025 19:28:26 +0000 (03:28 +0800)
committerotta8634 <k9wolf@pm.me>
Sat, 25 Jan 2025 19:28:26 +0000 (03:28 +0800)
commit40ffe038cbb3f02ef119ef32ff268244f41b2c51
tree9d019c9a7e7f637484fe3cd578ee6f1687568272
parenta657edd12655a4fe86802f5fe2a3223cff021c5b
parent83485ad43dc7a7b14da32af94ad4c7da619f713d
Merge branch 'master' into TimePath/guide
60 files changed:
qcsrc/common/items/item/ammo.qh
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/items/item/jetpack.qh
qcsrc/common/mutators/mutator/buffs/buff/ammo.qh
qcsrc/common/mutators/mutator/buffs/buff/bash.qh
qcsrc/common/mutators/mutator/buffs/buff/disability.qh
qcsrc/common/mutators/mutator/buffs/buff/flight.qh
qcsrc/common/mutators/mutator/buffs/buff/inferno.qh
qcsrc/common/mutators/mutator/buffs/buff/jump.qh
qcsrc/common/mutators/mutator/buffs/buff/luck.qh
qcsrc/common/mutators/mutator/buffs/buff/magnet.qh
qcsrc/common/mutators/mutator/buffs/buff/medic.qh
qcsrc/common/mutators/mutator/buffs/buff/resistance.qh
qcsrc/common/mutators/mutator/buffs/buff/swapper.qh
qcsrc/common/mutators/mutator/buffs/buff/vampire.qh
qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/nades/nade/ammo.qh
qcsrc/common/mutators/mutator/nades/nade/darkness.qh
qcsrc/common/mutators/mutator/nades/nade/entrap.qh
qcsrc/common/mutators/mutator/nades/nade/heal.qh
qcsrc/common/mutators/mutator/nades/nade/ice.qh
qcsrc/common/mutators/mutator/nades/nade/monster.qh
qcsrc/common/mutators/mutator/nades/nade/napalm.qh
qcsrc/common/mutators/mutator/nades/nade/normal.qh
qcsrc/common/mutators/mutator/nades/nade/spawn.qh
qcsrc/common/mutators/mutator/nades/nade/translocate.qh
qcsrc/common/mutators/mutator/nades/nade/veil.qh
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/nades/nades.qh
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okhmg.qh
qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
qcsrc/common/mutators/mutator/overkill/oknex.qh
qcsrc/common/mutators/mutator/overkill/okrpc.qh
qcsrc/common/mutators/mutator/overkill/okshotgun.qh
qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc
qcsrc/common/mutators/mutator/powerups/powerup/shield.qc
qcsrc/common/mutators/mutator/powerups/powerup/speed.qc
qcsrc/common/mutators/mutator/powerups/powerup/strength.qc
qcsrc/common/mutators/mutator/powerups/powerups.qh
qcsrc/common/mutators/mutator/status_effects/status_effect/superweapons.qh
qcsrc/common/weapons/weapon/arc.qh
qcsrc/common/weapons/weapon/blaster.qh
qcsrc/common/weapons/weapon/crylink.qh
qcsrc/common/weapons/weapon/devastator.qh
qcsrc/common/weapons/weapon/electro.qh
qcsrc/common/weapons/weapon/fireball.qh
qcsrc/common/weapons/weapon/hagar.qh
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hlac.qh
qcsrc/common/weapons/weapon/hook.qh
qcsrc/common/weapons/weapon/machinegun.qh
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/shockwave.qh
qcsrc/common/weapons/weapon/shotgun.qh
qcsrc/common/weapons/weapon/vaporizer.qh
qcsrc/common/weapons/weapon/vortex.qh
qcsrc/menu/xonotic/guide/guide.qh