]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7e0a1d 4260676)
Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)
New features: Ammo and Darkness nades. Improve nades. Fix turrets target and when Tesla turret owner's friend attacks against owner

See merge request xonotic/xonotic-data.pk3dir!876


Trivial merge