Skip to content

Commit 7667629

Browse files
Skold177Skold177
committed
Squashed commit of the following:
commit ca10c4f Merge: 6a7b3f5 0104172 Author: Skold177 <113406182+Skold177@users.noreply.github.com> Date: Thu Oct 23 19:31:13 2025 -0400 Merge remote-tracking branch 'upstream/base' into base commit 0104172 Merge: 2c50e23 ee7a7a8 Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com> Date: Thu Oct 23 14:21:48 2025 -0600 Merge pull request LandSandBoat#8490 from cocosolos/clang-tidy-fix Fix optional clang-tidy commit ee7a7a8 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Oct 23 19:38:09 2025 +0000 Fix optional clang-tidy Missed a renamed var. commit 2c50e23 Merge: b7da4a4 02b485d Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com> Date: Thu Oct 23 12:58:53 2025 -0600 Merge pull request LandSandBoat#8489 from cocosolos/docker Fix issue with Docker image names commit 02b485d Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Oct 23 18:20:41 2025 +0000 Fix issue with Docker image names commit b7da4a4 Merge: 73505ce 4cd50a9 Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com> Date: Thu Oct 23 11:57:31 2025 -0600 Merge pull request LandSandBoat#8486 from cocosolos/docker Fix issue with docker tags and meshes commit 4cd50a9 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Oct 23 17:31:54 2025 +0000 Fix issue with docker tags and meshes commit 73505ce Merge: 5c9acb5 7034493 Author: Zach Toogood <zrtoogood@gmail.com> Date: Thu Oct 23 18:05:00 2025 +0100 Merge pull request LandSandBoat#8332 from cocosolos/docker Docker + CI Updates commit 7034493 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Oct 16 05:05:31 2025 +0000 Retry certain CI jobs on failure Windows startup checks and potentially APT can be problematic. commit e6a1aea Author: Corey Sotiropoulos <coco@solos.dev> Date: Fri Jun 27 23:39:13 2025 -0400 Add local development compose file commit 52f3432 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Jun 5 04:08:18 2025 -0400 Update CI/CD Build cache on commits to base using proper cache keys. Use fresh cache during CI builds (big improvement to build times). Skip clang-tidy if no source changes during CI builds. Improve CI results using GitHub Actions summaries. Move CI test job into separate workflow. Combine Windows and Linux test workflows. Note: ccache cache isn't being extracted from Docker image, causing full rebuilds every time. Disable Docker build in CI workflows until we can fix this. commit 2166942 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Jun 5 04:03:48 2025 -0400 Add Docker support Ubuntu and Alpine based images, with options for a GCC or Clang build. Caching optimized for local building. See docker/README.md for more info. commit a52f0c2 Author: Corey Sotiropoulos <coco@solos.dev> Date: Tue Sep 9 16:50:35 2025 -0400 Update fmt Fixes issue with newer clang version: fmt/format.h:4429:27: error: identifier '_a' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] commit 7bed226 Author: Corey Sotiropoulos <coco@solos.dev> Date: Thu Jun 5 03:54:01 2025 -0400 Embed debug information in Windows executables Using external debugging info causes issues with relative paths. commit 187621a Author: Corey Sotiropoulos <coco@solos.dev> Date: Wed Oct 1 00:51:32 2025 -0400 Format Python files with Black formatter commit 5c9acb5 Merge: f376e11 dd43099 Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com> Date: Thu Oct 23 09:41:43 2025 -0600 Merge pull request LandSandBoat#8484 from sruon/s2c_mission S2C: MISSION commit f376e11 Merge: 943bb0d 4734390 Author: Xaver-DaRed <60053999+Xaver-DaRed@users.noreply.github.com> Date: Thu Oct 23 13:00:13 2025 +0200 Merge pull request LandSandBoat#8452 from CriticalXI/bastok_mission_fix [lua, sql] Bastok 9-2 Behavior Adjustments commit dd43099 Author: sruon <sruon@users.noreply.github.com> Date: Thu Oct 23 00:15:38 2025 -0600 GP_SERV_COMMAND_MISSION Co-Authored-By: atom0s <atom0s@users.noreply.github.com> commit 4734390 Author: Critical <48370698+CriticalXI@users.noreply.github.com> Date: Tue Oct 14 21:04:07 2025 -0600 [lua, sql] Bastok 9-2 Behavior Adjustments
1 parent d04b0c1 commit 7667629

94 files changed

Lines changed: 4688 additions & 2067 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
sql/backups/*.sql
2+
3+
# .gitignore (with edits: .vscode and modules/init.txt are needed in Docker context to avoid "-dirty" tag in builds)
4+
5+
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
6+
[Bb]in/
7+
[Oo]bj/
8+
9+
## Ignore Visual Studio temporary files, build results, and
10+
## files generated by popular Visual Studio add-ons.
11+
12+
# User-specific files
13+
*.suo
14+
*.user
15+
*.sln.docstates
16+
*.DS_Store
17+
18+
# Build results
19+
build/
20+
build*/
21+
lbuild/
22+
build_mariadb_32/
23+
build_mariadb_64/
24+
out/
25+
[Dd]ebug/
26+
[Rr]elease/
27+
x64/
28+
*_i.c
29+
*_p.c
30+
*.ilk
31+
*.meta
32+
*.obj
33+
*.pch
34+
*.pdb
35+
*.pgc
36+
*.pgd
37+
*.rsp
38+
*.sbr
39+
*.tlb
40+
*.tli
41+
*.tlh
42+
*.tmp
43+
*.log
44+
*.vspscc
45+
*.vssscc
46+
.builds
47+
*.pyc
48+
49+
# Visual C++ cache files
50+
ipch/
51+
*.aps
52+
*.ncb
53+
*.opensdf
54+
*.sdf
55+
*.opendb
56+
*.VC.db
57+
58+
# Visual Studio profiler
59+
*.psess
60+
*.vsp
61+
*.vspx
62+
63+
# Visual Studio Analyzer
64+
*.lastcodeanalysis*
65+
66+
# Guidance Automation Toolkit
67+
*.gpState
68+
69+
# ReSharper is a .NET coding add-in
70+
_ReSharper*
71+
72+
# Jetbrains directories
73+
.idea
74+
.fleet
75+
cmake-*
76+
77+
# NCrunch
78+
*.ncrunch*
79+
.*crunch*.local.xml
80+
81+
# Installshield output folder
82+
[Ee]xpress
83+
84+
# DocProject is a documentation generator add-in
85+
DocProject/buildhelp/
86+
DocProject/Help/*.HxT
87+
DocProject/Help/*.HxC
88+
DocProject/Help/*.hhc
89+
DocProject/Help/*.hhk
90+
DocProject/Help/*.hhp
91+
DocProject/Help/Html2
92+
DocProject/Help/html
93+
94+
# Click-Once directory
95+
publish
96+
97+
# Publish Web Output
98+
*.Publish.xml
99+
100+
# NuGet Packages Directory
101+
packages
102+
103+
# Windows Azure Build Output
104+
csx
105+
*.build.csdef
106+
107+
# Windows Store app package directory
108+
AppPackages/
109+
110+
# Others
111+
[Bb]in
112+
[Oo]bj
113+
TestResults
114+
[Tt]est[Rr]esult*
115+
*.Cache
116+
*.cache
117+
ClientBin
118+
[Ss]tyle[Cc]op.*
119+
~$*
120+
*.dbmdl
121+
Generated_Code #added for RIA/Silverlight projects
122+
123+
# Backup & report files from converting an old project file to a newer
124+
# Visual Studio version. Backup files are not needed, because we have git ;-)
125+
_UpgradeReport_Files/
126+
Backup*/
127+
UpgradeLog*.XML
128+
129+
# Compiled Object files
130+
*.slo
131+
*.lo
132+
*.o
133+
134+
# Executables
135+
*.exe
136+
*.out
137+
*.app
138+
139+
# Generated executables
140+
/xi_connect*
141+
/xi_map*
142+
/xi_search*
143+
/xi_test*
144+
/xi_world*
145+
146+
# Generated files, mostly autotools-related
147+
.deps
148+
/Makefile
149+
/Makefile.in
150+
/aclocal.m4
151+
/autom4te.cache
152+
/compile
153+
/configure
154+
/config.*
155+
/depcomp
156+
/missing
157+
/install-sh
158+
159+
src/common/config.h
160+
src/common/config.h.in
161+
src/common/stamp-h1
162+
163+
/sources.am
164+
165+
# Misc, such as vim swap files
166+
*.sw?
167+
168+
tags
169+
log/**
170+
!log/.gitkeep
171+
172+
# Lua Developement Tools project files
173+
.metadata/**
174+
.project
175+
.vs
176+
/win32/.vs/xi/v15
177+
.luarc.json
178+
lua-language-server*
179+
check.json
180+
lua_lang_errors.txt
181+
182+
# Visual Studio
183+
**/*.vcxproj*
184+
**/*.sln
185+
enc_temp_folder
186+
187+
# CMake files
188+
CMakeCache.txt
189+
Makefile
190+
**/CMakeFiles
191+
cmake_install.cmake
192+
/cmake-**/**
193+
194+
# ignore servers
195+
*-server
196+
197+
# non-default config files containing server specific things
198+
/conf/license.conf
199+
/conf/version.conf
200+
/conf/login.conf
201+
/conf/maint.conf
202+
/conf/map.conf
203+
/conf/packet_tcp.conf
204+
/conf/packet_udp.conf
205+
/conf/search_server.conf
206+
/conf/server_message.conf
207+
/conf/server_message_fr.conf
208+
209+
# non-default settings script files containing server specific things
210+
/scripts/settings/main.lua
211+
/settings/*.lua
212+
213+
# Tool/misc configs
214+
/tools/config.yaml
215+
ip.txt
216+
217+
# Tracy download
218+
ext/tracy/
219+
tracy.tar.gz
220+
221+
# Valgrind
222+
*.memcheck.log
223+
*.callgrind.log
224+
callgrind.out.*
225+
memcheck.out.*
226+
227+
# Memory dumps
228+
*.dmp
229+
230+
# Auto-generated files
231+
/src/common/version.cpp
232+
233+
# Doxygen
234+
doxygen/
235+
236+
# Docker
237+
*docker-compose*
238+
!dev.docker-compose.yml
239+
240+
# dSYM folders for Mac OS debugging
241+
xi_map.dSYM
242+
xi_connect.dSYM
243+
xi_search.dSYM
244+
245+
# Keys and Certs
246+
**/*.key
247+
**/*.cert
248+
249+
# Environments
250+
.env
251+
.venv
252+
env/
253+
venv/
254+
ENV/
255+
env.bak/
256+
venv.bak/
257+
258+
# Test artifacts
259+
*.ctrf.json
260+
__pycache__
261+
262+
sanity_checks_summary.md
263+
changed-files.txt
264+
clang_tidy_summary.md

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ indent_brace_style = allman # This is unfortunately ignored in Visual Studio
7979
# Makefiles actually require the tabs.
8080
[Makefile]
8181
indent_style = tab
82+
83+
[*.yml]
84+
indent_style = space
85+
indent_size = 2

0 commit comments

Comments
 (0)