stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 22:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
14513 commits 173 branches 41 tags 186 MiB
Commit graph

12862 commits

Author SHA1 Message Date
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
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
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
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
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
Sal
7ef7de1bc5 Level select cheat fixes 2023-08-20 03:16:14 +00:00
bitten2up
93f11508fc
remove stray else 2023-08-19 19:52:10 -05:00
spherallic
623fa126ad Fix backside ceiling vertex slopes 2023-08-18 15:08:12 +02:00
spherallic
07ef7c4639 Prevent FOF alpha from wrapping around in OpenGL 2023-08-17 20:15:03 +02:00
spherallic
66cc6a5f44 Correct flags for partially intangible FOFs 2023-08-17 19:31:55 +02:00
spherallic
9b296a1547 Disable Makefile deprecation warning for now 2023-08-17 19:27:33 +02:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped 
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
 2023-08-17 17:39:24 +02:00
sphere
207aba0a52 Merge branch 'fix-segfault-emerald-hunt-spec' into 'next' 
Fix segfault when spectating on an Emerald Hunt map

See merge request STJr/SRB2!2105
 2023-08-16 11:12:40 +00:00
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03:00
Lactozilla
dd4deaa5e9 Reduce code duplication 2023-08-15 12:43:31 -03:00
Lactozilla
8d56a4d32e Move splitscreen code path out of SetSkinLocal and into SendNameAndColor 2023-08-15 12:37:18 -03:00
Lactozilla
a745997243 Better handling of cv_skin/cv_playercolor in singleplayer 2023-08-15 12:27:38 -03:00
Lactozilla
e106b56b53 Only set the picked character once 2023-08-15 04:45:50 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
Lactozilla
0bb65166c9 Always allow changing color in multiplayer player setup menu 2023-08-15 03:49:31 -03:00
Lactozilla
9dc2447559 Ensure the correct color is set for the player object in splitscreen 2023-08-15 03:46:55 -03:00
Zwip-Zwap Zapony
8077a1db8f Always allow con_hudlines when using devmode 2023-08-14 19:55:47 +02:00
Zwip-Zwap Zapony
5830ff500f Fix mobj flag fumblings 2023-08-14 19:05:48 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map 2023-08-12 12:31:59 +02:00
SteelT
3fbdaa61b7 Merge branch 'cherry-pick-86367e4e' into 'next' 
Add gametype parameter to G_SetCustomExitVars and G_ExitLevel

See merge request STJr/SRB2!2101
 2023-08-10 00:01:24 +00:00
Sal
f96ebbb2f5 Merge branch 'warp-is-cheat' into 'next' 
Warp cheat adjustments

See merge request STJr/SRB2!2098
 2023-08-07 18:35:20 +00:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
SteelT
20e4e8a5c4 Fix crash handler showing garbage string for signal title 
This fixes the signal title being shown as something like "Process killed by signal: Process killed by signal: ó>"

Did some minor cleaning while I'm also here
 2023-08-07 14:06:24 -04:00
Lactozilla
f17493f379 Use -1 as the default, not 0 2023-08-07 14:30:39 -03:00
Lactozilla
b92dc42848 Add gametype parameter to G_SetCustomExitVars and G_ExitLevel 
(cherry picked from commit 86367e4ec1)
 2023-08-07 13:23:57 -04:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
MIDIMan
d06098c0aa Changed P_ConvertBinaryLinedefTypes to use args[1] instead of args[3] for linedef type 442 2023-08-05 20:22:11 -04:00
Sal
9e72b78a24 Merge branch 'scale-mishap' into 'next' 
Make UDMF scale compatible with ZDoom's spec

See merge request STJr/SRB2!2086
 2023-08-04 20:05:35 +00:00
Sal
f11538c478 Make UDMF scale compatible with ZDoom's spec 2023-08-04 20:05:35 +00:00
Sal
be056af77e Merge branch 'total-starts-at-record-score' into 'next' 
Total score starts at record score

See merge request STJr/SRB2!2091
 2023-08-04 20:05:17 +00:00
SteelT
6780f89574 Add missing param to G_CheckDemoExtraFiles in G_CheckDemoForError 2023-08-04 15:59:47 -04:00
Sally Coolatta
39175c6c70 Improved version checks for demo file lists 
No longer relies on the demoversion global variable (which was incorrect for a couple instances, like ghosts), now we pass the version to the file list functions. Also don't set any demo global variables when checking a demo for valid files before playback. Also also, exit said file check function asap if its a title demo instead of doing it after we've already opened the file.
 2023-08-04 14:36:56 -04:00