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:
sshumakov3
2020-11-17 22:44:04 +03:00
parent 1bdb81dd86 241dd05329
commit a79ca86fb3
3 changed files with 86 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/noggit_font.ttf
View File

Binary file not shown.

73
src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui
View File

@@ -31,12 +31,12 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
@@ -67,6 +67,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -101,6 +107,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -135,6 +147,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -169,6 +187,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -203,6 +227,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -234,6 +264,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
@@ -353,6 +389,12 @@
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="accessibleName">
<string>overlay_label</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>Doodadset:</string>
</property>
@@ -376,6 +418,9 @@
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="accessibleName">
<string>overlay_label</string>
</property>
<property name="text">
<string>Move sensitivity:</string>
</property>
@@ -383,6 +428,12 @@
</item>
<item>
<widget class="QSlider" name="moveSensitivitySlider">
<property name="accessibleName">
<string>overlay_slider_horizontal</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="minimum">
<number>1</number>
</property>
@@ -424,6 +475,12 @@
</item>
<item>
<widget class="QLabel" name="label">
<property name="accessibleName">
<string>overlay_label</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>Light direction:</string>
</property>
@@ -454,6 +511,9 @@
<height>100</height>
</size>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="minimum">
<number>-180</number>
</property>
@@ -491,6 +551,9 @@
<height>100</height>
</size>
</property>
<property name="accessibleName">
<string>overlay_slider_vertical</string>
</property>
<property name="minimum">
<number>-180</number>
</property>
@@ -503,6 +566,12 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>true</bool>
</property>
</widget>
</item>
</layout>

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

@@ -101,7 +101,21 @@ namespace noggit
VISIBILITY_HOLE_LINES = 0xf8b7,
VISIBILITY_ANIMATION = 0xf8b8,
VISIBILITY_ANIMATION_2 = 0xf8b8,
VISIBILITY_LIGHT = 0xf8ba
VISIBILITY_LIGHT = 0xf8ba,
INFO = 0xf8bb,
VISIBILITY_PARTICLES = 0xf8bc,
TIME_NORMAL = 0xf8bd,
TIME_PAUSE = 0xf8be,
TIME_SPEED = 0xf8bf,
CAMERA_TURN = 0xf8c0,
CAMERA_SPEED_SLOWER = 0xf8c1,
CAMERA_SPEED_FASTER = 0xf8c2,
TEXTURE_PALETTE = 0xf8c3,
TEXTURE_PALETTE_FAVORITE = 0xf8c4,
MOUSE_INVERT = 0xf8c5,
UI_TOGGLE = 0xf8c6,
VIEW_MODE_2D = 0xf8c7,
VIEW_AXIS = 0xf8c8
};
};