Commit Graph

973 Commits

Author SHA1 Message Date
Balkron
75cd5f401f Merge branch 'master' of https://gitlab.com/sshumakov3/noggit-red.git
Conflicts:
	src/noggit/ui/SettingsPanel.ui
2020-11-06 03:36:48 +05:00
Balkron
cb31f24be4 Update SettingsPanel.ui 2020-11-06 03:34:37 +05:00
Skarn
43ff5674ac refactor and fix of setting saving 2020-11-06 01:32:55 +03:00
Skarn
4073f67d42 make SettingsPanel work once again 2020-11-06 01:17:36 +03:00
Balkron
a743462c93 Update SettingsPanel.ui 2020-11-06 03:00:24 +05:00
Balkron
00463cd089 Update SettingsPanel.ui 2020-11-06 02:58:26 +05:00
Balkron
026359f021 Update SettingsPanel.h and SettingsPanel.ui 2020-11-06 02:49:29 +05:00
Skarn
aefcd0def3 connections for new settings UI 2020-11-06 00:45:42 +03:00
Balkron
bc787fa2d0 Update About.ui, SettingsPanel.cpp, and SettingsPanel.ui 2020-11-06 02:30:29 +05:00
Skarn
f2df432e5a fix memory HUGE memory leaks in main UI 2020-11-05 23:34:00 +03:00
Skarn
9d8659aa64 Merge remote-tracking branch 'origin/master' 2020-11-05 21:07:22 +03:00
Skarn
59f3450bb8 fix lag in main menu 2020-11-05 21:06:45 +03:00
Balkron
12ba0625d8 About update
Main Menu UI fix
fix windows filesystem for maps
2020-11-05 22:17:04 +05:00
Skarn
2395ce5522 add missing file 2020-11-05 17:46:33 +03:00
Skarn
53ddbd66a1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/external/framelesshelper/examples/QMainWindow/TitleBar.ui
2020-11-05 17:23:56 +03:00
Skarn
07bc9bc97a map wizard: finish functionality
restructure framelesshelper
2020-11-05 17:21:12 +03:00
Balkron
e4f821528c Merge branch 'master' of https://gitlab.com/sshumakov3/noggit-red.git 2020-11-05 02:07:17 +05:00
Balkron
c4b469ea41 Update TitleBar icon 2020-11-05 02:07:09 +05:00
Skarn
15adddce89 display app name in window header 2020-11-04 22:54:04 +03:00
Skarn
071a4b513a fix tab alignment issue 2020-11-04 22:39:17 +03:00
Balkron
c9f5e3cfbe Merge branch 'master' of https://gitlab.com/sshumakov3/noggit-red.git 2020-11-05 00:23:31 +05:00
Balkron
3eff19efd2 UI fixes, new titlebar icons 2020-11-05 00:23:16 +05:00
Skarn
a8d26e252f get rid of document mode 2020-11-04 22:21:15 +03:00
Skarn
34d9223900 fix menu issue 2020-11-04 20:16:38 +03:00
Skarn
ab96134603 add missing files 2020-11-04 20:12:11 +03:00
Skarn
1d023bd98b improve frameless window support 2020-11-04 20:08:27 +03:00
Skarn
7b47b62fbd Merge remote-tracking branch 'origin/master' 2020-11-04 18:36:15 +03:00
Skarn
deffc255ff add support for frameless window! 2020-11-04 18:33:21 +03:00
p620
dbfe0f9608 Fix directory name. 2020-11-04 18:20:56 +03:00
Skarn
4f8a5b68fe add classes for font icon styling 2020-11-04 14:55:43 +03:00
Skarn
10fffc092e fix crash in main menu 2020-11-04 14:50:49 +03:00
Skarn
09a0eff7e5 Merge remote-tracking branch 'origin/master' 2020-11-04 01:39:09 +03:00
Skarn
3a01d7fadb fix button alignment 2020-11-04 01:36:21 +03:00
Balkron
8030c5b39b Update splash.png 2020-11-04 03:31:36 +05:00
Skarn
a7569e00e1 Merge remote-tracking branch 'origin/master' 2020-11-04 00:36:30 +03:00
Skarn
5a726a9cf5 resize 2020-11-04 00:36:15 +03:00
Balkron
7a01cd880b New toolbar icons 2020-11-04 02:24:52 +05:00
Skarn
070d57e398 Merge remote-tracking branch 'origin/master' 2020-11-04 00:03:52 +03:00
Skarn
ff9768d362 remove unused widget 2020-11-04 00:03:36 +03:00
Balkron
157f7eba5a UI updates, new icons 2020-11-04 02:01:05 +05:00
Skarn
21dda85e51 map wizard: fix line width 2020-11-03 23:08:34 +03:00
Skarn
73b42635ac map wizard changes 2020-11-03 23:03:04 +03:00
Skarn
43193dbc82 add Edit tab to main window 2020-11-03 22:28:34 +03:00
Skarn
e6979686c7 add Edit tab to main window 2020-11-03 22:06:02 +03:00
Skarn
5dc8123270 fix crash on exiting map with minimap creator open 2020-11-03 20:13:43 +03:00
Skarn
9057a72f8c commit missing files 2020-11-03 20:10:49 +03:00
Skarn
06817173f9 implement view toolbar 2020-11-03 17:03:01 +03:00
Balkron
e5274fe259 Add icons for top toolbar (visibility and misc) 2020-11-02 23:05:52 +05:00
Skarn
46afa240a1 minimap editor: fix minor issues 2020-11-02 20:33:48 +03:00
Skarn
5a4e0e6062 Merge remote-tracking branch 'origin/master' 2020-11-02 18:28:19 +03:00