Dragging bodies up stairs, attempt to fix legs going through torso, fixe GuiComponent.MouseOn getting stuck when switching to edit screen

This commit is contained in:
Regalis
2015-11-28 00:21:45 +02:00
parent c9cc94f701
commit 6f2db08be0
16 changed files with 226 additions and 114 deletions
@@ -91,13 +91,13 @@
<joint limb1="4" limb1anchor="0,-16" limb2="5" limb2anchor="-2,19" lowerlimit="0" upperlimit="170"/>
<!-- body to left leg -->
<joint limb1="12" limb1anchor="0,-1" limb2="6" limb2anchor="0,14" lowerlimit="-30" upperlimit="140"/>
<joint limb1="6" limb1anchor="0,-15" limb2="7" limb2anchor="0,20" lowerlimit="-140" upperlimit="0"/>
<joint limb1="12" limb1anchor="0,-1" limb2="6" limb2anchor="0,14" lowerlimit="-30" upperlimit="120"/>
<joint limb1="6" limb1anchor="0,-15" limb2="7" limb2anchor="0,20" lowerlimit="-120" upperlimit="0"/>
<joint limb1="7" limb1anchor="-3,-21" limb2="8" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>
<!-- body to right leg -->
<joint limb1="12" limb1anchor="0,-1" limb2="9" limb2anchor="0,14" lowerlimit="-30" upperlimit="140"/>
<joint limb1="9" limb1anchor="0,-15" limb2="10" limb2anchor="0,20" lowerlimit="-140" upperlimit="0"/>
<joint limb1="12" limb1anchor="0,-1" limb2="9" limb2anchor="0,14" lowerlimit="-30" upperlimit="120"/>
<joint limb1="9" limb1anchor="0,-15" limb2="10" limb2anchor="0,20" lowerlimit="-120" upperlimit="0"/>
<joint limb1="10" limb1anchor="-3,-21" limb2="11" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>
</ragdoll>
Binary file not shown.

After

Width:  |  Height:  |  Size: 536 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 KiB

+8 -4
View File
@@ -1,7 +1,8 @@
<locationtypes>
<None
commonness="3"
symbol="Content/Map/beaconSymbol.png">
symbol="Content/Map/beaconSymbol.png"
background="Content/Map/beaconbackground.jpg">
<nameformats
f0="[name]"
f1="[name]"
@@ -12,7 +13,8 @@
<City
commonness="3"
hireablecharacters="true"
symbol="Content/Map/citySymbol.png">
symbol="Content/Map/citySymbol.png"
background="Content/Map/citybackground.jpg">
<nameformats
f0="The City of [name]"
f1="[name] City"
@@ -23,7 +25,8 @@
<Military
commonness="1"
hireablecharacters="true"
symbol="Content/Map/militarySymbol.png">
symbol="Content/Map/militarySymbol.png"
background="Content/Map/militarybackground.jpg">
<nameformats
f0="[name] Outpost"
f1="[name] Facility"
@@ -34,7 +37,8 @@
<Research
commonness="1"
hireablecharacters="true"
symbol="Content/Map/researchSymbol.png">
symbol="Content/Map/researchSymbol.png"
background="Content/Map/citybackground.jpg">
<nameformats
f0="[name] Research Facility"
f1="[name] Research Center"
Binary file not shown.

After

Width:  |  Height:  |  Size: 276 KiB

+1 -3
View File
@@ -2,7 +2,7 @@
<style>
<GUIFrame
padding="40.0, 40.0, 40.0, 40.0"
color="1.0, 1.0, 1.0, 1.0"
color="0.0, 0.0, 0.0, 0.7"
textcolor="0.0, 0.0, 0.0, 1.0"
@@ -11,8 +11,6 @@
outlinecolor="0.5, 0.57, 0.6, 1.0">
<Sprite texture="Content/UI/uiBackground.png" size="0.0, 0.0" sourcerect ="0.0, 90.0, 0.0, 100.0"/>
<Sprite texture="Content/UI/uiBackground.png" size="0.0, 1.0" sourcerect ="0.0, 0.0, 0.0, 90.0"/>
</GUIFrame>
<GUIButton