incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18926 commits 1 branch 0 tags 204 MiB
Commit graph

17111 commits

Author SHA1 Message Date
spherallic
6cfe9ad4b3 Add toggle for linedef action 401 to not change the ceiling texture. 2022-03-18 19:45:40 +00:00
toaster
1a12b7b58e Give userdata that needed names some names. 
Partial reimplementation of commit 8110473643e6b6e541a7f8e8217bed45dd64d671 due to referencing un-merged MR
 2022-03-18 19:41:14 +00:00
James R
976f05a002 Remove mixed code and declarations warning 2022-03-18 19:37:59 +00:00
James R
df1c0fddcb Fix GCC 11 array-bounds warning in P_SetupStateAnimation 
Removing inline here silences the warning somehow, it
could be a GCC bug?
 2022-03-18 19:37:34 +00:00
Jaime Ita Passos
0a9fd2c9fa Fix #555 2022-03-18 19:33:57 +00:00
toaster
2c55477161 Revert "Make the colormap returned by v.getColormap() writable." 
This reverts commit 53ec972887.
 2022-03-18 18:59:25 +00:00
toaster
9c1ca3e2c0 Revert "Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.)" 
This reverts commit 134f94474c.
 2022-03-18 18:59:10 +00:00
toaster
1a8f07d53c Add a missing scale assignment to A_Boss3ShockThink 
(flattened version of SRB2 repository SMS_Alfredo:oneline/merge request 1588)
 2022-03-18 18:50:31 +00:00
lachablock
d92f4d6d50 Split up x/y/z averages in A_Boss3ShockThink 2022-03-18 18:48:36 +00:00
LJ Sonic
66a08a391b Don't call map load trigger linedefs when joining or reloading gamestate 2022-03-18 18:40:27 +00:00
Shane Ellis
4ef77365a4 Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility 2022-03-18 18:37:20 +00:00
LJ Sonic
c977a7d451 Fix again 2022-03-18 18:31:46 +00:00
LJ Sonic
ef1ff6c94b Fix incorrect error message during Lua archiving 2022-03-18 18:31:38 +00:00
toaster
7f969705b4 Add flag to line slopes for copying their slopes to the other side. 
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
 2022-03-18 18:30:40 +00:00
toaster
3794bea729 Accidentially killed P_InitSpecials whilst handling a previous commit; correct. 2022-03-18 18:18:48 +00:00
toaster
86f2a551e6 Fix floor sprite projection 
# Conflicts:
#	src/r_plane.c
#	src/r_things.h
 2022-03-18 18:16:31 +00:00
Nev3r
65a339ec12 Fix the equation constant fields not being filled properly. 2022-03-18 17:54:13 +00:00
Nev3r
c7b7079ec6 Let equation slopes be read from textmaps. 2022-03-18 17:54:03 +00:00
Nev3r
9992d36bf3 Add slope equation constant parsing functionality. 2022-03-18 17:53:53 +00:00
toaster
dd8acd4c61 Initialize slopes before the map loads. 
# Conflicts:
#	src/p_setup.c
#	src/p_slopes.h
 2022-03-18 17:53:45 +00:00
GoldenTails
134f94474c Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.) 2022-03-18 17:49:46 +00:00
GoldenTails
53ec972887 Make the colormap returned by v.getColormap() writable. 
I mean it was already readable anyway...
 2022-03-18 17:49:37 +00:00
Jaime Ita Passos
0abc659168 Update r_opengl.c 2022-03-18 17:46:18 +00:00
Jaime Ita Passos
5539341ebc Allocate a buffer for non-RGBA to RGBA texture conversions. 
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
 2022-03-18 17:46:09 +00:00
James R
4c9c54e44e Revert netvars after demo finishes playback 
(Demos do not call CL_Reset BTW.)
 2022-03-18 17:41:14 +00:00
toaster
e07fb31f72 P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely) 
# Conflicts:
#	src/p_mobj.c
 2022-03-18 17:35:34 +00:00
Nev3r
2e7e61f787 Remove &, since args and stringargs are arrays 2022-03-18 17:28:15 +00:00
Nev3r
de0119fd78 Forgot the stringargs. 2022-03-18 17:28:06 +00:00
Nev3r
7c8beb9229 Bugfix - Fix sporadically occurring incorrect userdata types in Lua, caused by previously loaded userdata which didn't get invalidated in previous sessions. 
Invalidate userdata for line and mapthing args.
Invalidate userdata for slopes and their normal, origin and direction vectors.
 2022-03-18 17:27:57 +00:00
sphere
6d58afe071 Use floating-point math for polyobject planes as well. 2022-03-18 17:25:29 +00:00
sphere
167d30efc2 Ignore a linedef tag of 0 when using linedef action 96. 2022-03-18 17:22:28 +00:00
toaster
a15a2f1ef2 Restore P_AproxDistance Lua parity 
# Conflicts:
#	src/lua_baselib.c
 2022-03-18 17:16:11 +00:00
SwitchKaze
18f0ece073 Fix console text bleeding edge case 
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
 2022-03-18 17:15:13 +00:00
SwitchKaze
8ef8cb5b5f Fix console text bleeding 2022-03-18 17:15:00 +00:00
toaster
fe204dbc87 Change variable from previous commit to the one used in Kart startup. 2022-03-18 17:14:25 +00:00
GoldenTails
168fc18357 Fix the console splitting up halfway through startup. 2022-03-18 17:13:05 +00:00
lachablock
c331bac825 Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state 2022-03-18 17:10:32 +00:00
toaster
1289e08887 Enhance the multitagging functionality added in previous commits. 
* Flattened version of commits from SRB2 repository's flarn2006:multitagging_plus/merge request 1524.
* New linedef special 96: "Apply Tag to Tagged Sectors".
* New flags for linedef specials 97-99
 2022-03-18 17:06:22 +00:00
Monster Iestyn
2d50b76323 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear! 
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
 2022-03-18 16:58:28 +00:00
toaster
9deeb79ac4 My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit 
# Conflicts:
#	src/p_setup.c
 2022-03-18 16:58:00 +00:00
Monster Iestyn
e3ead54561 Fix Lua versions of P_ZMovement and its clones as well as P_MovePlayer so tmthing changes don't linger afterwards 2022-03-18 16:56:46 +00:00
toaster
5fa9ba1be0 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook 
# Conflicts:
#	src/p_setup.c
 2022-03-18 16:56:39 +00:00
flarn2006
b0aeb6ce03 Expose M_MapNumber to Lua 2022-03-18 16:54:48 +00:00
toaster
2cfdf80fca Remove FRACUNIT/2 
# Conflicts:
#	src/r_main.c
 2022-03-18 16:54:26 +00:00
toaster
1f5eb2c442 Correct non-compiling iterators that retained their initialisation from the earlier pushes. 2022-03-18 16:50:13 +00:00
namishere
230b301455 Expose P_ButteredSlope to lua 2022-03-18 16:44:41 +00:00
Nev3r
a7b128b9bc Update example comment. 2022-03-18 16:43:35 +00:00
Nev3r
368a83ccb8 Fix __LINE__ macro expansion via recursive macro expansion; C macros sure are something sometimes... 2022-03-18 16:43:11 +00:00
toaster
487103bc47 Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.

# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
 2022-03-18 16:43:03 +00:00
toaster
5ac3709d43 make a few messages more helpful 
# Conflicts:
#	src/d_clisrv.c
 2022-03-18 16:27:48 +00:00
toaster
b75bea40b2 Add ease Lua library 
# Conflicts:
#	src/lua_mathlib.c
 2022-03-18 16:25:57 +00:00
toaster
3c5e19bb06 Easing functions 
# Conflicts:
#	src/CMakeLists.txt
#	src/Makefile
 2022-03-18 16:23:58 +00:00
Hannu Hanhi
955bbeed42 Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg 2022-03-18 16:20:25 +00:00
Hannu Hanhi
8f22ccccdb Take slopes into account in FOF wall cutoff in HWR_ProcessSeg 2022-03-18 16:20:08 +00:00
Hannu Hanhi
6a6c8a2baf Clarify license file mention in libdivide.h 2022-03-18 16:19:01 +00:00
Hannu Hanhi
c0302174c3 Clarify licensing-related text in libdivide.h 2022-03-18 16:18:51 +00:00
toaster
0c12a389e1 NPO2 slope span optimization 
# Conflicts:
#	src/CMakeLists.txt
#	src/r_draw.c
#	src/sdl/Srb2SDL-vc10.vcxproj
 2022-03-18 16:18:47 +00:00
toaster
37e16db41e Fix slope plane rotation and alignment. 
A flattened-commit port of the SRB2 repository's software-slope-plane-uv-fix-attempt/merge request 1464 due to the vast, vast refactorings that would intefere with brightmaps and Encore if done one commit at a time.
 2022-03-18 16:10:05 +00:00
toaster
fab0897800 Check against null tmpusher source before attempting to push a thing. 
# Conflicts:
#	src/p_spec.c
 2022-03-18 14:08:29 +00:00
Jaime Ita Passos
4563722695 tRNS chunk fix 
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
 2022-03-18 13:56:01 +00:00
Jaime Ita Passos
96edcff902 Optimize Picture_GetPatchPixel 2022-03-18 13:55:04 +00:00
Steel Titanium
f674737898 Add deprecation warning when using the level header parameter 2022-03-18 13:54:17 +00:00
toaster
bf6b9c6fed Remove music slot compatibility 
# Conflicts:
#	src/deh_lua.c
#	src/lua_baselib.c
 2022-03-18 13:54:03 +00:00
toaster
babf630587 Set the target of a spawned ghost to where it came from. 
# Conflicts:
#	src/p_user.c
 2022-03-18 13:42:57 +00:00
toaster
3c83508646 add sprung flag to steam 
# Conflicts:
#	src/p_map.c
 2022-03-18 13:39:19 +00:00
toaster
19a4ef23c2 Add more actions for slope copying & update the ZB config. 
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
 2022-03-18 13:32:48 +00:00
toaster
857330f74f Add linedef specials for multitagging in binary maps 
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
 2022-03-18 13:16:55 +00:00
X.organic
0b2783925f Remove some dead code from DEH_LoadDehackedFile 
Also fixes a buffer overflow, but said overflow generally got caught by
the stack smashing protector. Still, it's better for SOC files not to be
able to crash the game that easily.
 2022-03-18 13:14:37 +00:00
GoldenTails
0146c0a4bd name kinda sucked 2022-03-18 13:13:11 +00:00
GoldenTails
bf5ca10652 acos Lua exposure 2022-03-18 13:13:02 +00:00
Sally Coolatta
e5453f97b7 Missed a few lines in the prev commit 2022-03-18 13:12:17 +00:00
Sally Coolatta
46e31e45d9 Allow spaces in captions defined in SOC 2022-03-18 13:12:09 +00:00
toaster
c67b52f85d move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail 
# Conflicts:
#	src/d_clisrv.c
 2022-03-18 13:07:47 +00:00
Jaime Ita Passos
1219f36ca2 Fix polyobject segs messing with 3D floors they shouldn't be 2022-03-18 13:02:44 +00:00
James R
8c237ae452 Replace LUA_PushLightUserdata with LUA_PushUserdata 
See c92378fa and a7e20f70. I didn't realize that light
userdata's metatable is shared--like numbers or strings.
So it cannot be paired with a metatable.

I also made a few minor tweaks to Lua cvars, other than
accounting for the double pointer in the userdata.
 2022-03-18 12:54:22 +00:00
James R
b1890385f4 Revert "Merge branch 'lightmemedata' into 'next'" 
This reverts commit 7ff3e7f18b, reversing
changes made to dc37cdf2a6.
 2022-03-18 12:54:13 +00:00
Steel Titanium
e1e57c071b Fix MusicChange hook not returning some values correctly 2022-03-18 12:52:08 +00:00
katsy
3fb2a1fba5 adjust cooldown to 5 seconds (bandage fix for 2.2.9) 2022-03-18 12:51:39 +00:00
katsy
38dc1c55e4 attempt to resolve teleportation resync issue 2022-03-18 12:51:31 +00:00
James R
59b7a65bca It is impossible for a string to be allocated in this case 2022-03-18 12:47:21 +00:00
James R
2ba1417b9e Free zstring when switching to preset value 
This is only applicable for bounded cvars (MIN, MAX),
since otherwise there's no way to allocate a zstring.
 2022-03-18 12:47:13 +00:00
Monster Iestyn
eeb208312a Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly 2022-03-18 12:45:44 +00:00
Monster Iestyn
9e20d1ea31 Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all. 2022-03-18 12:44:30 +00:00
toaster
2868639144 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.

# Conflicts:
#	src/hardware/hw_main.c
 2022-03-18 12:43:36 +00:00
toaster
11875b56c7 Render midtextures on two-sided lines with a z-buffer offset 
This will fix z-fighting issues when they overlap with FOFs.

# Conflicts:
#	src/hardware/hw_main.c
 2022-03-18 12:32:58 +00:00
Hannu Hanhi
b836d774a7 Remove bad pointer arithmetic in polygon comparators, that was causing glitches 2022-03-18 11:59:40 +00:00
Hannu Hanhi
44a8b01619 Fix incorrect values caused by outdated use of timing functions in perfstats 3 2022-03-18 11:58:29 +00:00
katsy
c1a4ff724e move HWR_GetMappedPatch earlier 2022-03-18 11:56:50 +00:00
Hannu Hanhi
dcf944be9c Fix a OpenGL backend DeleteTexture crash 2022-03-18 11:53:20 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss 
# Conflicts:
#	src/m_menu.c
 2022-03-18 09:07:13 +00:00
James R
821fd41d70 Merge branch 'c99-pedantic' into 'master' 
Switch compiler mode C90 to C99; enforce stricter standard conformance

See merge request KartKrew/Kart!554
 2022-03-18 02:41:57 +00:00
James R
93bd404072 Incorporate few more instances of Z_Free NULL no-op 2022-03-17 12:17:51 -07:00
toaster
1ac2730ced Fix a signedness comparison warning in K_CheckBumpers. 2022-03-17 17:01:07 +00:00
toaster
8de92e8dca Merge branch 'master' into boss 
# Conflicts:
#	src/k_bot.c
 2022-03-17 16:58:42 +00:00
toaster
306d1cd3ae Merge branch 'network' into 'master' 
Net work

See merge request KartKrew/Kart!557
 2022-03-17 16:50:40 +00:00
toaster
f02a48d3d8 Merge branch 'fix-229' into 'master' 
Fix #229

Closes #229

See merge request KartKrew/Kart!555
 2022-03-17 16:35:17 +00:00
toaster
05c1d61ae1 Add pmomz and stairjank to net archive (plus re-organise slightly). 2022-03-14 20:13:32 +00:00
toaster
6e7adedaa0 Make the Kart TICQUEUE system closer to the 2.2 BACKUPTICS system. 
* Rename TICQUEUE to BACKUPTICS.
* Add CLIENTBACKUPTICS to limit the time gap players can send tics in at once
    * This likely means freezes are more possible, and this variable could be raised later, but prevents some potential duplication in the extrapolerated tic.
 2022-03-14 19:24:07 +00:00
toaster
c84a739039 Fix not being able to escape out of the server connection screen. 2022-03-14 16:59:18 +00:00
toaster
fcb6a4e1ab Disable the vanilla-sourced "keepbody" (rejointimeout) feature. 2022-03-14 16:33:03 +00:00
toaster
c68e0d46c0 Fixed sneaker-induced bumper theft (for those who saw my comment in MKD, turns out a simple P_PlayerInPain saves you from the multi-steal threat I considered) 2022-03-13 17:00:43 +00:00
toaster
a3eab3099e Solve the concern about potential tiregrease overwriting. Let the video resume at once 2022-03-12 23:18:55 +00:00
toaster
b9acad707e Restore the v1 record attack critera (maps available by default), whilst also now allowing for specific maps to opt out. 2022-03-12 22:31:52 +00:00
toaster
a45b163bd1 Make P_EndingMusic *also* operate on local players rather than display players. 2022-03-12 19:32:03 +00:00
toaster
31db72256d Merge branch 'master' into boss 
# Conflicts:
#	src/y_inter.c
 2022-03-12 19:24:23 +00:00
toaster
87fe8f2c9c Merge branch 'gamestatereloaded' into 'master' 
Gamestate reloaded

See merge request KartKrew/Kart!551
 2022-03-12 19:08:04 +00:00
toaster
2fdcd9bc2d Merge branch 'light-setup-frame-refactor' into 'master' 
A lightweight refactor to R_SetupFrame and R_SkyboxFrame

See merge request KartKrew/Kart!532
 2022-03-12 18:54:20 +00:00
toaster
b3c9b8f94e Merge branch 'votefree' into 'master' 
:votefree: (resolves #217)

Closes #217

See merge request KartKrew/Kart!542
 2022-03-12 18:49:45 +00:00
toaster
65feacc16c Merge branch 'musicataparty' into 'master' 
Music at a party

See merge request KartKrew/Kart!543
 2022-03-12 18:40:03 +00:00
toaster
f794908430 Merge branch 'followtweak' into 'master' 
Follower adjustments

Closes #202

See merge request KartKrew/Kart!514
 2022-03-12 18:37:15 +00:00
toaster
d7b72018ba Merge branch 'doublezap' into 'master' 
Item Thunderflow

Closes #220

See merge request KartKrew/Kart!544
 2022-03-12 18:32:29 +00:00
toaster
cd7e125863 Update texturecache user when reallocating 
# Conflicts:
#	src/r_textures.c
 2022-03-12 18:00:52 +00:00
toaster
9fe2184c08 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into fast-addfile 2022-03-12 17:39:18 +00:00
toaster
723c479388 Resolve Battle score ties caused when Luigi wins by doing nothing. 2022-03-07 14:12:58 +00:00
toaster
4839586617 Allow GTR_PAPERITEMS to function in a hypothetical GTR_CIRCUIT-based custom gametype. 2022-03-07 13:45:15 +00:00
toaster
5c77516aab Cleanup of boss info in anticipation of merger. 
* Actually add descriptions for the boss-related functions into k_boss.h.
* Introduce K_ResetBossInfo, an internal-only function for handling situations where it needs to be cleared.
* Fix a bug where bossinfo wasn't reset when using the map command to go to a battle map after having been in a boss.
* Fix some bugs where you could provide magnitudes out of the desired range to K_InitBossHealthBar and K_UpdateBossHealthBar.
 2022-03-07 13:08:46 +00:00
toaster
590d236b66 * Make item boxes spawn in at map start in race. 
* Make them use MF_NOBLOCKMAP as well as MF_NOCLIPTHING so bots won't do weird things when Battle bots are coded way down the line.
 2022-03-07 12:37:47 +00:00
toaster
3ddebabfa9 Fix a followers invalid memory crash (discovered in this branch but likely existed beforehand). 2022-03-07 01:37:58 +00:00
toaster
672bf9631d * Allow the digestion to "catch up" a bit if you suddenly get a huge burst of spheres (such as a spherebox). 
* Refactor a little, since the previous code required casting and could penalise 40 spheres a bit TOO much if you would be pushed beyond it that tic.
 2022-03-06 22:45:48 +00:00
toaster
5f3bf3e8a2 A first-pass attempt at the "digestion" hidden stat for Battle - pushing just in case I fall asleep before we can explore this, and/or end up busy in the next few days. 
* At the start of the first bar, everyone digests spheres at 1 per second, same as before.
* This actually only starts counting down from the most recent moment your spheres becomes nonzero, which is a very, VERY tiny buff to prevent their instant depletion.
* At around 40 spheres:
    * Chao digests them at 1 sphere per *tic*. Might be slightly too punishing.
    * Mecha Sonic digests them at 1 sphere per... 33 tics, or barely faster than before. Might be slightly not punishing enough.
    * Everyone else is linearily in between.
 2022-03-06 22:23:40 +00:00
toaster
f518ae5c58 * Fix some music and visual bugs with dying in Battle at the conclusion of the round. 
* Fix emeralds HUD overlapping minimap in 2P splits.
 2022-03-06 18:19:28 +00:00
toaster
ab132300a9 No longer autoload bosstest.pk3 2022-03-05 23:27:09 +00:00
toaster
98bf8a414d Adjust the bannerx system (used both by titlecard and boss titlecard) to actively scale with the resolution, instead of blindly drawing three times. 2022-03-05 23:26:58 +00:00
toaster
6f33cd7ce6 Fix bosses not having the correct number of bumpers set. 2022-03-05 23:25:32 +00:00
toaster
bf43784d22 This is a doozy... 
HUD:
* Miniaturised Spheres and Emeralds HUD for 3P/4P.
* Repair 3P minimap.
* Move accessibility icons in 3P/4P to next to the lap/bumper sticker (currently only kickstartaccel exists)
* Change language on menu retry to be more generalised.
* Adjust HUD code structuring a bit.

MECHANICAL:
* Now correctly set number of bumpers in Break the Capsules to 1 (from 3).
* The above required reworking K_SpawnBattleCapsules into K_BattleInit, which is a good staging ground to handle more battle-specific setup in future.
* Do not spawn Emeralds or Sphereboxes in Break the Capsules.
* If everyone is WANTED... nobody is.
* Try to handle exceptions to timelimits a little more thoroughly (still not perfect).
* Disable pointlimits in bosses.
 2022-03-05 22:31:43 +00:00
toaster
9ac9abbb6e * Fix the intermission scores not getting ranked in singleplayer GP. 
* Make any singleplayer intermission that doesn't display cross-match rankings half as long (this is how long you see each half of an online intermission for).
 2022-03-05 22:19:49 +00:00
toaster
dc2936de42 Make the map command from the title screen *actually work*, and make a best-guess attempt at determining the necessary setup to play each particular map in a Single Player context (such as grandprixinfo for TOL_RACE, a little cleanup for TOL_BATTLE, and bossinfo for TOL_BOSS). 
This will be necessary when newmenus comes around and it is no longer advantageous to have a menu for testing bosses, given they won't be a headline feature in v2 or accessible via multiplayer at this time.
 2022-03-05 22:17:06 +00:00
toaster
61577e5026 * Re-enable kickstartaccel in battle. 
* Add a little "ding" sound and HUD dorito bounce when your kickstartaccel reaches max, so you can let go of accelerate/know when you need to tap to stop.
* Make the name on top of the boss healthbar only show up once the titlecard is over.
* Properly reset boss healthbar fill between maploads.
 2022-03-01 18:18:01 +00:00
James R
54b55efcb2 Remove fixme 2022-02-28 14:12:59 -08:00
toaster
17e5f71b5d * Re-enable sphere HUD in bosses. 
* Do a little more anti-overtime checking for bosses. (This *really* requires a refactor at some point, but not right now)
 2022-02-27 17:48:04 +00:00
toaster
5a06239a20 Add an extra fix for the "get hit the moment you spawn an orbiting item" bug that produced tiny Orbinauts and Jawz - now it moves them out so they're not inside you when you come out of hitlag. 
(Yes, sorry, no more fishsticks.)
 2022-02-27 17:37:39 +00:00
toaster
329c2a60a2 Fix item boxes not spawning in Break the Capsules. 
Specifically, they turn invisible on tic 0, then make a decision about whether to replace themselves with MT_PAPERITEMSPOT or simply become visible (with an explosion puff, same as how they respawn) when starttime is reached.

This delay also applies to Race, which I think is a good thing, considering Item Capsules already are not collectable during POSITION, but I can change it if others disagree.
 2022-02-27 17:11:18 +00:00
toaster
4a2efd3000 Fix a few basic mistakes. 
* Don't forcibly go to a race map if you're exiting a boss and would otherwise return to the title screen.
* Yes, there are four basc TOL's now, not three.
* Title card string for ZONE should be right aligned.
 2022-02-27 17:07:56 +00:00
James R
c58d789a07 Always reset tiregrease 2022-02-24 22:51:01 -08:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
bdbd85b2cd pedantic: fix win32 2022-02-20 04:48:30 -08:00
James R
a6ec9faf93 pedantic: fix m_menu.c 2022-02-20 03:31:25 -08:00
James R
5ba4231b9d Fix silly wrong pointer in apng.c 2022-02-20 03:29:41 -08:00
James R
82f4364eb4 pedantic: fix misc leniencies and GNU-isms 2022-02-20 03:28:22 -08:00
James R
2887385122 pedantic: ignore enums signed overflow 2022-02-20 03:25:46 -08:00
James R
366ac0b1b2 pedantic: fix paren surrounding braces 2022-02-20 03:23:45 -08:00
James R
d7087c7405 pedantic: fix address loading function pointer casts 2022-02-20 03:22:25 -08:00
James R
9722027fc1 Add macro to cast function pointer to void pointer 
Does not evaluate constant expression, I don't know if
that's possible.
 2022-02-20 03:18:47 -08:00
James R
bef9f502ca pedantic: cast to (void*) for printf %p 2022-02-20 03:15:51 -08:00
James R
286010c6e9 pedantic: replace GNU empty initializer extension with C99 0 initializer 2022-02-20 03:13:23 -08:00
James R
59c04ae041 pedantic: resolve flexible array member in nested struct 
ISO C forbids a structure that has a flexible array member
to be a member of another structure or element of an
array.

filetx_pak and fileack_pak are two such structures. These
have been removed from doomdata_t's union.
 2022-02-20 03:10:27 -08:00
James R
bea79dfa65 Replace GNU zero-length array with ISO C99 flexible array member 2022-02-20 03:10:04 -08:00
James R
cd5946be73 Enable pedantic pike-in-your-bum mode, rip and tear 2022-02-19 19:41:19 -08:00
James R
dc098c1e65 Use GNU C99 mode 2022-02-19 19:40:19 -08:00
toaster
b158bfe37e Always stop the sounds, because we're always calling Z_FreeTags and that can lead to invalid memory. (Should fix Rai's crash) 2022-02-17 22:41:34 +00:00
James R
82377fb001 Merge branch 'invinc-color-fix' into 'master' 
Invinc color fix

See merge request KartKrew/Kart!553
 2022-02-17 07:59:29 +00:00
James R
eb9a6f3445 Merge branch 'kstart-sfx' into 'master' 
POSITION Music

See merge request KartKrew/Kart!552
 2022-02-17 05:06:16 +00:00
James R
fbcb48a35f Merge branch 'cechostop' into 'master' 
CECHO stop

Closes #219

See merge request KartKrew/Kart!550
 2022-02-17 05:06:03 +00:00
James R
ea9b1daeb9 Merge branch 'eaturnongreens' into 'master' 
Eat your non-greens (resolves #221)

Closes #221

See merge request KartKrew/Kart!549
 2022-02-17 05:05:52 +00:00
James R
64abc232bc Merge branch 'dlconfirmfix' into 'master' 
DL Confirm Fix

See merge request KartKrew/Kart!547
 2022-02-17 05:05:39 +00:00
James R
8f303f03d2 Merge branch 'iamnobump' into 'master' 
I am no bump

See merge request KartKrew/Kart!548
 2022-02-17 05:05:24 +00:00
Sally Coolatta
39da886447 Merge branch 'master' into invinc-color-fix 2022-02-16 23:01:23 -05:00
Sally Coolatta
a750fdd810 Invincibility wasn't using K_RainbowColor anymore, what the function was designed for... 2022-02-16 23:01:07 -05:00
toaster
0b97d954ad Tested with Chengi at one point, correct a few things from that. 
* Fixed a few prints happening on resync that shouldn't.
* Fixed OGL loading not using levelfadecol.
 2022-02-16 23:23:14 +00:00
James R
e28e67f84d Fade out POSITION music at 3 2 1 2022-02-15 15:53:56 -08:00
James R
9095261a18 POSITION music 
Play SA2 "shwing" at title card; play POSITION music once
camera is steady (instantly in 1v1).

Encore: play portal warp sound instead of "shwing"; play
portal drone instead of POSITION music, always start
instantly.
 2022-02-15 15:51:47 -08:00
James R
62b5f9c90f Leave introtime at 3 for 1v1 
Preticker uses up a few tics, so setting it to 0 makes it
useless.
 2022-02-15 15:38:11 -08:00
James R
418156bebf Use float value for LOOPMS 
Extra precision.
 2022-02-15 14:19:28 -08:00
James R
f749424de7 Turn kstart into sfx 2022-02-14 15:04:30 -08:00
toaster
6d851f2bc8 P_LoadLevel is a mess, but attempt to fix a few things that shouldn't be happening with resyncs, including #209. Untested. 2022-02-14 15:43:56 +00:00
toaster
42919044e9 Don't continue ticking the cecho timer infinitely into the negatives (resolves #219) 2022-02-14 14:52:04 +00:00
toaster
9ef2530e54 Fix HUD tracking being broken in non-green aspect ratios. 2022-02-14 14:42:31 +00:00
toaster
54cd540e5b Fix the chat underlay being physically seperated from the chat text in non-green resolutions. 2022-02-14 14:41:34 +00:00
toaster
006b6f00ac Rewrite the awayview reset for both Got_Teamchange and P_SpectatorJoinGame. 2022-02-11 12:09:00 +00:00
toaster
913610b1b7 Fixed P_RestoreMusic using displayplayers instead of local players (did not use any of the functions directly and so was missed). 2022-02-11 10:38:16 +00:00
toaster
03a47cfb5a Prevent using a grow while invincible resetting the invincible music timer, when that SHOULDN'T be touched and will be set to grow properly once that's over. 2022-02-11 01:13:38 +00:00
toaster
4567d9c57f Fix allowteamchange (although this code wasn't being run, it still SHOULD return early...) 2022-02-11 00:35:11 +00:00
toaster
93e4ef0ef1 Permit players to not bounce when colliding with ML_NOTBOUNCY walls (imperfect but better than the LITERALLY NO SUPPORT that was there beforehand) 2022-02-10 00:06:47 +00:00
toaster
8f4e8a4953 can't believe i messed up the brackets this bad, woops 2022-02-09 23:43:06 +00:00
toaster
c3e9eceda2 * Instead of checking for a player moving up, check for a player moving up that's only JUST been tumbled. 
* Remove the DMG_WOMBO flag from PVP touch damage tumbles as that was restricting tumble combos in this branch, not allowing it.
 2022-02-08 21:38:24 +00:00
toaster
c8517007c6 Only disable downloads in TESTER builds and -nodownload, not always. 2022-02-03 22:03:04 +00:00
toaster
ef7655d2e8 Fix a tables error with DMG_STEAL in Lua/SOC resolving to the wrong flag value. 2022-02-03 19:51:58 +00:00
toaster
766fce5857 Make some adjustments to the damage combo system for players. 
* Prevent a player that is moving upwards from being DMG_TUMBLE'd again (resolves #212).
* Instead of having a special case for missiles there, make PIT_CheckThing toggle DMG_WOMBO instead.
* Allow hard hits (DMG_TUMBLE, DMG_EXPLODE, and DMG_KARMA) to have combos toggled off with DMG_WOMBO, too.
 2022-02-03 19:51:17 +00:00
James R
0f4feb0161 Fix in game downloader confirmation 2022-01-28 04:43:18 -08:00
toaster
2e54e38607 Diagnose itemamount underflows easier (show the empty box and number if nonzero count but zero item type) 2022-01-25 17:02:19 +00:00
toaster
3f71251fd6 Fix a correctly timed Thunder Shield preventing you from using rings (resolves #220) 2022-01-24 23:19:35 +00:00
toaster
7508e0e198 P_IsLocalPlayer changes 
This is the function that controls whether a bunch of music-related function (and also whether certain error messages get printed).

* P_IsLocalPlayer now supports party players (currently untested, but the code is pretty airtight).
* P_IsLocalPlayer now always returns false in replays.
* P_IsMachineLocalPlayer now exists for the one situation the game determines local players that actually has a net-related function (kicking illegal character changes).
* Invincibility/grow sfx now operates based on whether the player is NOT local (it used to be whether it was NOT a displayplayer).
* Refactored P_SpectatorJoinGame to make future team support easier, and also reset the relevant camera focus, rather than always the consoleplayer's.
* Fix viewpoints on non-local players having overlapping viewpoint text.
 2022-01-24 22:03:40 +00:00
toaster
4b1cef0f20 Merge branch 'testers' into 'master' 
Allow TESTERS builds to be made for any branch

See merge request KartKrew/Kart!529
 2022-01-23 22:48:48 +00:00
toaster
2df53dd5a5 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into votefree 2022-01-23 22:46:11 +00:00
toaster
f69f002d17 Merge branch 'speedometer-default' into 'master' 
Turn on speedometer by default

Closes #218

See merge request KartKrew/Kart!539
 2022-01-23 22:43:49 +00:00
AJ Martinez
337f7ebd27 Merge remote-tracking branch 'origin/master' into director-cam 2022-01-23 15:38:25 -06:00
AJ Martinez
ef6ff846d3 Merge branch 'master' into 'director-cam' 
# Conflicts:
#   src/d_netcmd.h
 2022-01-23 15:38:14 -06:00
toaster
e7108cfde1 Resolve the replay crash issue :mike: 
(Also no longer mess around with moving flags into booleans per my comment)
 2022-01-23 21:35:29 +00:00
toaster
1ae256887e Readd CV_SAVE per Oni request in vc (and also my desires) 
Made using web IDE
 2022-01-23 20:49:29 +00:00
toaster
28ee382587 ok this was supposed to be here 2022-01-23 20:40:59 +00:00
toaster
8c3fad058d * Fix the Z_Free double-free issue (in two different ways, one ifdef'd out) that can sometimes occur on the vote screen. 
* Fix a technically invalid read in D_SetupVote.
* If the third map on the voting screen has a different gametype, don't interact with the buffer.
* Fix the inttime 0 setting, since I was in y_inter.c and testing quick map changes.
 2022-01-23 20:33:27 +00:00
SteelT
dbacdb4e63 Merge branch 'hitlag-flags' into 'master' 
Hitlag flags

See merge request KartKrew/Kart!541
 2022-01-23 19:02:43 +00:00
SteelT
fefb012134 Merge branch 'tripwire-both-sides' into 'master' 
Consistently easy tripwire

See merge request KartKrew/Kart!540
 2022-01-23 19:01:56 +00:00
SteelT
7dc6542a4f Merge branch 'thing-bright-override-colormap' into 'master' 
Fix OGL semibright and ignore colormap for fullbright/semibright/fulldark

See merge request KartKrew/Kart!538
 2022-01-23 19:01:44 +00:00
SteelT
a793af47c5 Merge branch 'grow-shrink-shoe-polish' into 'master' 
More extremely scaled grow & shrink players!

See merge request KartKrew/Kart!534
 2022-01-23 18:59:39 +00:00
SinnamonLat
fafcf307d2 Add combo to bubble shield 2022-01-23 18:02:56 +01:00
SinnamonLat
14961f6127 Let ThunderShield combo players 2022-01-23 17:58:08 +01:00
SinnamonLat
d55e23d767 Add DMG_WOMBO to all player contact damage 2022-01-23 17:52:31 +01:00
SinnamonLat
2bc6a72c56 MF_NOHITLAGFORME shouldn't work on MT_PLAYER 2022-01-23 13:57:11 +01:00
SinnamonLat
6567219fec Add MF_NOHITLAGFORME to spikes and wallspikes 2022-01-23 11:50:53 +01:00
James R
b30ffea49a Hash name lookup for textures and lumps 2022-01-22 03:18:06 -08:00
SinnamonLat
191103fec1 Fix a dumb mistake, add DMG_WOMBO to orbinauts, jawz and banana hits 2022-01-22 11:41:49 +01:00
SinnamonLat
ba9ef23b31 Add MF_NOHITLAGFORME and DMG_WOMBO 2022-01-22 10:01:24 +01:00
AJ Martinez
3ccbc5c705 avoid wasteful player_t copy 2022-01-21 02:42:16 -06:00
James R
f10aa9645b Few more instances of fullbright colormap nullification 2022-01-20 23:39:58 -08:00
James R
b23c4abb83 Copy tripwire texture to opposite side and automatically mirror texture alignment 2022-01-20 21:52:10 -08:00
James R
6063a6eab8 Check both front and backside for tripwire 2022-01-20 21:51:47 -08:00
James R
223ef50acb Enable percentage speedometer by default; do not save 2022-01-20 20:07:52 -08:00
AJ Martinez
07498a122a clarify potential footgunnery in K_UpdateDirector 2022-01-20 16:00:51 -06:00
AJ Martinez
9366049c89 fix low-confidence switch behavior 2022-01-20 15:56:36 -06:00
AJ Martinez
daabde0981 fix double speed attack transfers 2022-01-20 15:35:26 -06:00
AJ Martinez
3ce1f71230 how is static formed 2022-01-20 15:29:13 -06:00
AJ Martinez
ef3ae2044a appease linker wrt internal functions 2022-01-20 15:26:32 -06:00
AJ Martinez
5efd706d3b general post-review unfuck 2022-01-20 15:23:32 -06:00
toaster
66d8989531 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into testers 2022-01-20 19:29:10 +00:00
toaster
93dfbf382c The "free" changes from framezero - the crash fixes that have no complexity and therefore no negative consequence to introduce 2022-01-20 19:27:02 +00:00
toaster
df1e808b6e Semibright has colormapping again 2022-01-20 19:14:44 +00:00
James R
26d231c43a Only ignore colormap for fullbright 2022-01-20 05:09:39 -08:00
AJ Martinez
5d3fb30a07 tabs, thank you vscode for not reading the room 2022-01-20 06:56:07 -06:00
James R
8a2be85563 Include k_director.h 2022-01-20 04:50:11 -08:00
James R
ecc3d031df Ignore colormap when overriding thing brightness 2022-01-20 03:57:58 -08:00
James R
ff70bd0d83 Fix opengl semibright 
Adds back 3d models semibright.
 2022-01-20 03:52:32 -08:00
AJ Martinez
24b05451f6 my workflow is beyond your understanding 2022-01-20 03:39:00 -06:00
SteelT
606eb28314 Linedef type 460: Don't award rings while SPB-locked 2022-01-20 03:20:53 -05:00
AJ Martinez
1e4bc482d0 very small tiny fixes 2022-01-20 02:07:48 -06:00
AJ Martinez
e949e3afb4 Write the rest of the owl 2022-01-19 23:56:23 -06:00
James R
b3e6030a9b Wrong condition 2022-01-19 01:17:54 -08:00
James R
8f8d34728b JUST SEARCH ALL FUCKING WADS 2022-01-19 01:17:12 -08:00
James R
ba6ee7eaa0 Do not count gfx.pk3 toward mainwads in testers build 2022-01-19 01:13:09 -08:00
AJ Martinez
be33a1b659 Director cam barebones functionality 2022-01-18 22:41:07 -06:00
Sally Coolatta
38e741af76 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:57:08 -05:00
James R
484ab4b5dc Merge branch 'fix-software-splitscreen-tilt' into 'master' 
Fix splitscreen camera tilting in Software

See merge request KartKrew/Kart!531
 2022-01-18 07:56:41 +00:00
James R
d67a074a01 Merge branch 'splitscreen-skybox' into 'master' 
Keep track of skybox across splitscreen and change viewpoint

See merge request KartKrew/Kart!533
 2022-01-18 07:56:16 +00:00
Sally Coolatta
8acdbf7df8 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:55:56 -05:00
James R
97d1a415ce Merge branch 'replay-branch-name' into 'master' 
Save branch name in replay folder

See merge request KartKrew/Kart!505
 2022-01-18 07:50:02 +00:00
James R
7fc72d03ff Uncap frame interpolation on the viewpoint 2022-01-17 23:07:04 -08:00
James R
d06355018d Track skybox within player struct 
TODO: Lua

Splitscreen and change viewpoint uses the proper skyboxes!
 2022-01-17 22:46:01 -08:00
Sally Coolatta
06b7c17263 Merge branch 'master' into interp-clag-stutter 2022-01-18 01:20:28 -05:00
James R
5e37a847f0 Interpolate viewrollangle before R_CheckViewMorph 2022-01-17 21:18:38 -08:00
James R
eda9b36455 Refactor R_SetupFrame/R_SkyboxFrame to deduplicate some code 2022-01-17 21:03:22 -08:00
James R
8e0f02d65a Refactor R_SetupFrame/R_SkyboxFrame to use splitscreen number directly 2022-01-17 18:53:01 -08:00
SteelT
159994c2f0 Don't compile with dynamic base 2022-01-17 15:46:44 -05:00
James R
7e709cd018 Fix compiler warning 2022-01-16 17:35:47 -08:00
James R
c860427026 Add HOSTTESTERS make flag 2022-01-16 17:34:12 -08:00
James R
5441c55baf Do not add gfx.pk3 in testers build 
MISC_PATCH.pk3 covers it.
 2022-01-16 17:32:58 -08:00
toaster
4d4ea71a44 Music also 2022-01-17 01:23:14 +00:00
toaster
4cff27797c Guard IsPlayerAdmin in testers/hosttesters 2022-01-17 01:22:10 +00:00
toaster
6980975f11 Revert "Disable player admins" 
This reverts commit 4d2793918c.
 2022-01-17 01:19:13 +00:00
toaster
4bc916e0d5 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into testers 2022-01-17 01:13:45 +00:00
toaster
250dc70827 TESTERS stuff 
#define TESTERS for tester executable
#define HOSTTESTERS for hosting with TESTERS-specific files (MISC_ etc)
 2022-01-17 01:12:30 +00:00