Skip to content

Commit fd90a9c

Browse files
GatsikGatsik
authored
Merge pull request #1161 from Gatsik/mapgen-tweaks
Mapgen tweaks
2 parents 36008e3 + 5c555e6 commit fd90a9c

18 files changed

Lines changed: 932 additions & 186 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
ICE_ADAPTER_VERSION: 3.3.12
1212
BUILD_VERSION: ${{ github.event.inputs.version }}
1313
PYTHON_VERSION: 3.14
14-
ZIG_VERSION: 0.15.2
14+
ZIG_VERSION: 0.16.0
1515
JAVA_DISTRIBUTION: "oracle"
1616
JAVA_VERSION: 25
1717

@@ -67,7 +67,7 @@ jobs:
6767
Write-Host "LIBPY=$LIBPY"
6868
$INCLUDEPY = $(python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
6969
Write-Host "INCLUDEPY=$INCLUDEPY"
70-
zig build-lib -dynamic -lc -lpython3 -I"$INCLUDEPY" -L"$LIBPY" -O ReleaseSafe --name zigfafreplay src/replays/zigparser/zigfafreplay.zig
70+
zig build-lib -dynamic -lc -lpython3 -I"$INCLUDEPY" -L"$LIBPY" -O ReleaseFast --name zigfafreplay src/replays/zigparser/zigfafreplay.zig
7171
move zigfafreplay.dll zigfafreplay.pyd
7272
7373
@@ -167,7 +167,7 @@ jobs:
167167
echo "LIBPY=$LIBPY"
168168
INCLUDEPY=$(python3 -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))")
169169
echo "INCLUDEPY=$INCLUDEPY"
170-
zig build-lib -dynamic -lc -lpython$PYTHON_VERSION -I$INCLUDEPY -L$LIBPY -O ReleaseSafe --name zigfafreplay src/replays/zigparser/zigfafreplay.zig
170+
zig build-lib -dynamic -lc -lpython$PYTHON_VERSION -I$INCLUDEPY -L$LIBPY -O ReleaseFast --name zigfafreplay src/replays/zigparser/zigfafreplay.zig
171171
mv libzigfafreplay.so zigfafreplay.so
172172
173173
- name: Shrink scipy dependency

‎res/client/client.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,14 @@ QLineEdit#uploaderInput
392392
background-color: #353535;
393393
}
394394

395+
QLineEdit#mapNameEdit, QLineEdit#cliArgsEdit {
396+
background-color: #18181D;
397+
}
398+
399+
QLineEdit#mapNameEdit:disabled, QLineEdit#cliArgsEdit:disabled {
400+
background-color:#202025;
401+
}
402+
395403
QFrame#rankedFrame
396404
{
397405
border-style:solid;
@@ -842,6 +850,13 @@ QGroupBox
842850
padding-top: 15px;
843851
}
844852

853+
QGroupBox::indicator
854+
{
855+
width: 13px;
856+
height: 13px;
857+
border: 1px solid black;
858+
}
859+
845860
QGroupBox::indicator:unchecked
846861
{
847862
background: #303035;
@@ -921,6 +936,30 @@ QCheckBox::indicator:hover {
921936
border-color: gray;
922937
}
923938

939+
QAbstractItemView::indicator
940+
{
941+
width: 13px;
942+
height: 13px;
943+
border: 1px solid black;
944+
}
945+
946+
QAbstractItemView::indicator:hover {
947+
border-color: gray;
948+
}
949+
950+
QAbstractItemView::indicator:disabled {
951+
border-color: #202025;
952+
}
953+
954+
QAbstractItemView::indicator:checked {
955+
image: url('%THEMEPATH%/client/chboxChecked.png');
956+
}
957+
958+
QAbstractItemView::indicator:unchecked
959+
{
960+
background: #303035;
961+
}
962+
924963
/* Used for Ranked Buttons only at the moment*/
925964
QToolButton#rankedPlay
926965
{

‎res/dialogs/information.ui‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>Dialog</class>
4+
<widget class="QDialog" name="Dialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>416</width>
10+
<height>363</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<item>
18+
<layout class="QHBoxLayout" name="horizontalLayout">
19+
<item>
20+
<widget class="QLabel" name="labelIcon">
21+
<property name="text">
22+
<string/>
23+
</property>
24+
</widget>
25+
</item>
26+
<item>
27+
<widget class="QLabel" name="labelText">
28+
<property name="text">
29+
<string/>
30+
</property>
31+
</widget>
32+
</item>
33+
<item>
34+
<spacer name="horizontalSpacer">
35+
<property name="orientation">
36+
<enum>Qt::Orientation::Horizontal</enum>
37+
</property>
38+
<property name="sizeHint" stdset="0">
39+
<size>
40+
<width>40</width>
41+
<height>20</height>
42+
</size>
43+
</property>
44+
</spacer>
45+
</item>
46+
</layout>
47+
</item>
48+
<item>
49+
<widget class="QPlainTextEdit" name="editDetails">
50+
<property name="readOnly">
51+
<bool>true</bool>
52+
</property>
53+
</widget>
54+
</item>
55+
<item>
56+
<widget class="QDialogButtonBox" name="buttonBox">
57+
<property name="orientation">
58+
<enum>Qt::Orientation::Horizontal</enum>
59+
</property>
60+
<property name="standardButtons">
61+
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
62+
</property>
63+
</widget>
64+
</item>
65+
</layout>
66+
</widget>
67+
<resources/>
68+
<connections>
69+
<connection>
70+
<sender>buttonBox</sender>
71+
<signal>accepted()</signal>
72+
<receiver>Dialog</receiver>
73+
<slot>accept()</slot>
74+
<hints>
75+
<hint type="sourcelabel">
76+
<x>248</x>
77+
<y>254</y>
78+
</hint>
79+
<hint type="destinationlabel">
80+
<x>157</x>
81+
<y>274</y>
82+
</hint>
83+
</hints>
84+
</connection>
85+
<connection>
86+
<sender>buttonBox</sender>
87+
<signal>rejected()</signal>
88+
<receiver>Dialog</receiver>
89+
<slot>reject()</slot>
90+
<hints>
91+
<hint type="sourcelabel">
92+
<x>316</x>
93+
<y>260</y>
94+
</hint>
95+
<hint type="destinationlabel">
96+
<x>286</x>
97+
<y>274</y>
98+
</hint>
99+
</hints>
100+
</connection>
101+
</connections>
102+
</ui>

0 commit comments

Comments
 (0)