Merge branch 'pending-release' into 'master'

Merge pending-release into master

Closes #204

See merge request xonotic/xonotic-maps.pk3dir!171

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 532ce48ded0d304ca8ca83015e263d8766795c9e..e0b00f600bf2ac44a2312bfa10f03917d00b0841 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -456,7 +456,7 @@ Acts as a checkpoint to re-spawn at
 </point>
 
 <point name="item_armor_mega" color=".4 .8 .4" box="-30 -30 0 30 30 70">
-Large Armor (default 100 armor points)
+Mega Armor (default 100 armor points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 30)</real>
 <real key="respawntimejitter" name="respawntimejitter">respawn time randomization +/- seconds (default: 0)</real>
@@ -485,7 +485,7 @@ Big Armor (default 50 armor points)
 modeldisabled=&quot;models/items/g_a50.md3&quot;
 </point>
 
-<point name="item_armor_medium" color=".4 .8 .4" box="-16 -16 0 16 16 48">
+<point name="item_armor_medium" color=".4 .8 .4" box="-30 -30 0 30 30 48">
 Medium Armor (default 25 armor points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 20)</real>
@@ -500,7 +500,7 @@ Medium Armor (default 25 armor points)
 modeldisabled=&quot;models/items/g_armormedium.md3&quot;
 </point>
 
-<point name="item_armor_small" color=".4 .8 .4" box="-16 -16 0 16 16 48">
+<point name="item_armor_small" color=".4 .8 .4" box="-30 -30 0 30 30 48">
 Small Armor (default 5 armor points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -610,7 +610,7 @@ Big Health (default 50 health points)
 modeldisabled=&quot;models/items/g_h50.md3&quot;
 </point>
 
-<point name="item_health_medium" color=".9 .3 .3" box="-16 -16 0 16 16 48">
+<point name="item_health_medium" color=".9 .3 .3" box="-30 -30 0 30 30 48">
 Medium Health (default 25 health points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -641,7 +641,7 @@ In Instagib, this randomly turns into either an invisibility, an extra lives or
 modeldisabled=&quot;models/items/g_h100.md3&quot;
 </point>
 
-<point name="item_health_small" color=".9 .3 .3" box="-16 -16 0 16 16 48">
+<point name="item_health_small" color=".9 .3 .3" box="-30 -30 0 30 30 48">
 Small Health (default 5 health points)
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>