]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorotta8634 <k9wolf@pm.me>
Mon, 3 Feb 2025 11:32:59 +0000 (19:32 +0800)
committerotta8634 <k9wolf@pm.me>
Mon, 3 Feb 2025 11:32:59 +0000 (19:32 +0800)
commitb002220841b883dee5d5c9492d55f2161aa3816e
tree3c60567da6446c3c59b2be298bbec1c7d9e4d139
parent3a2f5cffd2a2a0094e918f53a311d168e7f6b385
parent70fd977981a46194cf6b2907f1eb8025f63b06a0
Merge branch 'master' into TimePath/guide
39 files changed:
qcsrc/common/items/item.qh
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/mutators/base.qh
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/nades/nades.qh
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/mutators/mutator/overkill/okrpc.qc
qcsrc/common/turrets/turret.qh
qcsrc/common/turrets/turret/plasma.qc
qcsrc/common/turrets/turret/plasma_dual.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/vehicles/vehicle.qh
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qh
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/mortar.qh
qcsrc/common/weapons/weapon/porto.qh
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/rifle.qh
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/seeker.qh
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/tuba.qh
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/menu/xonotic/maplist.qc