]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: c1389c7 26693a3)
Merge branch 'DefaultUser/armormega' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:24:31 +0000 (06:24 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:24:31 +0000 (06:24 +0000)
commitb4fbbbce9f643f769b92c35bc3185f31f53d80bc
tree720f76ee6ec3fc6cc73def5038431aee1479c05dtree | snapshot
parentc1389c740a4a144e46543e51296ad90ade3c365bcommit | diff
parent26693a3ac060825ce6c7f170d4e65f7ac2a1fb25commit | diff
Merge branch 'DefaultUser/armormega' into 'master'

Armor and Health name inconsistency

Fixes item name inconsistency (see Issue #1490) of Armor and Health by renaming HealthLarge to HealthBig and ArmorLarge to ArmorMega as well as all associated cvars

See https://gitlab.com/xonotic/xonotic-maps.pk3dir/tree/DefaultUser/entity_def for updated entity definitions for radiant

See merge request !387
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc diff1 | diff2 | blob | history