stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-30 22:50:51 +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
Krabs
93c5b34ac0 Merge branch SRB2:next into expos-sphere 2023-11-01 14:14:16 +00:00
Lactozilla
d6b92de691 Revert these 2023-10-31 16:52:12 -03:00
Lactozilla
e9637322f9 Simplify fix 
pickedchar doesn't need to be set in these two places, since G_DeferedInitNew already does that.
 2023-10-31 16:45:47 -03:00
Zwip-Zwap Zapony
8cf6e8252c Interpolate captions 2023-10-31 13:30:16 +01:00
Zwip-Zwap Zapony
c2aa6d4c74 Fix captions being over-affected by GUI scale 
Captions' pop-in animation now starts 8 GUI pixels above the resting position, instead of (2 x GUI scale) GUI above it
 2023-10-31 13:14:36 +01:00
Zwip-Zwap Zapony
36e20ac619 Tiny caption loop optimisation 2023-10-31 13:10:39 +01:00
Lactozilla
4e446d22d6 Fix pickedchar not being set when it should have been 2023-10-31 04:04:01 -03:00
Alam Ed Arias
419925036b Merge remote-tracking branch 'origin/next' into lua-minmax-plus-bruh-moments 2023-10-30 22:44:44 -04:00
Monster Iestyn
165a925220 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-30 18:10:21 +00:00
Krabs
d6a0006b75 Merge branch 'combine-dupx-and-dupy' into 'next' 
Combine vid.dupx and vid.dupy

See merge request STJr/SRB2!1118
 2023-10-30 04:38:52 +00:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Logan Arias
2dcf845c7c Merge branch SRB2:next into blue-spring-balls 2023-10-29 18:23:50 +00:00
katsy
340d515754 Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony) 2023-10-29 17:43:40 +00:00
Monster Iestyn
512839453b Merge branch 'fix-opengl-saturation' into 'next' 
Fix saturation not being applied on colormaps in OpenGL

Closes #920

See merge request STJr/SRB2!2151
 2023-10-29 16:37:35 +00:00
Alam Ed Arias
97e449bd59 Merge branch 'master' into lua-minmax-plus-bruh-moments 2023-10-28 22:29:19 -04:00
Alam Ed Arias
bdc4512565 Merge branch 'master' into quake-fix 2023-10-28 21:02:44 -04:00
LJ Sonic
8608ded317 Add deprecation TODOs 2023-10-28 15:19:35 +02:00
LJ Sonic
c0146744b7 Normalise 2.3-related TODO comments 2023-10-28 14:46:10 +02:00
Gustaf Alhäll
e264caffe3
Fix dangling pointer in mapthing after removing mobj 2023-10-28 14:42:02 +02:00
LJ Sonic
c3f79a112f Add LUA_SetCFunctionField 2023-10-28 11:06:30 +02:00
LJ Sonic
d1dbdee016 Refactor global userdata registration 2023-10-28 00:24:04 +02:00
LJ Sonic
7a7d4f832a Remove stupid whitespace 2023-10-27 21:34:53 +02:00
LJ Sonic
bc9a378521 Refactor userdata metatable registration 2023-10-27 20:17:27 +02:00
LJ Sonic
4fa4d6e076 Implement input.ignoregameinputs 2023-10-27 17:34:29 +02:00
LJ Sonic
23268bf3e5 Move input-related Lua variables into the library 2023-10-27 16:29:47 +02:00
Alam Ed Arias
3ef47897e3 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-25 19:42:15 +00:00
Alam Ed Arias
f5859c3480 Merge branch SRB2:next into blue-spring-balls 2023-10-25 19:41:36 +00:00
Alam Ed Arias
26f978a905 Merge branch 'next' into platformpmomz 2023-10-25 15:07:49 -04:00
Alam Ed Arias
45a1b6be18 Merge branch SRB2:next into expos-sphere 2023-10-25 19:02:14 +00:00
Alam Ed Arias
15d476e3e6 Merge branch SRB2:next into expos-dust 2023-10-25 18:55:40 +00:00
Alam Ed Arias
b3ba4210d9 Merge branch SRB2:next into expos-sky 2023-10-25 18:55:00 +00:00
Alam Ed Arias
bc2f2b8d2a Merge branch SRB2:next into expos-follow 2023-10-25 18:34:25 +00:00
Alam Ed Arias
b75a09bfcf Merge branch SRB2:next into expos-special 2023-10-25 18:31:51 +00:00
Alam Ed Arias
3f29140ecb Merge branch SRB2:next into fix-segfault-polyvertex-null 2023-10-25 18:21:13 +00:00
Alam Ed Arias
0fb1c64338 Merge branch 'next' into sector-portals 2023-10-25 14:11:58 -04:00
Alam Ed Arias
1590f2a6f8 Merge branch 'master' into fix-sprite-clip-warning 2023-10-25 14:10:47 -04:00
Alam Ed Arias
59fc021d97 Merge branch 'next' into renderhitbox-nightsitems 2023-10-25 14:03:23 -04:00
Alam Ed Arias
fd41bf188d sidenum[0] is an uint32_t, not uint16_t 2023-10-25 12:16:10 -04:00
Alam Ed Arias
ec1b629609 spriteframe_t only gave 1D array, not 2D for rotated 2023-10-25 08:00:04 -04:00
Alam Ed Arias
229d0364d4 Fixed lookup sides for 32-bit systems 2023-10-25 07:40:55 -04:00
Alam Ed Arias
9d650b0ddc Makefile: add lua_colorlib.c 2023-10-25 07:27:35 -04:00
Alam Ed Arias
dea519637a Merge branch 'next' into lua-extracolormap 2023-10-23 14:49:44 -04:00
Alam Ed Arias
b9dddfbb23 Merge branch 'next' into raise-side-limits 2023-10-23 14:47:25 -04:00
Alam Ed Arias
bd9aa75f8a Merge branch 'next' into kill-hud-feetoffset 2023-10-23 14:45:49 -04:00
Alam Ed Arias
5a12d65150 Merge branch SRB2:next into fix-opengl-saturation 2023-10-23 18:37:40 +00:00
Alam Ed Arias
a4dc67cba7 Merge branch SRB2:next into fix-opengl-saturation-console 2023-10-23 18:36:50 +00:00
Alam Ed Arias
41fbfda870 Merge branch SRB2:next into fix-line-415-buffer-overflow 2023-10-23 18:32:41 +00:00
Alam Ed Arias
52a295d6f7 Merge branch SRB2:next into add-auto-kick-idle-players 2023-10-23 18:29:59 +00:00
Logan Arias
ae783f0129 Merge branch 'tb-nonet' into 'master' 
Disable libcurl when building without network support

See merge request STJr/SRB2!2182
 2023-10-22 16:21:37 +00:00
Logan Arias
6fac101cbe Disable libcurl when building without network support 2023-10-22 11:49:23 -04:00
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