teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge branch 'master' of https://github.com/zinnschlag/openmw

Browse source
This commit is contained in:
Miroslav Puda 2013-05-21 17:04:17 +02:00
commit 48ac6e799b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwgui/dialogue.cpp
View file

@ -1,5 +1,6 @@
#include "dialogue.hpp"
#include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
#include "../mwbase/environment.hpp"

12
files/mygui/openmw_hud.layout
View file

@ -108,20 +108,20 @@
name="FPSBoxAdv">
<Property key="Visible" value="false"/>
<Widget type="TextBox" skin="NumFPS" position="3 3 71 17">
<Widget type="TextBox" skin="NumFPS" position="3 3 82 17">
<Property key="Caption" value="FPS: "/>
</Widget>
<Widget type="TextBox" skin="NumFPS" position="53 3 71 17" name="FPSCounterAdv"/>
<Widget type="TextBox" skin="NumFPS" position="53 3 82 17" name="FPSCounterAdv"/>
<Widget type="TextBox" skin="NumFPS" position="3 3 71 32">
<Widget type="TextBox" skin="NumFPS" position="3 3 82 32">
<Property key="Caption" value="Tri Count: "/>
</Widget>
<Widget type="TextBox" skin="NumFPS" position="53 3 71 32" name="TriangleCounter"/>
<Widget type="TextBox" skin="NumFPS" position="53 3 82 32" name="TriangleCounter"/>
<Widget type="TextBox" skin="NumFPS" position="3 3 71 47">
<Widget type="TextBox" skin="NumFPS" position="3 3 82 47">
<Property key="Caption" value="Batch Count: "/>
</Widget>
<Widget type="TextBox" skin="NumFPS" position="53 3 71 47" name="BatchCounter"/>
<Widget type="TextBox" skin="NumFPS" position="53 3 82 47" name="BatchCounter"/>
</Widget>
</Widget>