Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chests, human female head changes

Browse Source
This commit is contained in:
Pfauenauge90 2019-07-22 01:39:26 +02:00
parent 3559926a02
commit 870229cd1c
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/src/comp/body/object.rs
View File

@ -35,10 +35,6 @@ impl Body {
}
}
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
const ALL_OBJECTS: [Body; 24] = [
Body::Bomb,
Body::Scarecrow,
@ -65,32 +61,3 @@ const ALL_OBJECTS: [Body; 24] = [
Body::PotionGreen,
Body::Crate,
];
=======
const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::Pumpkin, Body::Campfire];
>>>>>>> Add campfire
=======
const ALL_OBJECTS: [Body; 5] = [
=======
const ALL_OBJECTS: [Body; 12] = [
>>>>>>> added lanterns and potions
=======
const ALL_OBJECTS: [Body; 16] = [
>>>>>>> MOAR Pumpkins!
Body::Bomb,
Body::Scarecrow,
Body::Chest,
Body::Pumpkin1,
Body::Pumpkin2,
Body::Pumpkin3,
Body::Pumpkin4,
Body::Pumpkin5,
Body::Campfire,
Body::LanternGround,
Body::LanternGroundOpen,
Body::LanternStanding,
Body::LanternStanding2,
Body::PotionRed,
Body::PotionBlue,
Body::PotionGreen,
];
>>>>>>> formatting