]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin' into TimePath/guide
authorotta8634 <k9wolf@pm.me>
Fri, 9 May 2025 17:32:30 +0000 (01:32 +0800)
committerotta8634 <k9wolf@pm.me>
Fri, 9 May 2025 17:32:30 +0000 (01:32 +0800)
commit41feed4f96753158e9c561a46f9d012fd9b80f31
tree5982a95570f9b013077c23e841a5babfa6393129
parentf2f143148d73aa7427e1aa6858c36f4d0b5a1f1b
parent6513deb2e9f5be5ca1be468b0d287349f00a4d81
Merge remote-tracking branch 'origin' into TimePath/guide
20 files changed:
qcsrc/common/gamemodes/gamemode/cts/cts.qh
qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qh
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/items/item/pickup.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/mutators/mutator/nades/nade/darkness.qc
qcsrc/common/mutators/mutator/nades/nade/heal.qc
qcsrc/common/mutators/mutator/nades/nade/ice.qc
qcsrc/common/mutators/mutator/nades/nade/monster.qc
qcsrc/common/mutators/mutator/nades/nade/napalm.qc
qcsrc/common/mutators/mutator/nades/nade/normal.qc
qcsrc/common/mutators/mutator/powerups/powerups.qh
qcsrc/common/mutators/mutator/walljump/walljump.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/menu/xonotic/_mod.inc
qcsrc/menu/xonotic/_mod.qh