stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-29 22:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
14710 commits 175 branches 42 tags 326 MiB
Commit graph

13032 commits

Author SHA1 Message Date
Alam Ed Arias
a68440c4db Merge branch 'master' into next 2023-10-22 11:14:13 -04:00
Alam Ed Arias
610fd76edb dummy: fixup warnings 2023-10-22 11:09:58 -04:00
Gustaf Alhäll
b544c4202a
Fix FreeBSD build errors (again) 2023-10-20 17:37:32 +02:00
Alam Ed Arias
33f6deb7f0 Update sc/netcode/commands.c 
'i' variable is set but unused in Ban_Load_File()
 2023-10-15 23:57:00 -04:00
Alam Ed Arias
a60ac0508f Merge remote-tracking branch 'origin/next' into gitlabcirunnertest 2023-10-15 21:43:35 -04:00
Alam Ed Arias
2865873e70 Update src/lua_baselib.c 
No need of counting bots.
 2023-10-15 20:35:33 -04:00
Alam Ed Arias
de4a8a193b Update src/d_clisrv.c 
Remove unused i var in Ban_Load_File()
 2023-10-15 20:35:33 -04:00
Alam Ed Arias
6a37b3c0c6 Update src/hardware/mw_model.c 
Restore old code in GeneratePolygonNormals(), add TODO
 2023-10-15 20:35:33 -04:00
Alam Ed Arias
1372b60db9 Update src/hardware/mw_md2.c 
there are 2 more name buffers that need to be bigger
 2023-10-15 16:00:25 -04:00
Alam Ed Arias
b6aaf582d1 Update src/hardware/mw_md2.c 
fscanf need 26 chars in the name buffer
 2023-10-15 15:29:51 -04:00
Alam Ed Arias
bc852fa099 remove unused variables that was only set 2023-10-15 14:34:53 -04:00
Alam Ed Arias
aaebcc6ce1 Update src/hardware/hw_batching.c 
fix misleading indentation
 2023-10-15 14:24:20 -04:00
Alam Ed Arias
35f57882e4 signalhandlers are function of NORETURN 2023-10-15 14:16:13 -04:00
Gustaf Alhäll
80e386b16f
Expose lastinputtime to Lua 2023-10-14 21:50:59 +02:00
Alam Ed Arias
806c8f259c Update src/Makefile.d/detect.mk 
Support Mingw64 toolchain versions
 2023-10-14 08:23:03 -04:00
Alam Ed Arias
8533955da8 Update src/p_map.c 
it seems line_t have pointers, clear all of it
 2023-10-13 22:52:43 -04:00
Alam Ed Arias
8f00667abe Update src/Makefile.d/*.mk 
both Makefile and *.mk should be in the same EOL
 2023-10-13 20:18:37 -04:00
Alam Ed Arias
1bf78686e2 let not pass a point of a temp stack var around 2023-10-13 19:33:31 -04:00
Alam Ed Arias
af020810bf fix compiling for GCC 11+ 2023-10-13 17:02:33 -04:00
Alam Ed Arias
a6038dd6f2 Update detect.mk 
Add support for GCC 13.2
 2023-10-13 19:49:43 +00:00
Alam Ed Arias
dfe1810580 Revert "Undo src/Makefile" 
This reverts commit 4f116673f3.
 2023-10-12 22:30:26 -04:00
Alam Ed Arias
4f116673f3 Undo src/Makefile 
Let see, revert OBJCOPY,OBJDUMP and WINDRES statements
 2023-10-12 22:26:43 -04:00
Alam Ed Arias
4e2324216d Makefile 
Also allow overwrite of OBJCOPY, OBJDUMP and WINDRES
 2023-10-12 19:43:09 -04:00
Gustaf Alhäll
436de21808
Refactor code after review comments 2023-10-07 00:07:56 +02:00
sphere
9925e96365 Merge branch 'if-range-demoversion' into 'next' 
Use if-range checks instead of switch for demo versions

See merge request STJr/SRB2!2164
 2023-10-06 13:19:48 +00:00
spherallic
733dabe9a0 Coins? 2023-10-02 23:31:21 +02:00
Gustaf Alhäll
12d595399e
Avoid branch prediction slowdowns in R_PointOnSide 2023-10-01 17:34:13 +02:00
Zwip-Zwap Zapony
fb9e6c9c6d Use if-range instead of switch for demo versions 2023-09-22 18:16:54 +02:00
Monster Iestyn
340eee8691 Added some notes related to FEETADJUST for reference, made another tweak 2023-09-21 16:13:55 +01:00
Monster Iestyn
ee0bab2941 Remove adjustfeet parameter from Patch_GetRotatedSprite, remove [2] from spriteframe_t's rotated array. 
Following from my previous commit, these things are no longer needed: they existed ONLY for adding FEETADJUST offsets to rotated sprites in Lua HUD code.
 2023-09-21 15:50:30 +01:00
Monster Iestyn
5e501bae07 v.getSpritePatch/v.getSprite2Patch fix: Fix offset inconsistency between rotated sprites and non-rotated sprites 
This was caused by rotated sprites having FEETADJUST offsets applied, when non-rotated sprites did not. FEETADJUST is not actually needed in the HUD, so I've removed it from the rotated sprites (thankfully this is also the easiest way to fix it too)
 2023-09-21 13:19:38 +01:00
Lactozilla
8fd9a82a19 Raise sidedef limits 
Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
 2023-09-21 02:06:06 -03:00
sphere
a373d96d07 Merge branch 'fix-overflow-scrolling-background' into 'next' 
Fix buffer overflow when displaying a scrolling background

See merge request STJr/SRB2!2010
 2023-09-20 16:10:56 +00:00
sphere
1c4419ee56 Merge branch 'fix-minecart-debug-build' into 'next' 
Fix memory leak when other players are riding a minecart

See merge request STJr/SRB2!2146
 2023-09-20 15:26:41 +00:00
spherallic
05926ceec8 Group NiGHTS star/chip hitboxes with rings 2023-09-20 15:42:19 +02:00
Gustaf Alhäll
a8fe500d0e
Add auto-kick for inactive players 2023-09-19 19:05:43 +02:00
Zwip-Zwap Zapony
cfedee9dc9 Fix CMake compiling 2023-09-19 18:46:05 +02:00
Lactozilla
68e25737c0 Fix minor spelling mistake 2023-09-18 18:51:11 -03:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next' 
Re-delete netcode

See merge request STJr/SRB2!2083
 2023-09-18 16:47:28 +00:00
Gustaf Alhäll
fc20508295
Fix saturation not being applied on colormaps in OpenGL 2023-09-18 18:16:10 +02:00
Gustaf Alhäll
b53b2df7ee
Fix saturation option not being applied on OpenGL 2023-09-17 22:48:26 +02:00
LJ Sonic
8f1618018e Fix free 2023-09-15 19:12:55 +02:00
Gustaf Alhäll
65547ae036
Fix memory leak when other players are riding a minecart 2023-09-14 18:31:05 +02:00
sphere
f02fd19c5a Merge branch 'team-gametype-keep-player-color' into 'next' 
Respect the player's skin and color selection

See merge request STJr/SRB2!2100
 2023-09-13 07:59:00 +00:00
Alam Ed Arias
6caff62662 Merge remote-tracking branch 'origin/master' into next 2023-09-12 19:40:54 -04:00
Alam Ed Arias
8558d123ee SDL: add version check for SDL_OPenURL() 2023-09-12 19:32:47 -04:00
Lactozilla
ebca345a44 Check if in a game 2023-09-12 19:32:15 -03:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
sphere
0f5e80a122 Merge branch 'warpwithoutmapheaderfix' into 'next' 
Fix "-warp"ing to a level without a map header crashing the game

Closes #1105

See merge request STJr/SRB2!2143
 2023-09-12 20:13:46 +00:00
LJ Sonic
06d4d71b41 Fix missing includes for Linux platforms 2023-09-12 19:52:24 +02:00
Zwip-Zwap Zapony
4f6da8dc0f Fix a "maybe-uninitialized" compiler warning 2023-09-10 16:19:39 +02:00
Lactozilla
5306d2b474 Merge branch 'next' into sector-portals 2023-09-09 22:28:01 -03:00
Logan Arias
02c4720703 Merge branch 'circleci' into 'master' 
CircleCi: update buildbot

See merge request STJr/SRB2!2144
 2023-09-09 20:53:31 +00:00
Alam Ed Arias
64eb1b0bff backtrace: do not care for junk var 2023-09-09 16:21:04 -04:00
Alam Ed Arias
05223fbc6d backtrace: store result of write() in a junk var 2023-09-09 16:10:42 -04:00
MIDIMan
9b5cfe856c Add a mapheader check to M_CampaignWarpIsCheat 2023-09-08 22:03:25 -04:00
spherallic
a4a3b5b094 2.2.13 2023-09-09 01:16:28 +02:00
katsy
82568f81fc Disable renderhitbox in multiplaye altogether 2023-09-08 17:46:13 -05:00
sphere
0952d31369 Merge branch 'fix-1x1-floorsprite-draw' into 'next' 
Fix floorsprite rendering with 1x1 images

Closes #1052

See merge request STJr/SRB2!2141
 2023-09-08 22:35:34 +00:00
Lactozilla
27021d2921 Optimize 2023-09-08 17:43:55 -03:00
Lactozilla
14eb589611 Fix floorsprite rendering with 1x1 images 2023-09-08 17:26:42 -03:00
sphere
0f914a4e25 Merge branch 'netvars-fix' into 'next' 
Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox (Fixes #1103)

Closes #1103

See merge request STJr/SRB2!2140
 2023-09-08 17:51:30 +00:00
sphere
b5636d9dc9 Merge branch 'lua-supername' into 'next' 
Expose skin.supername to Lua

See merge request STJr/SRB2!2138
 2023-09-08 17:51:19 +00:00
sphere
afee1cb687 Merge branch 'sprite-clip-optimization' into 'next' 
Optimize sprite rendering by ignoring completely occluded sprites

See merge request STJr/SRB2!2131
 2023-09-08 17:51:11 +00:00
sphere
d42a96263b Merge branch 'interpolate-hitbox-scaling' into 'next' 
Interpolate Hitboxes when Scaling Mobjs

See merge request STJr/SRB2!2124
 2023-09-08 17:51:06 +00:00
SteelT
72662efc8d Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox 
The CV_NETVAR flag being used for cvars not registered in a dedicated server context will completely mess with the internal netid to cvar linkage.
And I'm not really keen on registering a cvar purely for rendering on dedicated servers, so let's just prevent renderhitbox from being changed in netgames entirely.
 2023-09-08 13:34:56 -04:00
Lactozilla
0377d9e881 Merge remote-tracking branch 'stjr/next' into sector-portals 2023-09-08 14:09:54 -03:00
Zwip-Zwap Zapony
11a2fe8613 Expose skin.supername to Lua 2023-09-06 21:02:04 +02:00
Krabs
858f102ca4 Update hash for patch.pk3 2023-09-06 12:50:51 -04:00
Krabs
49ee744ba1 Update version number 2023-09-06 12:50:32 -04:00
sphere
b5232a4ca4 Merge branch 'nights-noclip-camera' into 'next' 
Make camera noclip during NiGHTS gameplay

See merge request STJr/SRB2!2136
 2023-09-05 22:27:13 +00:00
sphere
5ce2b93a74 Merge branch 'lua-invalid-field-crash' into 'next' 
Fix possible crashes in the Lua API when accessing invalid fields

See merge request STJr/SRB2!2128
 2023-09-05 22:24:29 +00:00
sphere
fefdd7987c Merge branch 'title-animation-skip' into 'next' 
Allow input during title animation after the first time

See merge request STJr/SRB2!2122
 2023-09-05 22:23:57 +00:00
sphere
a90422a30e Merge branch 'dodrawforviewmobj' into 'next' 
Don't Copy mobj->dontdrawforviewmobj To MT_OVERLAYs

See merge request STJr/SRB2!2125
 2023-09-05 17:56:34 +00:00
spherallic
85fc55bfc1 Prevent title input during negative finalecount 2023-09-05 19:38:45 +02:00
sphere
417928f680 Merge branch 'nobombsphereattract2' into 'next' 
Don't attract bomb spheres with Nightopian Helper

See merge request STJr/SRB2!2135
 2023-09-05 17:25:42 +00:00
sphere
1ba1f7454b Merge branch 'the_elder_skyscroll_ii_daggerfall' into 'next' 
Fix the Record Attack Background Jumping

See merge request STJr/SRB2!2129
 2023-09-05 17:24:22 +00:00
sphere
e012a721e8 Merge branch 'instantretry' into 'next' 
Add toggle for instant retry in Record Attack

See merge request STJr/SRB2!2120
 2023-09-05 17:24:03 +00:00
sphere
b7b1e0b1e5 Add toggle for instant retry in Record Attack 2023-09-05 17:24:03 +00:00
sphere
758c5a893b Merge branch 'katsy-next-patch-00801' into 'next' 
Make renderhitbox a netvar to prevent clientside wallhacking

See merge request STJr/SRB2!2133
 2023-09-05 17:23:35 +00:00
katsy
969e21017d Make renderhitbox a netvar to prevent clientside wallhacking 2023-09-05 17:23:34 +00:00
spherallic
a29d1ca219 Make camera noclip during NiGHTS gameplay 2023-09-05 18:03:51 +02:00
spherallic
52d356d09e Don't attract bomb spheres with Nightopian Helper 2023-09-05 14:43:30 +02:00
Lactozilla
57a880a286 Fix a bug 2023-09-03 19:35:58 -03:00
Lactozilla
d777b62e1b Improve checks for papersprites 2023-09-03 18:59:39 -03:00
Eidolon
c35456d5cb Actually fix papersprites near camera crash 2023-09-03 16:33:06 -05:00
Lactozilla
58bd31fdca Make hitboxes count towards the total sprite count 
This has the effect of misrepresenting how many sprites are actually visible, but it's more "accurate".
 2023-09-03 17:14:48 -03:00
Lactozilla
b8313ceda2 Optimize sprite rendering by ignoring completely occluded sprites 2023-09-03 17:02:35 -03:00
Eidolon
d4a2bb5675 Fix sprite scale column iteration crash 2023-09-03 10:08:03 -05:00
Zwip-Zwap Zapony
3faa29ded9 Fix the Record Attack background jumping 2023-09-01 22:36:15 +02:00
Lactozilla
6414e9db79 Fix possible crashes in the Lua API when accessing invalid fields 2023-08-31 15:02:59 -03:00
spherallic
25c220d363 Some credits updates 2023-08-31 16:25:14 +02:00
spherallic
b98bec9a03 Final final 2.2.12 color tweaks (real) 
- Tweaked Aether, Midnight and Volcanic
- Credit Chrispy & Saneko for new skincolors
 2023-08-30 00:07:49 +02:00
Zwip-Zwap Zapony
2febb6ced9 Don't copy dontdrawforviewmobj to MT_OVERLAYs 2023-08-29 17:12:04 +02:00
Zwip-Zwap Zapony
7a1f952d9e Make a comment clearer 2023-08-29 17:11:52 +02:00
Zwip-Zwap Zapony
91a17fdbdd Use decimal instead of octal vertex IDs 2023-08-25 10:42:25 +02:00
Zwip-Zwap Zapony
f42c2403f9 Interpolate radius/height when scaling mobjs 2023-08-25 10:42:12 +02:00
Lactozilla
5996c8a5ac Fix P_GetMobjByTag so that it iterates through mapthings 2023-08-25 05:02:23 -03:00
Lactozilla
3505c90d5c Clarify comment 2023-08-25 04:28:46 -03:00
Lactozilla
d7bc644dfe Check for cv_skybox.value if in a portal too 2023-08-25 00:57:10 -03:00
Lactozilla
cf1f310363 Add sector portals from visplanes while rendering a portal 2023-08-25 00:47:40 -03:00
Lactozilla
87d40fc3cc Use original portal's origin for the viewpoint displacement 2023-08-25 00:18:20 -03:00
Lactozilla
9335ee3031 Implement "copy portal to line" sector portal type 2023-08-24 17:36:38 -03:00
Lactozilla
ff5d53e54d Serialize sector portals 2023-08-24 16:04:31 -03:00
spherallic
6c416c61b1 Final 2.2.12 skincolor changes: 
- Replaced Mercury & Pumpkin with Ocean & Tangerine
- Renamed Crystal to Siberite & Meteorite to Moonstone
- Tiny tweaks to color ordering and NiGHTS link colors
 2023-08-24 13:33:38 +02:00
Lactozilla
6303e37fbe Use P_SetTarget here 2023-08-24 01:19:58 -03:00
Lactozilla
563233a55f Add editor definition for linedef type 6 2023-08-24 01:09:46 -03:00
Lactozilla
6d812b4a43 Implement Eternity Engine's plane portal and horizon portal types 2023-08-24 00:51:52 -03:00
Lactozilla
74ea880ca0 Refactor 2023-08-23 17:49:29 -03:00
Lactozilla
50506254e8 Support plane type 3 in the "copy portal" line special 
SRB2 doesn't implement sector portals the way ZDoom does, but this ensures plane type 3 acts the same as plane type 2.
 2023-08-23 16:31:03 -03:00
Lactozilla
e230d38aad Ensure sector portals are rendered when they would otherwise be missed 2023-08-23 15:46:48 -03:00
Lactozilla
395e9bdd20 Implement sector portal copying 2023-08-23 15:29:16 -03:00
Lactozilla
5b387ec94a Make linedef type 6 closer to ZDoom's Sector_SetPortal 2023-08-23 15:04:50 -03:00
Lactozilla
03daf721ef Allow sector portals to be displayed properly on sky sectors 2023-08-23 13:43:02 -03:00
sphere
56a0546e15 Merge branch 'supernamefix' into 'next' 
fix some issues with supername code

See merge request STJr/SRB2!2123
 2023-08-23 09:32:41 +00:00
Lactozilla
2b64698c4e Use different default viewpoint heights so that ceiling portals make more sense 2023-08-23 04:34:35 -03:00
Lactozilla
1506909a1f Reimplement sector portals 2023-08-23 04:24:06 -03:00
sphere
13ac83a208 Floor portal test, ported 
Co-authored-by: Lactozilla <jp6781615@gmail.com>
 2023-08-23 02:58:38 -03:00
Sal
3943a48a06 Merge branch 'fix-masked-seg-crash' into 'next' 
Fix a possible crash in R_RenderMaskedSegRange

See merge request STJr/SRB2!2121
 2023-08-23 04:31:23 +00:00
katsy
d8d352a11a fix some issues with supername code 2023-08-22 15:11:47 -05:00
Lactozilla
55b4458001 Fix a possible crash in R_RenderMaskedSegRange 
R_AllocTextureColumnTables wasn't checking if the tables were never allocated, making the renderer later attempt to render midtextures for drawsegs that don't contain actual midtextures.
 2023-08-22 13:37:42 -03:00
spherallic
5548b67462 Set spritexscale/spriteyscale in objectplace 2023-08-22 16:32:21 +02:00
sphere
ac3e9fc999 Merge branch 'binary-thing-options' into 'next' 
Clear thing flags for NiGHTS bumpers/hoops again

Closes #1097

See merge request STJr/SRB2!2118
 2023-08-21 08:24:51 +00:00
sphere
4bd296f98f Merge branch 'issue933' into 'next' 
Fix for issue #933 - special stage tokens should divert player until after the...

See merge request STJr/SRB2!1910
 2023-08-21 08:20:43 +00:00
spherallic
40d9614c32 Clear thing flags for NiGHTS bumpers/hoops again 2023-08-21 00:43:01 +02:00
spherallic
ce721f9f78 Allow input during title animation after 1st play 2023-08-20 23:40:13 +02:00
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next' 
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
 2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
sphere
d4aac9a857 Merge branch 'fix-freebsd-build' into 'next' 
Fix FreeBSD build errors

See merge request STJr/SRB2!2071
 2023-08-20 17:19:39 +00:00
sphere
3d0457d58b Merge branch 'preserve-texture-col-frac' into 'next' 
Use separate table for maskedtexturecol (resolves #635)

Closes #635

See merge request STJr/SRB2!2073
 2023-08-20 17:19:18 +00:00
sphere
8b7978ec35 Merge branch 'color-tweaks' into 'next' 
Small color tweaks

See merge request STJr/SRB2!2116
 2023-08-20 17:18:58 +00:00
sphere
4a89fc77c1 Merge branch 'fof-rendering-mishaps' into 'next' 
Fix a couple of FOF rendering issues

See merge request STJr/SRB2!2115
 2023-08-20 17:17:41 +00:00
sphere
5069e77d20 Merge branch 'fix-misplaced-color' into 'next' 
Resolve #1086

Closes #1086

See merge request STJr/SRB2!2114
 2023-08-20 17:17:34 +00:00
sphere
5dba53009e Merge branch 'recap-flip-spin' into 'next' 
Fix interpolation when curling up or scaling while flipped

Closes #983

See merge request STJr/SRB2!1979
 2023-08-20 17:16:53 +00:00
sphere
b533594a33 Merge branch 'udmf-absolutez' into 'next' 
Add absolute Z height flag for mapthings in UDMF

See merge request STJr/SRB2!2015
 2023-08-20 17:16:02 +00:00
sphere
9d6578d42f Merge branch 'weaponshadow' into 'next' 
Correct emerald & weapon ring/panel hitboxes, give drop shadows to weapon rings & panels

See merge request STJr/SRB2!2036
 2023-08-20 17:15:44 +00:00
spherallic
b52a36f04c Small tweaks to Foundation and Midnight 2023-08-20 18:38:14 +02:00
spherallic
50fc1abf9a Revert invcolor tweaks for Red/Rosy/Lavender 2023-08-20 18:30:30 +02:00
Sally Coolatta
40c37ce4c2 Revert left/right movement 2023-08-20 12:05:58 -04:00
Sally Coolatta
9c8dd54751 Fix color grid not extending to the very bottom 2023-08-20 11:56:55 -04:00
spherallic
f62c2f4c75 Fix arg # typos for "visible from inside" checks 2023-08-20 17:55:06 +02:00
spherallic
259732cccb Make FOF fades use 0-255 alpha, not 1-256 2023-08-20 17:42:27 +02:00
Sally Coolatta
4d1e6df2d7 Fix color grid input bugs 
There's still some slight awkwardness trying to wrap downwards into uneven row grids, but this is significantly better and this already took up way more time than I wanted it to.
 2023-08-20 11:28:39 -04:00
Sally Coolatta
2f1db66e78 Fix drawing of final color 2023-08-20 07:37:10 -04:00
Sally Coolatta
91fc3302cd Merge branch 'master' into next 2023-08-20 07:32:09 -04:00
James R
909e07be65 Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile 
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
 2023-08-20 07:31:10 -04:00
Sally Coolatta
b5b7b7c1e3 Merge remote-tracking branch 'upstream/master' into next 2023-08-20 00:23:26 -04:00
Sal
ec559612b9 Merge branch 'nights-pull-emblem-fix' into 'next' 
Don't NiGHTS pull emblems you can't collect

See merge request STJr/SRB2!2113
 2023-08-20 04:03:07 +00:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sally Coolatta
d589953fc4 Fix P_WriteSkincolor 2023-08-19 23:39:54 -04:00