Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: windows clang fixes #1671

Open
wants to merge 32 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8b9a076
trying to enable clang for windows msvc
jadebenn Dec 4, 2024
da45152
clang cl toolset
jadebenn Dec 4, 2024
edc7109
update presets
jadebenn Dec 4, 2024
f4082cc
formatting
jadebenn Dec 4, 2024
6c8bb74
Remove user-specific clang configurations
Jettford Dec 4, 2024
6eea3f3
Fix up ZLib a little more and remove more configuration into CMakeLists
Jettford Dec 5, 2024
ece0e29
I made this mistake years ago, my bad
Jettford Dec 5, 2024
83e08f6
remove test and workflow presets
Jettford Dec 8, 2024
10e64a5
re-add testPresets
Jettford Dec 8, 2024
fa017b6
Merge branch 'main' into windows-clang-fixes
Jettford Dec 8, 2024
0d45403
last CI test for tonight
Jettford Dec 8, 2024
628f6b4
Merge remote-tracking branch 'upstream/main' into windows-clang-fixes
jadebenn Dec 8, 2024
4b99b98
attempted CI fix (feel free to revert)
jadebenn Dec 8, 2024
0772e56
remove workflow presets (for now) and try another CI fix
jadebenn Dec 8, 2024
9be88b3
ci fix
jadebenn Dec 8, 2024
3760ffa
presets and workflow changes
Jettford Dec 9, 2024
5a05622
append configureType to matrix
Jettford Dec 9, 2024
51070d4
remove default configure step from build
Jettford Dec 9, 2024
1f8ec6e
I'm just trying stuff at this point
Jettford Dec 9, 2024
c20e1fb
urgh
Jettford Dec 9, 2024
fff7bf8
workflow changes
Jettford Dec 9, 2024
5e73fa5
actually configure
Jettford Dec 9, 2024
1f5982e
learning to fucking read
Jettford Dec 9, 2024
4133008
Clean up warnings, fix errors related to testes and how MariaDB moves…
Jettford Dec 11, 2024
ba2c692
switch to using compat
Jettford Dec 11, 2024
9ea616b
hardcoded docker change test
Jettford Dec 11, 2024
a0f2aeb
fix names of workflows
Jettford Dec 11, 2024
92d086c
replace some silly warnings
Jettford Dec 11, 2024
bb9b259
save all artifacts test
Jettford Dec 11, 2024
badde23
fix a few more warnings
Jettford Dec 11, 2024
8e8d015
update CMAKE_BUILD_TYPE setter
Jettford Dec 11, 2024
80d0cd6
Merge branch 'main' into windows-clang-fixes
Jettford Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix a few more warnings
  • Loading branch information
Jettford committed Dec 11, 2024
commit badde23d1ce53b357bff996c98d1fd8b8331d974
2 changes: 1 addition & 1 deletion dScripts/02_server/Map/AM/RandomSpawnerPit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void RandomSpawnerPit::OnStartup(Entity* self) {
};

sectionMultipliers = {
{"secA", 1},
{"secA", 1.0f},
{"secB", 1.2f},
{"secC", 1.2f},
{"secD", 1},
Expand Down
4 changes: 2 additions & 2 deletions dScripts/02_server/Map/AM/RandomSpawnerStr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ void RandomSpawnerStr::OnStartup(Entity* self) {
};

sectionMultipliers = {
{"secA", 1},
{"secB", 1},
{"secA", 1.0f},
{"secB", 1.0f},
{"secC", 1.2f},
};

Expand Down
Loading