stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
12300 commits 172 branches 41 tags 280 MiB
Commit graph

10909 commits

Author SHA1 Message Date
GoldenTails
5b2abfa18d Replace some decimal constants with more descriptive hex constants. 2021-04-05 04:19:35 -05:00
James R
84191252d2 Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
Hannu Hanhi
e9213b2b41 Fix a OpenGL backend DeleteTexture crash 2021-04-04 21:29:15 +03:00
katsy
57c7a18a20 don't say we launched if we didn't actually launch 2021-04-02 20:50:56 -04:00
SwitchKaze
3895c02330 Revert "Remove key stuff" 
This reverts commit a439e569
 2021-04-02 15:46:08 -05:00
SwitchKaze
0db07cef0e Adjust joystick axis enum 2021-04-02 15:46:08 -05:00
SwitchKaze
5a247bf375 Fix typo in comment of I_GetMouseGrab 2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b Mouse improvements 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed Refactor mouse 2021-04-02 15:22:22 -05:00
LJ Sonic
99c773f39e Merge branch 'dontdothisinsoftwarelol' into 'next' 
don't HWR_ClearAllTextures() in software (fixes #389)

Closes #389

See merge request STJr/SRB2!1440
 2021-03-31 16:19:18 -04:00
LJ Sonic
4ef3477054 Merge branch 'smoother-freelook' into 'next' 
Smoother freelook in Software

See merge request STJr/SRB2!1444
 2021-03-31 16:17:40 -04:00
LJ Sonic
a584d7edea Merge branch 'playercanenterspingaps' into 'next' 
Do not let SF_NOJUMPSPIN characters enter sectors they could not enter if standing at full height (Closes #457)

Closes #457

See merge request STJr/SRB2!1432
 2021-03-31 16:15:35 -04:00
LJ Sonic
933fad7702 Merge branch 'fix-luafile-transfer' into 'next' 
Prevent a single client from blocking Lua file transfers

See merge request STJr/SRB2!1435
 2021-03-31 14:28:22 -04:00
LJ Sonic
4b15b52dfc Our menu system sucks. That's all I have to say. 2021-03-31 19:49:37 +02:00
katsy
d1700bbf18 Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
Jaime Ita Passos
7e6bc97240 Smoother freelook in Software 
Mhm hmm...
 2021-03-30 22:52:50 -03:00
Jaime Ita Passos
59be35e533 Rename functions, make more efficient, fix subtractive in Software 2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481 Blend modes revision 
This changes how blend modes render, and includes fixes.
 2021-03-30 17:03:05 -03:00
Monster Iestyn
0d5284c36c Murder MSDOS, another of the remaining DOS port related macros 
I also put in a missing `defined (__APPLE__)` in d_netcmd.h related to cv_mouse2opt

Also removed a redundant `!defined (__APPLE__)` in d_main.c
 2021-03-30 19:27:10 +01:00
Jaime Ita Passos
4025a1d517 [Software] A few floorsprite fixes 
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
 2021-03-29 23:04:13 -03:00
namishere
32a4b270df Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into buttered-lua 2021-03-29 16:15:50 -07:00
Mari0shi06
29704e141b Change Raspberry's chat colormap to V_ROSYMAP 2021-03-28 17:29:24 -04:00
Mari0shi06
715a3661b5 Revert "Change Raspberry's chat color to V_ROSYMAP" 
This reverts commit 192fa5cb4b
 2021-03-28 21:27:46 +00:00
Mari0shi06
192fa5cb4b Change Raspberry's chat color to V_ROSYMAP 2021-03-28 17:26:41 -04:00
Mari0shi06
424f67a74b Revert "Change Raspberry's chat colormap to V_ROSYMAP" 
This reverts commit 428ae3127e
 2021-03-28 21:19:26 +00:00
Mari0shi06
428ae3127e Change Raspberry's chat colormap to V_ROSYMAP 2021-03-28 17:12:58 -04:00
katsy
d6eaf7e0ff clear before switching, not after 2021-03-28 12:22:04 -05:00
katsy
55d63000f4 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
Monster Iestyn
df9b5c4312 Merge branch 'avoid-savemoddata' into 'next' 
Fix addons with custom gamedata not loading

Closes #473

See merge request STJr/SRB2!1427
 2021-03-26 13:06:49 -04:00
lachablock
8162d90c94 Fix LUAh_PlayerHeight returning wrong default value 2021-03-26 18:01:55 +11:00
LJ Sonic
854e43ea7c Kick clients if they take too long to download a Lua file 2021-03-25 22:43:06 +01:00
LJ Sonic
b6e5837161 Use a separate transfer status for disconnected nodes 2021-03-25 22:28:35 +01:00
SteelT
fa8947ad8f Merge branch 'no-apng-compile-fix' into 'next' 
Fix unused variable warning when USE_APNG is not defined

See merge request STJr/SRB2!1343
 2021-03-25 14:02:23 -04:00
SwitchKaze
6267abac8a Fix console text bleeding 2021-03-25 12:43:30 -05:00
lachablock
000e865f80 Revise spinheight/gap entry conditions (again), let's keep things WAY simpler: 
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
 2021-03-25 21:42:25 +11:00
lachablock
6ea9653681 Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11:00
lachablock
b1a9262889 Fix P_PlayerCanEnterGaps issues with polyobject collision 2021-03-25 15:58:52 +11:00
lachablock
f99d89742a Revise conditions under which players use spinheight and enter gaps: 
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
 2021-03-25 15:57:35 +11:00
Monster Iestyn
7511911846 Merge branch 'custom3dcrash' into 'next' 
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
 2021-03-24 14:24:21 -04:00
Monster Iestyn
4a898bace6 Merge branch 'next' into monster-cleaning-up-again 2021-03-24 15:39:38 +00:00
Monster Iestyn
91187f91be Merge branch 'fix-opengl-drawcroppedpatch' into 'next' 
Fix OpenGL V_DrawCroppedPatch (Fixes #452)

Closes #452

See merge request STJr/SRB2!1412
 2021-03-24 11:34:58 -04:00
Jaime Ita Passos
08937f892a Allocate a buffer for non-RGBA to RGBA texture conversions. 
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
 2021-03-23 01:18:28 -03:00
lachablock
0405b3922c Do not let nonspin characters enter sectors they could not enter if standing at full height 2021-03-23 15:09:04 +11:00
Monster Iestyn
ee8acccd3c RETURN OF THE PORTS CHOPPING BLOCK: Destroy DOS! 
Remove all remaining traces of the following macros for the obsolete DOS port, which were missed previously:
* `DJGPP`
* `__DJGPP__`
* `DJGPPDOS`
* `PC_DOS`
* `WATTCP`

May get rid of `MSDOS` later once I get word on whether I should kill it or not
 2021-03-22 14:43:26 +00:00
Monster Iestyn
2aaaddae7c Fix mistake I made with my previous commit for r_skins.c 2021-03-22 14:17:22 +00:00
Monster Iestyn
571d6c5438 Merge branch 'next' into monster-cleaning-up-again 2021-03-22 13:53:53 +00:00
katsy
42cfcbf7be fix sigsegv in A_Custom3DRotate 2021-03-21 16:09:11 -05:00
Monster Iestyn
b882aea2e4 Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE. 
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
 2021-03-21 19:49:32 +00:00
sphere
0c22fecafa Make horizontal springs above floors put the player in spring state. 2021-03-17 12:42:18 +01:00
sphere
95eff8cbc5 Avoid savemoddata being set in W_InitFile to fix addons with gamedata. 2021-03-15 18:11:02 +01:00
lachablock
36c2be283c Disallow write_backtrace on Windows entirely 2021-03-15 15:17:55 +11:00
Lach
91c9d667e1 Merge branch 'final-tweaks' into 'next' 
More final tweaks for 2.2.9 I guess

See merge request STJr/SRB2!1417
 2021-03-14 20:52:47 -04:00
Lach
cf42a62b7e Merge branch 'dropdropSHAdow' into 'next' 
Papersprite dropshadows no longer askance

Closes #409

See merge request STJr/SRB2!1408
 2021-03-14 20:52:25 -04:00
Lach
6ab5432713 Merge branch 'opengl-renderflags-fix' into 'next' 
Fix a few renderflags oversights in OpenGL

See merge request STJr/SRB2!1422
 2021-03-14 20:51:57 -04:00
Hannu Hanhi
746c84e0b5 Fix wrong color on player models' first frame by updating variable after loading blend texture 2021-03-13 23:07:51 +02:00
LJ Sonic
efdfa55328 Remove misleading comment 2021-03-12 19:54:01 +01:00
Lachlan Wright
c589fe85e4 Merge branch 'ogl-compileshaders-bug' into 'next' 
Remove misplaced SetShader call in CompileShaders (Fixes #402)

Closes #402

See merge request STJr/SRB2!1423
 2021-03-09 00:14:17 -05:00
Lachlan Wright
d97de6d3bd Merge branch 'sw-culling-inaccuracy' into 'next' 
Use double precision in R_StoreWallRange sloped seg culling calculations (Fixes #434)

Closes #434

See merge request STJr/SRB2!1424
 2021-03-09 00:13:53 -05:00
LJ Sonic
0765004188 Merge branch 'print-backtrace' into 'next' 
Print a backtrace when SRB2 crashes in a Unix-like environment.

See merge request STJr/SRB2!1288
 2021-03-07 08:26:44 -05:00
Hannu Hanhi
8cc49a0f2e Use double precision in R_StoreWallRange sloped seg culling calculations 
Fixes culling issues in CEZ2 skybox
 2021-03-06 19:56:25 +02:00
Hannu Hanhi
caab4e96cd Remove misplaced SetShader call in CompileShaders 2021-03-06 19:38:17 +02:00
Jaime Ita Passos
f6cb1798cc Fix a few renderflags oversights in OpenGL 2021-03-02 02:27:14 -03:00
Lachlan Wright
e03700fc2a Merge branch 'nogmever' into 'next' 
Check if GME_VERSION is defined.

See merge request STJr/SRB2!1372
 2021-03-01 17:50:48 -05:00
Lachlan Wright
fc1bc94d9a Merge branch 'fix-flipped-bounce' into 'next' 
Fix CA_BOUNCE height when flipped (Fixes #428)

Closes #428

See merge request STJr/SRB2!1373
 2021-03-01 17:49:54 -05:00
Steel Titanium
d59de95262 Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
49c68d279d Merge branch 'marathon-pause-fix' into 'next' 
Disable pausing during score screens in marathon mode

See merge request STJr/SRB2!1416
 2021-03-01 16:51:28 -05:00
Lachlan Wright
b8873e8182 Merge branch 'skincolor-modif-fix' into 'next' 
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443, #449, #459)

Closes #443, #449, and #459

See merge request STJr/SRB2!1421
 2021-03-01 16:49:20 -05:00
Lachlan Wright
588a40453b Merge branch 'linkdraw-scale-fix' into 'next' 
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458)

Closes #458

See merge request STJr/SRB2!1420
 2021-03-01 16:49:10 -05:00
Lachlan Wright
94c7124904 Merge branch 'revert-9649a9fb' into 'next' 
Revert "Merge branch 'player-speed' into 'next'"

Closes #466 and #471

See merge request STJr/SRB2!1418
 2021-03-01 16:49:00 -05:00
James R
5f4e21ed3a Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files 2021-02-28 17:02:08 -08:00
Jaime Ita Passos
94fe7a3d8c Change I_Error message 2021-02-28 17:47:12 -03:00
Jaime Ita Passos
401271feb7 Fix translation colormap cache rebuilding using the old translation enumerations 
This was causing a buffer underwrite too. Lovely.
 2021-02-28 17:05:25 -03:00
Jaime Ita Passos
07ffe2599c Fix thing scale mismatch in R_DrawVisSprite 2021-02-28 16:23:40 -03:00
GoldenTails
a0396d5e43 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
bdb28a06f4 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
5108f1f57b Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00
GoldenTails
4016a2e062 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06:00
Jaime Ita Passos
a1e0aa1812 Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
Lachlan Wright
77feee73c3 Revert "Merge branch 'player-speed' into 'next'" 
This reverts merge request !1309
 2021-02-27 03:38:13 +00:00
Riku Salminen
8bcc71c629 Disable pausing during score screens in marathon mode 2021-02-26 15:43:53 +02:00
LJ Sonic
75d0e70236 Fix sector tags being signed in Lua 2021-02-25 23:41:43 +01:00
GoldenTails
12205314bc Check against null tmpusher source before attempting to push a thing. 2021-02-21 19:32:00 -06:00
Zwip-Zwap Zapony
308ab0e079 Fix OpenGL V_DrawCroppedPatch 2021-02-21 22:16:38 +01:00
toaster
73758f50ff Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name. 2021-02-19 06:45:28 -05:00
James R
747c278bc2 Makefile: add a SILENT flag 
This makes it print nothing to stdout.

Also fixed some irregularities.
 2021-02-18 07:24:20 -08:00
James R
3d32f3145c Generate individual dependency files 
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.

As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
 2021-02-18 06:23:18 -08:00
James R
3003c252d1 Makfile: don't print some messages twice 2021-02-18 06:23:12 -08:00
sphere
998d065698 Add more actions for slope copying & update the ZB config. 2021-02-17 16:06:02 +01:00
X.organic
0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional 2021-02-16 23:27:44 +01:00
X.organic
90611ed547
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE 
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
 2021-02-16 21:36:28 +01:00
X.organic
205ccc2727
Move Dehacked table sanity check to deh_tables.c 2021-02-16 19:46:31 +01:00
LJ Sonic
7133c703b4 Show an alternate ping icon when the player is disconnected 2021-02-15 22:19:48 +01:00
LJ Sonic
97daba68d0 Enable rejointimeout by default 2021-02-15 16:24:30 +01:00
LJ Sonic
aa33d90215 Add rejointimeout to the server options 2021-02-15 16:23:57 +01:00
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
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations 
# Conflicts:
#	src/p_spec.c
 2021-02-15 09:20:40 +01:00
SMS Alfredo
4430835a71 This might be dumb, but whatever 2021-02-14 20:49:03 -06:00
lachwright
cf389179e8 Rollout rock improvements: 
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
 2021-02-15 01:11:03 +11: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
Nev3r
a57c695f79 Update example comment. 2021-02-11 14:22:49 +01:00
Nev3r
fbe2a19c60 Fix __LINE__ macro expansion via recursive macro expansion; C macros sure are something sometimes... 2021-02-11 14:12:50 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.
 2021-02-11 13:24:20 +01:00
namishere
326be01276 Expose P_ButteredSlope to lua 2021-02-11 04:06:40 -08: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
Shane Ellis
ca00e2d508 correction to nights bot clause 2021-01-24 12:46:03 -05:00
Shane Ellis
ea6879b5c2 missed a couple spots 2021-01-24 12:43:13 -05:00
CobaltBW
a2fce68f14 Specialized Lua function for bot removal 2021-01-23 17:01:48 -08:00
CobaltBW
93ec472c78 Expose BOT_ to lua 2021-01-23 14:49:20 -08:00
CobaltBW
0a60fe0b1d Almost forgot: player.blocked 2021-01-23 14:05:36 -08:00
CobaltBW
b112e12c93 Merge remote-tracking branch 'origin/next' into addplayer 2021-01-23 13:33:19 -08:00
Shane Ellis
135032c293 Correction to implicit declaration of B_UpdateBotleader() 2021-01-23 10:58:34 -05:00
Shane Ellis
1274b4651e Added botstuffs to savestate 2021-01-23 10:39:59 -05:00
Shane Ellis
25bf4b54e2 Restructured botticcmds into G_Ticker 2021-01-23 10:36:44 -05:00
Shane Ellis
4e47f240ad Add new botstuffs 2021-01-23 10:30:07 -05:00
Shane Ellis
b8fea55f67 Update b_bot.c 2021-01-23 10:25:35 -05:00
Shane Ellis
fd536e91a3 void B_UpdateBotleader(player_t *player); 2021-01-23 10:17:05 -05:00
Shane Ellis
2016caa70b Update references to player->bot 2021-01-23 10:16:27 -05:00
Shane Ellis
2e528216ac Updated references to player->bot 2021-01-23 10:15:33 -05:00
Shane Ellis
2abf89e800 Update G_AddPlayer() 2021-01-23 10:13:16 -05:00
Shane Ellis
c391d76c11 buttons_last -> lastbuttons 2021-01-23 10:06:47 -05:00
Shane Ellis
ce8e389a2d Add lua player.botleader and player.buttons_last (read+write) 2021-01-23 09:49:57 -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
Shane Ellis
e19b085684 Netcode failsafe. At least until I can figure out the best way to produce bot cmds outside of player sends. 2021-01-15 22:56:48 -05:00
Shane Ellis
b73a15a0bf fixed G_AddPlayer not sending return value 2021-01-15 22:50:15 -05:00
Shane Ellis
0e9b4acb58 Update g_game.c (Account for bot type 3) 2021-01-15 19:29:03 -05:00
Shane Ellis
1583bf126b lua habits 2021-01-15 18:31:09 -05:00
Shane Ellis
505ba1ff63 Update g_game.c 2021-01-15 18:06:36 -05:00
Shane Ellis
225e7c72ac Update p_mobj.c 2021-01-15 18:00:00 -05:00
Shane Ellis
9bbebcbe9e Update d_clisrv.c 2021-01-15 17:55:14 -05:00
Shane Ellis
93562b782e Revert "Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player…" 
This reverts commit 079fe9ba7e
 2021-01-15 22:50:20 +00:00
Shane Ellis
8fa8ca6222 Update r_skins.c 2021-01-15 17:47:26 -05:00
Shane Ellis
4e029dbc67 Update lua_baselib.c 2021-01-15 17:45:41 -05:00
Shane Ellis
00462323c3 Revert "Implementation of lua function P_AddPlayer()" 
This reverts commit 5e8313e157
 2021-01-15 22:42:35 +00:00
Shane Ellis
6103d7a51e Update p_user.c 2021-01-15 17:41:16 -05:00
Shane Ellis
759ff44dfd Revert "Add conditions for new player bot type" 
This reverts commit b995e3cb75
 2021-01-15 22:32:02 +00:00
Shane Ellis
161e1c42cb Update p_enemy.c 2021-01-15 17:29:15 -05:00
Shane Ellis
56e9b99f28 Revert "Add conditions for new player bot type" 
This reverts commit 4b9a95a538
 2021-01-15 22:28:01 +00:00
Shane Ellis
a68fee3303 oops 2021-01-15 17:22:38 -05:00
Shane Ellis
079fe9ba7e Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player instances (e.g. player bots) 2021-01-15 17:08:16 -05:00
Shane Ellis
edc312066d Revert "CL_RemovePlayer() - Allow for removal of non-consoleplayer and…" 
This reverts commit f166af4d8b
 2021-01-15 22:01:51 +00:00
Shane Ellis
f166af4d8b CL_RemovePlayer() - Allow for removal of non-consoleplayer and non-secondaryviewplayer player instances (e.g. bot players) 2021-01-15 17:00:21 -05:00
Shane Ellis
9eeaef2e32 Exception made in R_SkinUsable() for player bot types 2021-01-15 16:55:49 -05:00
Shane Ellis
5e8313e157 Implementation of lua function P_AddPlayer() 2021-01-15 16:50:01 -05:00
Shane Ellis
b995e3cb75 Add conditions for new player bot type 2021-01-15 16:48:19 -05:00
Shane Ellis
4b9a95a538 Add conditions for new player bot type 2021-01-15 16:46:15 -05:00
Shane Ellis
794d927670 Add conditions for new player bot type 2021-01-15 16:44:26 -05:00
lachwright
a117ec9859 oops that doesn't work in reverse gravity 2021-01-14 04:34:43 +11:00
lachwright
149535634e Keep Metal's jet fume at a consistent height during dashmode 2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd Have Metal Sonic use spinheight while dashing 2021-01-13 22:28:38 +11: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
Zippy_Zolton
8aac7454b8 Make Armageddon Shield instantly kill Egg Guards 2021-01-10 17:20:07 -06: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
Hannu Hanhi
eb1e7eff8f Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg 2021-01-10 20:52:03 +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
GoldenTails
3b4a52b8b8 Allows Lua to transport you to a different map in place of a Special Stage. 2021-01-04 00:03:18 -06:00
katsy
c19539248a add sprung flag to steam 2020-12-31 04:38:26 -06:00
Hannu Hanhi
ed82b94e64 Take slopes into account in FOF wall cutoff in HWR_ProcessSeg 2020-12-29 23:29:00 +02: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
James R
4713b25837 Bit array conflicts 2020-12-16 08:44:03 -08:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08: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
5bb221b3bf Yeah Fuck You SEENAMES 2020-12-12 15:39:13 -08:00
James R
a86a7822d1 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 15:38:46 -08: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
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08: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
James R
9ddeb5f589 Resolve GameQuit hook conflicts 2020-12-12 02:05:21 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -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
dbd8903a53 Use ref for pushing error handler 2020-12-10 08:50:23 -08:00
James R
3f7c2ae0b0 Avoid using multiple tables to fetch hook 
String hooks still use a table to fetch the id, but the id indexes a C array.

Also I fixed a missing call in the MusicChange hook.
 2020-12-10 05:42:53 -08:00
James R
e0a307da15 Merge branch 'next' into hooklib-refactor 2020-12-10 03:09:24 -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
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -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