Merge branch 'NewCoordinateSystem'

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface_Solution.v12.suo
This commit is contained in:
Regalis
2015-12-17 18:29:26 +02:00
105 changed files with 2401 additions and 1288 deletions
+11 -2
View File
@@ -9,8 +9,7 @@
hovercolor="0.8, 0.8, 0.8, 1.0"
selectedcolor="1.0, 0.82, 0.05, 1.0"
outlinecolor="0.5, 0.57, 0.6, 1.0">
outlinecolor="0.5, 0.57, 0.6, 1.0">
</GUIFrame>
<GUIButton
@@ -79,5 +78,15 @@
<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"/>
</GUIMessageBox>
<GUIProgressBar
padding="5.0, 5.0, 5.0, 5.0"
color="0.0, 0.0, 0.0, 0.5"
hovercolor="0.0, 0.0, 0.0, 0.5"
selectedcolor="0.0, 0.0, 0.0, 0.5"
outlinecolor="0.5, 0.57, 0.6, 1.0">
</GUIProgressBar>
</style>