stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-19 17:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
12016 commits 172 branches 41 tags 280 MiB
Commit graph

10645 commits

Author SHA1 Message Date
LJ Sonic
0b012d5db0 Make the names of disconnected players flicker in tab HUD 2021-02-15 16:21:26 +01:00
LJ Sonic
b369243beb Use standard Lua naming scheme for polyobject list 2021-02-15 13:37:25 +01:00
SMS Alfredo
4430835a71 This might be dumb, but whatever 2021-02-14 20:49:03 -06:00
LJ Sonic
70850b0836 Deprecate P_AproxDistance for Lua scripts 2021-02-13 18:04:27 +01:00
LJ Sonic
758de501da Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot 2021-02-13 18:04:12 +01:00
LJ Sonic
a58df577fe Revert "Use FixedHypot over P_AproxDistance" 
This reverts commit c5474436af.
 2021-02-13 17:46:29 +01:00
LJ Sonic
d2d1f83b62 Revert "Use R_PointToDist2 instead" 
This reverts commit e19196a86e.
 2021-02-13 17:45:54 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
LJ Sonic
dfc1767794 Only call PlayerCmd hooks if added to game 2021-02-11 00:24:42 +01:00
LJ Sonic
3dff1eb1b7 Fix consoleplayer returning the server player during joining phase 2021-02-11 00:10:15 +01:00
SteelT
6089550972 Merge branch 'gl-texture-management' into 'next' 
Manage uploaded OpenGL textures with an internal list

Closes #411

See merge request STJr/SRB2!1391
 2021-02-07 13:37:33 -05:00
James R
5b287f9cce Merge branch 'fix-doublejump-divby0' into 'next' 
Fix a divby0 when you have specific character stats.

See merge request STJr/SRB2!1374
 2021-01-31 01:17:41 -05:00
Jaime Ita Passos
8318935811 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos
4891611ab7 tRNS chunk fix 
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
 2021-01-27 19:23:04 -03:00
Jaime Ita Passos
d4044a4f82 Add PF_ColorMapped 
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
 2021-01-27 18:54:33 -03:00
Jaime Ita Passos
5501d495c7 OpenGL backend: Manage uploaded GPU textures with an internal list 
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
 2021-01-27 17:48:57 -03:00
James R
29b6bd5df9 Merge branch 'fix-mobj-slidemove' into 'next' 
Make sliding against objects actually work (Fixes #400)

Closes #400

See merge request STJr/SRB2!1348
 2021-01-26 20:43:17 -05:00
LJ Sonic
36c193f317 Merge branch 'fix-boss2pogotarget' into 'next' 
Make several actions actually check for a player smh (Fixes #387)

Closes #387

See merge request STJr/SRB2!1340
 2021-01-25 18:11:38 -05:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
LJ Sonic
2d3e302929 Merge branch 'mode0-centering' into 'next' 
Fix video mode 0 not getting centered

See merge request STJr/SRB2!1344
 2021-01-25 17:59:26 -05:00
LJ Sonic
14ee92ef67 Merge branch 'gl-levelflat-fix' into 'next' 
Fix a misuse of levelflat_t.picture in OpenGL

See merge request STJr/SRB2!1327
 2021-01-25 16:40:02 -05:00
LJ Sonic
41f1b3cfa3 Merge branch 'jimita-why-you-done-this!!!' into 'next' 
Fix mobj unarchiving code

See merge request STJr/SRB2!1384
 2021-01-22 18:26:26 -05:00
Lachlan Wright
ea55a614d1 Merge branch 'flipped-waterrun' into 'next' 
Allow water running in reverse gravity

See merge request STJr/SRB2!1369
 2021-01-19 23:20:57 -05:00
Jaime Ita Passos
f3ad648874 Revert "Move a few mobj spawn defaults to its own function" 
This reverts commit 6f9c48a305.

# Conflicts:
#	src/p_mobj.c
 2021-01-17 23:17:46 +01:00
Tatsuru
90b0242802 Put his name at the right order 2021-01-11 21:49:31 -03:00
Tatsuru
fbcc0c25b3 Add Logan to the art credits 2021-01-10 23:17:40 -03:00
Hannu Hanhi
d252f074b7 Render midtextures on two-sided lines with a z-buffer offset 
This will fix z-fighting issues when they overlap with FOFs.
 2021-01-10 21:33:54 +02:00
GoldenTails
59bc197f32 Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999 Fix CA_BOUNCE when flipped 
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
 2021-01-08 16:25:10 +01:00
SteelT
52c96239ba Merge branch 'fix-lua-consvars-with-functions' into 'next' 
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403)

Closes #403

See merge request STJr/SRB2!1346
 2021-01-07 16:33:39 -05:00
SteelT
4041e69fad Merge branch 'pressing-two-keys-in-the-console-crashes-srb2' into 'next' 
Pressing Ctrl+Backspace In An Empty Console Crashes SRB2

See merge request STJr/SRB2!1370
 2021-01-07 16:32:51 -05:00
SteelT
da37d3c168 Merge branch 'fix-ticcmd-received' into 'next' 
Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request STJr/SRB2!1337
 2021-01-07 16:31:45 -05:00
SteelT
d9bdced3df Merge branch 'revert-8a30576d' into 'next' 
Revert plane sorting changes

See merge request STJr/SRB2!1353
 2021-01-07 16:20:30 -05:00
Steel Titanium
c8627464c9 Check if GME_VERSION is defined. 
I made the assumption it would always be defined, which won't always be the case.
 2021-01-06 19:40:30 -05:00
GoldenTails
70eb3228f8 Pressing A Key Combination In The Console Crashes SRB2 
get stryder7x in on this
 2021-01-05 13:20:02 -06:00
Tatsuru
1752f6efc1 Allow water running in reverse gravity 2021-01-04 18:10:41 -03:00
katsy
c19539248a add sprung flag to steam 2020-12-31 04:38:26 -06:00
LJ Sonic
0de3a64b59 Let Lua toggle the crosshair 2020-12-29 21:36:15 +01:00
GoldenTails
50d46e1fa6 Set the target of a spawned ghost to where it came from. 2020-12-27 00:21:09 -06:00
James R
4d6b677765 Revert "Merge branch 'plane-sorting-fix-part-3' into 'next'" 
This reverts merge request !1235
 2020-12-23 03:02:31 +00:00
James R
0d1050f360 Merge branch 'next' into 'next' 
Return nil on skincolor invalid field access

See merge request STJr/SRB2!1351
 2020-12-22 20:13:45 -05:00
SwitchKaze
ad8abcef09 Return nil on skincolor invalid field access 2020-12-21 15:48:49 -06:00
Jaime Ita Passos
abf0ca6690 Fix "missing initializer" warnings/errors in CVAR_INIT macros 2020-12-21 17:19:07 -03:00
GoldenTails
147c38c5ce Make sliding against objects actually work 2020-12-21 02:03:44 -06:00
GoldenTails
971518d22e Have Lua_OnChange restore the stack to what it was before it was called. 
So we don't get Luas with access to LUA_GetErrorMessage.
 2020-12-20 21:43:14 -06:00
Hannu Hanhi
6c330bbf16 Fix video mode 0 not getting centered 2020-12-21 00:03:20 +02:00
GoldenTails
08146c9cad Have A_ThrownRing check for a player too 2020-12-19 21:30:13 -06:00
GoldenTails
60564197af Have A_DetonChase check for a player too 2020-12-19 21:12:09 -06:00
GoldenTails
f9e5681a6b Actually check for a player smh 2020-12-19 20:33:29 -06:00
Jaime Ita Passos
1254f691ee Fix unused variable warning when USE_APNG is not defined 2020-12-19 17:40:18 -03:00
Jaime Ita Passos
4717261459 Optimize Picture_GetPatchPixel 2020-12-19 17:32:45 -03:00
LJ Sonic
b82cee780a Fix TICCMD_RECEIVED being overridden by gamelogic 2020-12-16 17:35:39 +01:00
Nev3r
b642682dde Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator 
# Conflicts:
#	src/doomtype.h
 2020-12-16 17:27:44 +01:00
Nev3r
98e67871f5 Merge branch 'fix-vibing-slopes' into 'next' 
Fix vibing slope planes

See merge request STJr/SRB2!1335
 2020-12-16 11:15:41 -05:00
Nev3r
ce89eb64ba Merge branch 'plane-viewangle-fix' into 'next' 
Restore the viewpoint's angle in R_DrawPlanes instead (related to #404)

See merge request STJr/SRB2!1326
 2020-12-16 11:15:27 -05:00
Nev3r
5b1732baa3 Merge branch 'binarymap-slopevertices-fix' into 'next' 
Replace the first entry in slope vertex thing taglists, instead of adding into them (related to #404)

See merge request STJr/SRB2!1333
 2020-12-16 10:55:21 -05:00
Nev3r
c97056f9ce Merge branch 'spritestuff2-archiving-fix' into 'next' 
Fix archived mobjs having no default blend mode and sprite scales

See merge request STJr/SRB2!1300
 2020-12-16 08:57:36 -05:00
Nev3r
60b3465002 Merge branch 'text-color' into 'next' 
Improved text colormaps (Closes #222 and #359)

Closes #222 and #359

See merge request STJr/SRB2!1202
 2020-12-16 08:50:30 -05:00
Zippy_Zolton
45976d2304 magenta and green sonicx 2020-12-15 22:19:57 -06:00
Jaime Ita Passos
fa9db2d644 Fix vibing slope planes 
I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.
 2020-12-16 00:26:08 -03:00
James R
84e9020eed Merge branch 'shieldless' into 'next' 
Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331
 2020-12-15 21:00:53 -05:00
James R
a36908a5ce Merge branch 'amys' into 'next' 
fix amy meeting herself in mario mode

See merge request STJr/SRB2!1330
 2020-12-15 20:57:16 -05:00
James R
f9ce70a6b3 Merge branch 'picfmt-fixes' into 'next' 
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats

See merge request STJr/SRB2!1324
 2020-12-15 20:55:52 -05:00
James R
019082cf7a Merge branch 'dusty' into 'next' 
Make fiery spindust fullbright

See merge request STJr/SRB2!1317
 2020-12-15 20:53:29 -05:00
Zippy_Zolton
29495ad436 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-15 19:51:40 -06:00
James R
00c5d70bfc Merge branch 'drain-antiri' into 'next' 
Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request STJr/SRB2!1315
 2020-12-15 20:51:39 -05:00
James R
cab089c5b1 Merge branch 'gl-colormap-update' into 'next' 
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
 2020-12-15 20:50:45 -05:00
James R
14c6d93c0c Merge branch 'team-elementalfire' into 'next' 
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
 2020-12-15 20:47:45 -05:00
James R
804e049579 Merge branch 'intermission-double-free-fix' into 'next' 
Fix double free occuring when unloading the intermission patches

See merge request STJr/SRB2!1304
 2020-12-15 20:44:57 -05:00
James R
73a7365798 Merge branch 'circuit-finallap' into 'next' 
Final lap text for circuit

See merge request STJr/SRB2!1303
 2020-12-15 20:42:59 -05:00
James R
503364f5f8 Merge branch 'gme-spc-fix' into 'next' 
Fix SPC looping on libgme versions >= 0.6.3

See merge request STJr/SRB2!1302
 2020-12-15 20:40:10 -05:00
katsy
d999e436f1 GETFLAG 2020-12-14 20:23:24 -05:00
Zippy_Zolton
07034cf441 fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088 Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Jaime Ita Passos
3b36005ceb Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
d0f3a6d737 Better check for tag list userdata 2020-12-14 08:08:01 -08:00
James R
00dff6d283 Push "valid" only once 2020-12-14 05:53:57 -08:00
katsy
f09198788d Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
katsy
721170f5a0 lol 2020-12-14 05:32:51 -06:00
katsy
da7cdd92ff Merge remote-tracking branch 'stjr/next' into dashaction 2020-12-14 05:10:01 -06:00
katsy
4521827e2c you too 2020-12-14 04:06:28 -05:00
katsy
200e444016 go away whitespace 2020-12-14 04:05:14 -05:00
katsy
2bebaf12d0 add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
katsy
dfbb1825f4 ditto 2020-12-14 04:02:17 -05:00
katsy
0ce9d9127a add SF_NOSHIELDABILITY 2020-12-14 04:01:50 -05:00
katsy
2b23468359 remove amy 2020-12-14 02:36:00 -05:00
Zippy_Zolton
c247b94be7 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
Jaime Ita Passos
6160a2d0fe Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port) 2020-12-14 02:07:12 -03:00
Jaime Ita Passos
ca78fc69ca Restore the viewpoint's angle in R_DrawPlanes instead 2020-12-14 01:14:55 -03:00
Jaime Ita Passos
7e0a1709de Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats 2020-12-14 00:53:42 -03:00
James R
760e083c30 Merge branch 'fix-playintro-crash' into 'next' 
Fix intro crash

See merge request STJr/SRB2!1310
 2020-12-13 22:17:25 -05:00
Steel Titanium
83e80eef9b Add deprecation warning when using the level header parameter 2020-12-12 18:54:47 -05:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
Sally Coolatta
e19196a86e Use R_PointToDist2 instead 
Apparently overflows less often

Actually, lets just fix FixedHypot instead.

Now FixedHypot uses the code from R_PointToDist2, and R_PointToDist2 just calls FixedHypot.

Ultimately, this branch was intended to get rid of a redundant way to retrieve distance and replace it with the one that was actually good at its job. So consolidating FixedHypot and R_PointToDist2 together is just an extension of that.
 2020-12-12 14:49:26 -08:00
Sally Coolatta
c5474436af Use FixedHypot over P_AproxDistance 
Not convinced that the small speed benefit from P_AproxDistance is worth the "aproximate"[sic] results it gives. Let's instead try a define to replace it with FixedHypot. In Lua, the function gives a deprecated warning.

Inspired by the hyperwall fix for vanilla, except for everything. From little testing, actively improves waypoint checks, bumping, speed checks, wall collisions, Jawz targetting, Lightning Shield attacks, so on.

The only way I see this as a potential downgrade is A_Look (and related functions) getting slower, which are barely used in Kart.
 2020-12-12 14:49:25 -08:00
James R
e94bccc503 Merge branch 'apng-downscale' into 'next' 
Add aPNG downscaling

See merge request STJr/SRB2!1197
 2020-12-12 17:39:56 -05:00
James R
9649a9fbae Merge branch 'player-speed' into 'next' 
Make player->speed and other things use R_PointToDist2

See merge request STJr/SRB2!1309
 2020-12-12 17:38:02 -05:00
James R
69ea84db80 Merge branch 'credits-229' into 'next' 
Add Zolton and Ors to the credits

See merge request STJr/SRB2!1308
 2020-12-12 17:35:29 -05:00
James R
7b6675178e Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
143ec3e40b Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
b31c4db89d Remove trailing whitespace 2020-12-12 02:37:03 -08:00
James R
e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
katsy
2971156ba7 Update info.c 2020-12-11 23:39:42 -05:00
Steel Titanium
ab156e1709 Remove music slot compatibility 2020-12-11 23:11:15 -05:00
katsy
ddf743d521 make fire spindust dust fullbright 2020-12-11 20:59:14 -05:00
Zippy_Zolton
68de9f4bbe Make Ring Drain sectors play the depletion sound instead of the ring sound 2020-12-11 12:34:30 -06:00
Zippy_Zolton
f2095b57fd Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b scale minimum dashmode thok on actionspd, not normalspeed 2020-12-10 20:52:06 -05:00
Jaime Ita Passos
440f46144a Fix intro crash 2020-12-10 22:01:53 -03:00
Zippy_Zolton
916cacb38f snailer 2020-12-10 19:01:09 -06:00
Jaime Ita Passos
3472b3ece3 Fix ERZ3 mode 2020-12-10 21:55:22 -03:00
Zippy_Zolton
317c107064 Make player->speed use R_PointToDist2 2020-12-10 16:09:43 -06:00
James R
69d98b22ad Credits: add Zolton and Ors to the programming section 2020-12-10 13:40:47 -08:00
James R
29745f80dc Merge branch 'lua-skinsprites' into 'next' 
Lua: Allow access to skin.sprites[]

See merge request STJr/SRB2!1238
 2020-12-10 15:49:48 -05:00
James R
e05433f282 Merge branch 'fix-gl-draw-cropped' into 'next' 
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.

See merge request STJr/SRB2!1297
 2020-12-10 15:44:51 -05:00
James R
6d3442a5d7 Merge branch 'saloondoor-revengeance' into 'next' 
Saloon door fixes (closes #394)

Closes #394

See merge request STJr/SRB2!1296
 2020-12-10 15:43:31 -05:00
James R
d8bf015467 Merge branch 'caret-color-letter' into 'next' 
Make caret coloring support letters.

See merge request STJr/SRB2!1295
 2020-12-10 15:41:02 -05:00
James R
7e8fc66654 Merge branch 'brak' into 'next' 
Fix brak barrier size (Closes #139)

Closes #139

See merge request STJr/SRB2!1294
 2020-12-10 15:39:42 -05:00
James R
fc5708b2f2 Merge branch 'firemelt' into 'next' 
Fix objects with MF_FIRE disappearing in lava (Closes #366)

Closes #366

See merge request STJr/SRB2!1287
 2020-12-10 15:37:57 -05:00
James R
c6dd218e2b Merge branch 'dehacked-hell-bruh' into 'next' 
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops

See merge request STJr/SRB2!1286
 2020-12-10 15:36:01 -05:00
James R
8c74dd26a9 Merge branch 'ffloorclip-fixes' into 'next' 
ffloorclip fixes (resolves #385 and #391)

Closes #385 and #391

See merge request STJr/SRB2!1284
 2020-12-10 15:35:39 -05:00
James R
e46c6e75f3 Merge branch 'metal-sigfpe' into 'next' 
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
 2020-12-10 15:35:03 -05:00
James R
413fa89555 Merge branch 'fixargstr' into 'next' 
Fixargstr

See merge request STJr/SRB2!1280
 2020-12-10 15:31:05 -05:00
James R
0b2e60ba1d Merge branch 'my-junk' into 'next' 
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
 2020-12-10 15:29:10 -05:00
James R
5a0d3981f1 Merge branch 'super-giverings' into 'next' 
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
 2020-12-10 15:27:01 -05:00
James R
9ea969b62d Merge branch 'gamequit-argument' into 'next' 
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
 2020-12-10 15:25:52 -05:00
James R
f180a1fc3c Merge branch 'holy-zip' into 'next' 
Disallow pk3s with extra bytes

See merge request STJr/SRB2!1275
 2020-12-10 15:21:20 -05:00
James R
ef6f69ee22 Merge branch 'CR_BRUH' into 'next' 
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
 2020-12-10 15:20:11 -05:00
James R
703631956b Merge branch 'dumb-stuff' into 'next' 
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags

See merge request STJr/SRB2!1273
 2020-12-10 15:17:28 -05:00
James R
ee48fa2de3 Merge branch 'mario1up' into 'next' 
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
 2020-12-10 15:15:08 -05:00
James R
9a77cf6306 Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R
1d31fe3759 Merge branch 'exposed!!!' into 'next' 
Expose player.skin and player.availabilities to Lua as Read-only

See merge request STJr/SRB2!1269
 2020-12-10 15:09:55 -05:00
James R
77c51c62c2 Merge branch 'expose-selectheading' into 'next' 
Expose mapheader_t's selectheading option to Lua

See merge request STJr/SRB2!1268
 2020-12-10 15:07:23 -05:00
James R
857113b60e Merge branch 'crunchyroll' into 'next' 
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
 2020-12-10 15:07:01 -05:00
James R
8701caa110 Merge branch 'blua-urite' into 'next' 
Fix crash when trying to use bitwise NOT on true/false/nil

See merge request STJr/SRB2!1262
 2020-12-10 15:03:39 -05:00
James R
c841750868 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
James R
4275d52267 Merge branch 'marathon-mode-tokens' into 'next' 
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
 2020-12-10 14:57:23 -05:00
Louis-Antoine
3aecc22764 Add a shorthand alias for FRACUNIT 2020-12-10 11:49:29 -08:00
Louis-Antoine
39a320734d Add shorthand aliases for fixed-point functions 2020-12-10 11:48:40 -08:00
James R
a5d228773d Merge branch 'reload-bans' into 'next' 
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes

See merge request STJr/SRB2!1215
 2020-12-10 14:28:13 -05:00
James R
e4cf8ebcf5 Merge branch 'what-is-a-standard' 2020-12-10 11:23:53 -08:00
James R
0df5d8ff58 Oops! 2020-12-10 03:06:41 -08:00
James R
2ab71571aa Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
James R
e7883f3f8e That moment when you see HAVE_BLUA crawl back from the grave 
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
 2020-12-10 00:36:14 -08:00
Zippy_Zolton
7082db485b CTF text 2, branch is finished 2020-12-08 16:09:51 -06:00
Zippy_Zolton
1b888c689c CTF text 1 2020-12-08 15:56:45 -06:00
Zippy_Zolton
45a4b728b3 zwip suggestion 2020-12-08 12:05:06 -06:00
Steel Titanium
c2de684150 Fix double free occuring when unloading the intermission patches due to the same patch being cached twice 2020-12-07 17:54:08 -05:00
Zippy_Zolton
2721725962 Final lap text for circuit 2020-12-07 16:46:05 -06:00
Steel Titanium
11bbad9be8 Tab fix 2020-12-06 22:58:17 -05:00
Steel Titanium
c3a560f51d Let's check for looping first 2020-12-06 22:30:50 -05:00
Steel Titanium
284205baac Fix SPC looping on libgme versions >= 0.6.3 2020-12-06 22:20:06 -05:00
Jaime Ita Passos
18ee97c583 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
Jaime Ita Passos
6f9c48a305 Move a few mobj spawn defaults to its own function 2020-12-06 17:46:35 -03:00
Jaime Ita Passos
24ba782144 Fix archived mobjs having no default blend mode and sprite scales 2020-12-06 17:29:20 -03:00
GoldenTails
6546fc8ce7 Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. 2020-12-06 12:01:31 -06:00
Tatsuru
3b85abdee7 Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
GoldenTails
233990099d Make caret coloring support letters. 2020-12-06 04:28:12 -06:00
katsy
8f4d23197c space 2020-12-06 04:32:30 -05:00
katsy
5853a0b4d8 Revert "add noclipheight on chaingrab" 
This reverts commit 8541409329
 2020-12-06 07:44:59 +00:00
katsy
ffd20ee753 Revert "ensure the new flag is cleared properly" 
This reverts commit 3dbb44e7b1
 2020-12-06 07:44:49 +00:00
katsy
2fcf613a31 brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved 2020-12-06 00:13:10 -05:00
katsy
fd4674971a Replace p_inter.c 2020-12-06 00:10:45 -05:00
katsy
768ee57057 Replace p_user.c 2020-12-06 00:10:28 -05:00
katsy
3dbb44e7b1 ensure the new flag is cleared properly 2020-12-05 23:17:01 -05:00
katsy
8541409329 add noclipheight on chaingrab 2020-12-05 23:13:47 -05:00
GoldenTails
f6af04ecbb Fix weird spelling mistake 2020-12-05 05:00:59 -06:00
James R
0b0f2e1e35 Invalidate taglist userdata 2020-12-05 02:26:00 -08:00
James R
5d1040c924 Reset taggroup iterator on successive calls 2020-12-05 02:08:00 -08:00
James R
8dd964e3a7 Lua: taglist.add and taglist.remove for sector tag lists 2020-12-05 02:02:06 -08:00
James R
e5a3e6a845 Fix removing a tag unsetting the bit array even if more elements with that tag exist 2020-12-05 01:14:52 -08:00
James R
ae663e7247 Don't realloc twice when adding to the taggroup 2020-12-05 00:46:51 -08:00
James R
828d7e71ce Fix uninitialized last element when using Taggroup_Remove 2020-12-05 00:36:54 -08:00
James R
314fd2783a Lua tag lists 
Index and take length of tag lists like a table, 1-indexed. There are three
methods which may be used on tag lists:

list:iterate() - returns an iterator over the tags in the list
list:has(tag) - returns a boolean whether the tag is in the list
list.shares(list2) - returns whether two lists share a tag

"find" is also an alias to "has". Each method may be accessed from the global
taglist library too, e.g. taglist.iterate(list)

Tag lists may be compared with an equality operator too. This will tell you if
the two lists are composed of identical tags.

Accessible from sector.taglist, line.taglist and mapthing.taglist.
 2020-12-04 13:53:27 -08:00
James R
c2217bb426 Mkae Lua taggroups indexable 
They are 1-indexed.
 2020-12-04 04:54:12 -08:00
James R
96851e52a1 hehehehehe what if I forgot to git add? 2020-12-04 02:27:46 -08:00
James R
621efbfa15 Lua taglib for accessing taggroups 
The global "tags" can be iterated upon for every unique tag which is set in the
level. If a tag is set on a sector/line/thing, it will be included. Taking the
length of "tags" will give you the number of these unique tags. (If a tag is
set on multiple sectors/lines/things, it will only be counted once though.)

For sectors, lines and mapthings, call the field "tagged". This function takes
one argument, which is the tag. The return value can be iterated over for all
the sectors/lines/things with that tag. The length can also be taken for the
number of such objects. If no argument is given, the global tag is default.
 2020-12-04 00:30:08 -08:00
Jaime Ita Passos
2017eb4d9e Fix polyobject segs messing with 3D floors they shouldn't be 2020-12-04 00:03:54 -03:00
Steel Titanium
4c53eabc59 Reword the error to be more consistent with other errors 2020-12-03 21:14:27 -05:00
Steel Titanium
7d45a7c91a Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites 2020-12-03 17:29:08 -05:00
Tatsuru
fae845f935 Initialize in p_spec.c too + magic number replacement 2020-12-03 17:50:10 -03:00
Zippy_Zolton
29f56fb2d8 g 2020-12-03 02:05:10 -06:00
Zippy_Zolton
c28bd8005e Fix fire objects disappearing in lava 2020-12-03 01:28:54 -06:00
GoldenTails
b5526312e7 Fix missing stuff 2020-12-02 19:47:00 -06:00
Radicalicious
c98108df27 Revert "Update hw_light.c" 
This reverts commit b254439592
 2020-12-03 00:46:28 +00:00
Jaime Ita Passos
47b8c0648b Don't clip if the 3D floor is fog 2020-12-02 15:34:11 -03:00
Jaime Ita Passos
0ffb241c0a Fix 3D floor culling with polyobject segs 2020-12-02 15:31:11 -03:00
Tatsuru
a67862665a Don't spawn the projectile if you're just gonna delete it 2020-12-02 12:05:40 -03:00
Radicalicious
b254439592 Update hw_light.c 2020-12-02 00:17:57 -05:00
Nev3r
4d716cb170 Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r
c8ae28bbaf Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
Zachary McAlpin
7fde15d066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-30 23:48:49 -06:00
James R
d004515d6a Fix double define 2020-11-30 19:04:23 -08:00
Zippy_Zolton
69248cc684 thanks zap 2020-11-30 16:39:24 -06:00
Tatsuru
9770368ee9 Initialize junk line tag lists 2020-11-30 18:21:06 -03:00
Zippy_Zolton
20d1811983 oops 2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9 overhaul 2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b P_GivePlayerRings 2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it 2020-11-29 17:16:57 -06:00
GoldenTails
119d2e9e37 Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00
LJ Sonic
eef3028110 Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next 
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
 2020-11-29 21:54:15 +01:00
Zachary McAlpin
51d52f7327 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-29 13:59:10 -06:00
GoldenTails
b389700de3 Always call GameQuit when quitting via the Quit menu option on the title screen. 2020-11-29 08:32:04 -06:00
GoldenTails
59d2646593 Send a quitting argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
Nev3r
ecb333511b Merge branch 'fix-playercmd' into 'next' 
Fix PlayerCmd not handling angle and aiming correctly

See merge request STJr/SRB2!1265
 2020-11-29 05:30:01 -05:00
Nev3r
bcf6823cbf Merge branch 'dehacked-hell' into 'next' 
Split dehacked.c into multiple files.

See merge request STJr/SRB2!1222
 2020-11-29 05:18:45 -05:00
James R
445d040795 Don't print W_VerifyFile errors more than once 2020-11-28 20:51:21 -08:00
SMS Alfredo
95dfb93a11 Allow non-player objects to apply the CR_PLAYER carry type without crashing the game 2020-11-28 22:03:02 -06:00
James R
6b4d422664 Don't add pk3 if there are holes 
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
 2020-11-28 20:00:01 -08:00
James R
75c5c8ba6a Add missing *individual* skin flags 2020-11-28 02:22:08 -08:00
James R
b9f6069cd0 Replace TC macros with an enum that automatically counts up 
Also fixes TC_DASHMODE not being accessible to Lua.
 2020-11-28 02:19:52 -08:00
Zachary McAlpin
0280721f08 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-26 10:39:41 -06:00
Zippy_Zolton
db6b0c6aa0 Fix normal one-up sound playing in Mario mode 2020-11-25 21:46:45 -06:00
James R
4ab667c6a0 Merge branch 'spritestuff2-fixes' into 'next' 
Some fixes for spritestuff2

See merge request STJr/SRB2!1264
 2020-11-25 19:26:49 -05:00
SMS Alfredo
5c71fe0710 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
SMS Alfredo
b2d6d4f83f Expose player.skin and player.availabilities to Lua as Read-only 2020-11-25 12:35:36 -06:00
Zachary McAlpin
d095517999 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-24 20:42:08 -06:00
Zachary McAlpin
76822cef2b Expose the selectheading option from mapheader_t in Lua 2020-11-24 20:41:11 -06:00
lachwright
87968c946b Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice 2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442 Replace credits with original authors 2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
GoldenTails
d806655769 Fix a dumb typo of luaL_checklstring i made whoops 2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117 Fix a crash 2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2 ...snickerdoodles 2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616 Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE 2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING" 
This reverts commit ad9bf6085f.
 2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73 Remove unneeded S_PLAY_ROLL check 2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
James R
8d71559afe Merge branch 'make-some-lua-globals-rw' into 'next' 
Make several Lua global variables writable.

See merge request STJr/SRB2!1233
 2020-11-22 18:47:53 -05:00
James R
8a30576d81 Merge branch 'plane-sorting-fix-part-3' into 'next' 
Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235
 2020-11-22 18:31:23 -05:00
James R
f39300ac74 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R
6d9e036c7f Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
James R
b059ed40c6 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R
40e954779e Resolve one last conflict in splat sorting 
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
 2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R
54da9552de Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 2020-11-22 14:41:42 -08:00
James R
30792e7820 Merge branch 'flame-orb' into 'next' 
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
 2020-11-22 17:31:23 -05:00
James R
92625483a4 Merge branch 'replay-height-fix' into 'next' 
Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241
 2020-11-22 17:25:41 -05:00
James R
bec85c033a Merge branch 'replay-camera-update' into 'next' 
Make the replay camera follow the player

See merge request STJr/SRB2!1243
 2020-11-22 17:23:38 -05:00
James R
eb28532244 Merge branch 'remove-unused-music-types' into 'next' 
Remove unused music type enums

See merge request STJr/SRB2!1253
 2020-11-22 17:16:35 -05:00
James R
6d6eb79226 Merge branch 'uncap-palettes' into 'next' 
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
 2020-11-22 17:16:21 -05:00
James R
b2a84a9376 Merge remote-tracking branch 'origin/master' into no-dd-make 2020-11-22 14:14:43 -08:00
Jaime Ita Passos
2e21168395 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Riku Salminen
b9fa50f7ef No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Jaime Ita Passos
0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008 Some interface fixes 2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e Fix sprite textures in models 2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00