SMS Alfredo
9160ed969d
Merge branch 'ring-fix' into 'next'
...
Make Only Missiles with MF2_FIRING Give Rings to Teammates | Allow MT_SPINFIRE to Deal Damage to Players Outside of Ringslinger (Resolves #164 )
Closes #164
See merge request STJr/SRB2!2002
2025-03-21 19:04:20 +00:00
Alam Ed Arias
5344213b2b
Merge branch 'master' into next
2025-03-19 16:48:30 -04:00
Alam Ed Arias
35738054f3
GitLab CI: allow failure of curl download from macports
2025-03-19 16:32:48 -04:00
Alam Ed Arias
45a5246099
Ported from RingRagers for GitLab CI:
...
Reduce distracting logging in CI
2025-03-19 16:25:11 -04:00
Alam Ed Arias
eaf732d35b
vcpkg: no ffmpeg for sdl2-mixer-ext
2025-03-19 12:48:57 -04:00
Eidolon
33c1289a46
Fix write Y range for splat drawing
...
Fixes a silent memory error during splat drawing when splats cross the
bottom of the screen.
2025-03-10 13:22:34 -05:00
Alam Ed Arias
2ff7c6106d
Merge branch 'master' into next
2025-03-04 20:56:13 -05:00
Alam Ed Arias
7b010557ab
GitLab CI: fix building oldstable amd64 on non-amd64 builders
2025-03-04 20:55:39 -05:00
Alam Ed Arias
c7396e86ef
whitespace cleanup
2025-03-03 07:41:42 -05:00
Alam Ed Arias
d232ebafc3
Merge branch 'master' into next
2025-03-03 07:39:12 -05:00
Alam Ed Arias
d47c59a342
GitLab CI: allow failure of wavpack download from macports
2025-03-03 06:18:23 -05:00
Alam Ed Arias
28aa3f10bd
GitLab CI: allow failure of libopenmpt download from macports
2025-03-03 06:11:29 -05:00
Alam Ed Arias
f32bdb77a2
GitLab CI: allow failure of sdl2_mixer download from macports
2025-03-03 05:59:40 -05:00
Alam Ed Arias
823d28839b
GitLab CI: since macports downloads can fail, allow the lipo job to fail as well
2025-03-03 05:43:51 -05:00
Alam Ed Arias
817db98133
GitLab CI: old version of ccache do not have stats_log option
2025-03-03 05:36:32 -05:00
Alam Ed Arias
910add7efb
GitLab CI: macports downloads can fail
2025-03-03 05:33:55 -05:00
Alam Ed Arias
51494ca810
GitLab CI: disable SRB2_CONFIG_ENABLE_WEBM_MOVIES for cmake builds
2025-03-02 21:40:23 -05:00
Alam Ed Arias
5d5cd27e28
vcpkg: fluidsynth does not work for static build
2025-03-02 21:39:59 -05:00
Alam Ed Arias
61ba912ae9
vcpkg: no fluidsynth for sdl2-mixer-ext on non-native mingw builds
2025-03-02 20:58:13 -05:00
Alam Ed Arias
3145253ff3
GitLab CI: set CC,CXX and LD for Windows vcpkg builds
2025-03-02 20:34:17 -05:00
Alam Ed Arias
e2200c1eb5
GitLab CI: use VCPKG_TARGET_TRIPLET, not VCPKG_DEFAULT_TRIPLET
2025-03-02 20:18:59 -05:00
Alam Ed Arias
61afd65fc1
GitLab CI: w64-mingw32 vcpkgs to use --toolchain
2025-03-02 20:01:59 -05:00
Alam Ed Arias
682fb8f07f
GitLab CI: set LD for Mingw32 nad use plain cmake for darwin builds
2025-03-02 19:44:10 -05:00
Alam Ed Arias
a7424b9952
GitLab CI: use :, not = for variables
2025-03-02 19:30:38 -05:00
Alam Ed Arias
fb6ce070fd
GitLib CI: try keep building
2025-03-02 19:20:19 -05:00
Alam Ed Arias
9860fa9f61
vcpkg: wasm build check
2025-03-02 18:20:43 -05:00
Logan Aerl Arias
3019e70ecb
GitLab CI: use Ninja on MacOSX
...
GitLab CI: use Ninja on MacOSX
2025-02-28 21:41:35 -05:00
Alam Ed Arias
aebc3ff558
GitLab CI: move back to only 2 stages, build and osxcross
2025-02-28 21:09:33 -05:00
Alam Ed Arias
fc7768fad9
GitLab CI: do not force CC/CXX with Mingw32 vcpkg builds
2025-02-28 21:03:00 -05:00
Alam Ed Arias
3683a8f939
vcpkg: format-manifest
2025-02-28 21:02:25 -05:00
Alam Ed Arias
2511312504
vcpkg: testing compiling with x86-linux, x64-linux, arm64-linux, x86-mingw-static and x64-mingw-static
2025-02-27 21:59:47 -05:00
Alam Ed Arias
75fb1cd2aa
SDL_Mixer: options for all MIDI players in SDL-Mixer-X 2.5.0+
2025-02-27 04:42:18 -05:00
Alam Ed Arias
a923bf7095
SDL_Mixer: Added newlines for mixer errors
2025-02-27 04:42:18 -05:00
Alam Ed Arias
893db88809
GitLab CI: install miniupnpc from macports
2025-02-27 04:34:07 -05:00
Alam Ed Arias
37043e367b
GitLab CI: use clang++ as CXX for clang builds
2025-02-26 22:50:53 -05:00
Alam Ed Arias
18d47ebbd3
GitLab CI: use short names like oa64/o64 so we can switch SDKs
2025-02-26 22:49:01 -05:00
Alam Ed Arias
c7801bdf6d
GitLab CI: move around stages
2025-02-26 21:57:54 -05:00
Alam Ed Arias
7cbec73971
GitLab CI: do not checkout own copy of vcpkg, use the one that comes with the builder image
2025-02-26 21:57:54 -05:00
Alam Ed Arias
fa4924bc19
GitLab CI: MacOS build does not use vcpkg
2025-02-26 21:57:49 -05:00
Alam Ed Arias
db7508f7e4
GitLab CI: use "ccache --set-config" over tee on the ccache.conf file
2025-02-26 21:02:48 -05:00
Alam Ed Arias
e06eead3eb
GitLab CI: no more Gold linker
2025-02-26 21:01:47 -05:00
Logan Aerl Arias
748fa366eb
Merge branch 'ipv6' into 'master'
...
netcode: fix runtime issues with -noipv4
See merge request STJr/SRB2!2646
2025-02-23 18:07:01 +00:00
Alam Ed Arias
646929d83d
netcode: fix runtime issues with -noipv4
2025-02-23 12:21:37 -05:00
Logan Aerl Arias
854fc95672
Merge branch 'fix-bind-with-ipv6-disabled' into 'master'
...
Update i_tcp.c to support hosts with IPv6 disabled
See merge request STJr/SRB2!2628
2025-02-22 19:47:06 +00:00
Logan Aerl Arias
06d8d02bc4
Merge branch 'fix-ipv6-port-collision' into 'master'
...
Fix port collision on IPv6 connections
See merge request STJr/SRB2!2622
2025-02-22 15:09:51 +00:00
Logan Aerl Arias
1472ac75da
Merge branch 'master' into 'fix-bind-with-ipv6-disabled'
...
# Conflicts:
# src/netcode/i_tcp.c
2025-02-22 05:29:09 +00:00
Logan Aerl Arias
53fabd11a2
Merge branch 'fix-address-resolution-failure' into 'master'
...
Fix address resolution failure in certain circumstances
See merge request STJr/SRB2!2617
2025-02-22 04:51:20 +00:00
Logan Aerl Arias
e7c18ba1f4
Merge branch 'add-noipv4-flag' into 'master'
...
Add -noipv4 flag
See merge request STJr/SRB2!2275
2025-02-22 00:44:45 +00:00
Lactozilla
20d02d35e4
Merge branch 'fix-too-large-files-sent' into 'next'
...
Fix server never sending TOOLARGE to clients
Closes #1395
See merge request STJr/SRB2!2625
2025-02-21 22:15:20 +00:00
Lactozilla
0e992ec51a
Merge branch 'push-back-acktosend' into 'next'
...
Clean up d_net.c and push back missed acks to acktosend (Chatbug attempt 3)
See merge request STJr/SRB2!2591
2025-02-21 22:09:27 +00:00
