natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Skarn
2020-11-04 00:36:30 +03:00
parent 5a726a9cf5 7a01cd880b
commit a7569e00e1
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/noggit/ui/SettingsPanel.cpp
View File

@@ -182,7 +182,9 @@ namespace noggit
_wireframe_width->setSingleStep(0.1);
wireframe_layout->addRow ("Width", _wireframe_width);
wireframe_layout->addRow ("Color", _wireframe_color = new color_widgets::ColorSelector (wireframe_box));
_wireframe_color->setColor(Qt::white);
layout->addRow (wireframe_box);

10
src/noggit/ui/font_noggit.hpp
View File

@@ -88,16 +88,20 @@ namespace noggit
VISIBILITY_WMO_DOODADS = 0xf8aa,
VISIBILITY_DOODADS = 0xf8ab,
VISIBILITY_WITH_BOX = 0xf8ac,
VISIBILITY_LINES = 0xf8ad,
VISIBILITY_UNUSED = 0xf8ad,
VISIBILITY_TERRAIN = 0xf8ae,
VISIBILITY_HOLE_LINES = 0xf8af,
VISIBILITY_LINES = 0xf8af,
VISIBILITY_WIREFRAME = 0xf8b0,
VISIBILITY_CONTOURS = 0xf8b1,
VISIBILITY_FOG = 0xf8b2,
VISIBILITY_WATER = 0xf8b3,
VISIBILITY_GROUNDEFFECTS= 0xf8b4,
VISIBILITY_FLIGHT_BOUNDS = 0xf8b5,
VISIBILITY_HIDDEN_MODELS = 0xf8b6
VISIBILITY_HIDDEN_MODELS = 0xf8b6,
VISIBILITY_HOLE_LINES = 0xf8b7,
VISIBILITY_ANIMATION = 0xf8b8,
VISIBILITY_ANIMATION_2 = 0xf8b8,
VISIBILITY_LIGHT = 0xf8ba
};
};