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

16991 commits

Author SHA1 Message Date
SteelT
dbdaebbb04 Merge branch 'droptarget' into 'master' 
"Drop Target" item

See merge request KartKrew/Kart!562
 2022-03-22 03:33:54 +00:00
SteelT
60948d887a Merge branch 'unnerf-wall-transfer' into 'master' 
Unnerf wall transfer speed

See merge request KartKrew/Kart!559
 2022-03-22 03:33:40 +00:00
toaster
3aba8084d4 FORGOT 2022-03-22 01:34:12 +00:00
toaster
1d74dae951 Change order of item constants (Capsules makes them hard to change, now...) 2022-03-22 01:31:14 +00:00
toaster
e2640cbe9e Shadow adjustment (per VC discussion) 2022-03-22 01:00:22 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit. 
Most of the way there, but still a bit left to do.
 2022-03-21 23:40:30 +00:00
James R
6dd38f001a Fix boss flash in opengl 2022-03-21 13:05:01 -07:00
James R
fbe3106890 Refactor R_SpriteIsFlashing into R_ThingIsFlashing 
Checks for boss fret AND hitlag.
 2022-03-21 13:03:30 -07:00
Sally Coolatta
48160b6417 Increase spring strengths by ONE 2022-03-21 00:46:58 -04:00
Sally Coolatta
995ebae2bd Unnerf wall transfer speed 
(Sorry Ramp Park...)
 2022-03-20 23:50:42 -04:00
toaster
2a40ab39fa Made a HOSTTESTERS build for Tyron, fixed some stuff that came up: 
* Grand Prix temp menu now won't open if there are no cups available
* No more Boss Missions entry on the menu, since that won't exist post-newmenus
 2022-03-19 11:43:12 +00:00
toaster
60ff5de92d Made a HOSTTESTERS build for Tyron, fixed some stuff that came up: 
* Grand Prix temp menu now won't open if there are no cups available
* No more Boss Missions entry on the menu, since that won't exist post-newmenus
 2022-03-19 11:42:00 +00:00
toaster
a6f4890421 Figured out what was wrong with splatsprites by comparing their drawing functions to the current state of 2.2's codebase. 2022-03-18 21:55:31 +00:00
toaster
ef0de0dec2 Splat stretch and squash isn't on the same axis, so just... don't do it, at least for now. 2022-03-18 21:31:22 +00:00
toaster
6cbeda5ec6 Add Encore support to splats (software; GL can come later). 2022-03-18 21:20:34 +00:00
toaster
09a99fa06d * Make RunOverlays and A_OverlayThink more consistent. 
* Incorporate drawangle support for both (flattened merge of STJr/SRB2!1599)
 2022-03-18 20:59:18 +00:00
toaster
b270b67c1d Limit array access for placed emblems. 
(Partial merge of STJr/SRB2!1757)
 2022-03-18 20:52:53 +00:00
spherallic
07901a6364 oops 2022-03-18 20:50:24 +00:00
toaster
ed00874f5f wip: staterange actions 
# Conflicts:
#	src/doomdef.h
 2022-03-18 20:50:03 +00:00
Hannu Hanhi
09885ce34b did not mean to remove this line 2022-03-18 20:44:14 +00:00
toaster
336010e616 Fix portals 
- Resetting portalcullsector fixes the major visual glitches

- Using 32 bits for nummasks and i fixes crashes when rendering lots of portals

# Conflicts:
#	src/r_main.c
 2022-03-18 20:44:07 +00:00
GoldenTails
5dc9df4c6a Allow people to update their Master Server listing on command. 2022-03-18 20:41:49 +00:00
toaster
786d263019 Make dedicated servers not pop up that annoying SDL error window 
So they don't mess with shell scripts that expect SRB2 to exit when it crashes (like most other programs)

# Conflicts:
#	src/sdl/i_system.c
 2022-03-18 20:41:11 +00:00
Hannu Hanhi
b7c23b9187 Fix software splats breaking and crashing in skyboxes 2022-03-18 20:39:02 +00:00
Hannu Hanhi
3083d97e16 Fix software splats not being clipped by ceiling walls 2022-03-18 20:38:17 +00:00
Hannu Hanhi
115004d704 Add missing optimization to npo2 sloped floor sprites 2022-03-18 20:37:16 +00:00
LJ Sonic
4b1ba2974d Do not attempt to disconnect when a packet checksum is invalid 2022-03-18 20:35:07 +00:00
MascaraSnake
b42715a5ca Fix offset calculation for segs that represent linedef backsides 2022-03-18 20:34:29 +00:00
toaster
5783c5aace Only load map lumps that are WADs or have no extension 
# Conflicts:
#	src/w_wad.c
 2022-03-18 20:31:17 +00:00
Hannu Hanhi
2a92a80e7a Improve OpenGL GDI Generic error message 2022-03-18 20:24:34 +00:00
katsy
7ddaf60a54 alternate fix to #555 which doesn't crash the game 2022-03-18 20:24:06 +00:00
MascaraSnake
6cabe55d3b Speed up taglist creation 2022-03-18 20:23:31 +00:00
Vincent Robinson
1d7fa9e0f5 Make linedef 96 apply to tags from 97-99, but not to itself 2022-03-18 20:20:39 +00:00
GoldenTails
96976fdba3 You probably don't want to memorise the formula to convert arccos to arcsin so 2022-03-18 20:16:23 +00:00
MascaraSnake
a6d921e37c Fix "all players" check in T_EachTimeThinker 2022-03-18 20:15:10 +00:00
katsy
45f848c4ed null gamestate during pre-intermission to prevent unwanted interaction 2022-03-18 20:14:17 +00:00
toaster
c2f427d858 Call the Lua timestamp function getTimeMicros 
# Conflicts:
#	src/lua_baselib.c
 2022-03-18 20:08:45 +00:00
toaster
9577dc26b9 Timestamp function for Lua 
# Conflicts:
#	src/lua_baselib.c
 2022-03-18 20:07:49 +00:00
Jaime Ita Passos
d5d8124ab8 Remove misplaced line from R_DrawTiltedSplat_NPO2_8 2022-03-18 19:59:58 +00:00
toaster
78b8def506 Allow fromnetsave to be used in P_SpawnSpecialsThatRequireObjects (missed element of the level load executor fix). 2022-03-18 19:59:28 +00:00
toaster
134f3b5df5 fix water fof height calculation on slopes 
# Conflicts:
#	src/p_mobj.c
 2022-03-18 19:54:19 +00:00
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