stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-04 02:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
13186 commits 174 branches 41 tags 203 MiB
Commit graph

11727 commits

Author SHA1 Message Date
spherallic
a6c52f5bad Move MT_RAY to the very end of the mobj list. 2022-02-22 15:49:16 +01:00
sphere
d6f3522333 Merge branch 'fix-vflag-blendmodes' into 'next' 
Fix blendmode V_ flags not working at full opacity in Software

See merge request STJr/SRB2!1717
 2022-02-21 19:58:24 +00:00
spherallic
fcc28d0714 Update seaweed state to utilize new features & sprites. 2022-02-21 16:00:21 +01:00
spherallic
946100939a Update editor configurations & increase Nightopians' hitbox height. 2022-02-19 22:19:39 +01:00
sphere
d532546e46 Merge branch 'mt-null-spawning' into 'next' 
Remove MT_NULL hacks

Closes #721

See merge request STJr/SRB2!1729
 2022-02-19 20:24:34 +00:00
sphere
249a3dfa25 Merge branch 'eggman-hitboxes' into 'next' 
Increase Eggman's hitboxes

See merge request STJr/SRB2!1706
 2022-02-19 20:24:20 +00:00
sphere
c79c6531e6 Merge branch 'server-bots' into 'next' 
Improve bots (resolves #710)

Closes #710

See merge request STJr/SRB2!1679
 2022-02-19 20:24:12 +00:00
sphere
7218060a7a :lachyes: 2022-02-19 01:49:19 +00:00
sphere
14cb5415c9 Merge branch 'fix-portals' into 'next' 
Fix portals

See merge request STJr/SRB2!1724
 2022-02-17 12:26:27 +00:00
spherallic
2266e31038 Merge branch 'next' into state-changes 2022-02-17 12:35:34 +01:00
spherallic
a4778075b2 Convert old frame flags in Metal recordings to their 2.2.10 equivalents. 2022-02-14 14:57:00 +01:00
SMS Alfredo
2033b77b46 Actually do the thing 2022-02-11 00:33:49 -06:00
spherallic
bb84ae1793 Decrease hitbox sizes to prevent collision with thin air. 2022-02-10 13:10:56 +01:00
spherallic
9fee550fb0 Actually check bot names in lib_gAddPlayer. 2022-02-08 14:58:09 +01:00
LJ Sonic
fdee3a2b7f Merge branch 'ms_update_command' into 'next' 
Allow people to update their Master Server listing on command.

See merge request STJr/SRB2!1518
 2022-02-06 18:53:49 +00:00
LJ Sonic
c00d1e5499 Merge branch 'no-dedi-sighandle-window' into 'next' 
Disable SDL error message on dedicated servers

See merge request STJr/SRB2!1735
 2022-02-06 17:44:48 +00:00
LJ Sonic
81b0eb1c7c Merge branch 'crosshairs' into 'next' 
Fix crosshairs not displaying

See merge request STJr/SRB2!1716
 2022-02-06 17:30:15 +00:00
LJ Sonic
9c5427555b Merge branch 'fix-exitgame-ztarget-crash' into 'next' 
Fix lock-on crash (Resolves #746)

Closes #746

See merge request STJr/SRB2!1704
 2022-02-06 17:24:01 +00:00
LJ Sonic
6c7d4b8ef5 Merge branch 'sw-splat-skybox-crash' into 'next' 
Fix software splats breaking and crashing in skyboxes

See merge request STJr/SRB2!1711
 2022-02-06 17:22:58 +00:00
LJ Sonic
2d53842061 Merge branch 'sw-splat-ceilingclip' into 'next' 
Fix software splats not being clipped by ceiling walls

See merge request STJr/SRB2!1712
 2022-02-06 17:22:49 +00:00
LJ Sonic
c69edce2fc Merge branch 'sw-dropshadow-patch' into 'next' 
Hack that fixes software drop shadow crashes (Fixes #159)

Closes #159

See merge request STJr/SRB2!1700
 2022-02-06 17:22:08 +00:00
LJ Sonic
2e60de25ea Merge branch 'sw-splat-npo2-slope-opt' into 'next' 
Add missing optimization to software npo2 sloped floor sprites

See merge request STJr/SRB2!1713
 2022-02-06 17:20:03 +00:00
LJ Sonic
b396683429 Merge branch 'fix-chat' into 'next' 
Fix issues with chat messages

Closes #583

See merge request STJr/SRB2!1698
 2022-02-06 17:15:04 +00:00
LJ Sonic
f4a9d1507d Merge branch 'fix-checksum-disconnect' into 'next' 
Do not attempt to disconnect when a packet checksum is invalid

See merge request STJr/SRB2!1699
 2022-02-06 17:14:44 +00:00
LJ Sonic
1a1cb8942c Merge branch 'znodes-offset-fix' into 'next' 
UDMF: Fix offset calculation for segs that represent linedef backsides

See merge request STJr/SRB2!1701
 2022-02-06 17:12:58 +00:00
LJ Sonic
9d993a585f Merge branch 'ignore-bad-map-lumps' into 'next' 
Only load map lumps that are WADs or have no extension

See merge request STJr/SRB2!1715
 2022-02-06 17:12:07 +00:00
GoldenTails
c49dd5f535 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)
 2022-02-05 18:19:00 -06:00
spherallic
878b4dc5b6 Don't read or set MT_NULL's properties in A_SkullAttack 2022-02-04 20:09:37 +01:00
spherallic
52f3e00497 Whitelist CHARFG, CHARFG, and level select graphics. 2022-02-03 14:38:45 +01:00
spherallic
61661dc900 Whitelist SPECTILE, NGRTIMER, and emblem/emerald hunt radar graphics. 2022-02-03 11:34:05 +01:00
spherallic
18361f5ed7 Whitelist record attack, NiGHTS mode and SRB2BACK graphics. 2022-02-02 23:40:10 +01:00
spherallic
e64775c867 Check V_ThinStringWidth instead of strlen for level platter names. 2022-02-02 23:16:12 +01:00
spherallic
6e105a23f6 Update Nightopian states for the new sprites & fix another bug 2022-02-02 14:43:22 +01:00
spherallic
e301327dee Avoid using old explosion states for Jetty-Syn/Skim mines. 2022-02-02 12:15:14 +01:00
James R
a8c658b545 Never spawn MT_NULL 2022-02-01 04:04:53 -08:00
James R
6325185091 Add P_SetPower; remove mobj hack from line 434 2022-02-01 03:52:31 -08:00
James R
9dfa153e74 Use P_CheckMove 2022-02-01 03:52:28 -08:00
James R
518de0ce10 Add P_CheckMove 
Checks if P_TryMove would succeed without actually moving.
 2022-02-01 03:37:03 -08:00
James R
f6f002e70b A_LobShot: remove ??? 
MT_NULL spawning, not cool bro.
 2022-02-01 02:43:00 -08:00
James R
0a0c17da7c PARANOIA: I_Error if mobj hook is called with MT_NULL 2022-02-01 02:27:27 -08:00
sphere
ff57a983d7 Merge branch 'facing-forwards' into 'next' 
Don't modify drawangle when taking damage in strafe mode

See merge request STJr/SRB2!1689
 2022-01-30 13:32:30 +00:00
sphere
bcd900211b Merge branch 'nightopian-fix' into 'next' 
Fix Nightopians

See merge request STJr/SRB2!1703
 2022-01-30 13:28:18 +00:00
Hannu Hanhi
611054b6cd Fix perfstats failing to compile with NOHW=1 2022-01-29 02:24:52 +02:00
James R
37add34b9c Update texturecache user when reallocating 2022-01-27 00:28:36 -08:00
James R
2aec4501eb Hash name lookup for textures and lumps 2022-01-27 00:03:37 -08:00
James R
2ebec53561 P_AddWadFile: only load textures in current file 2022-01-27 00:03:34 -08:00
James R
571e475394 Read only header bytes when creating textures list 
R_LoadTextures was reading in the entirety of every
texture lump, now it only reads the 8 byte PNG header.
This saved more than 1 second for me (1.68 s -> 0.24 s).

PNG still need to be read in entirely to check their
dimensions; I didn't bother looking into optimizing it
since we don't have many PNG textures right now.
 2022-01-26 23:53:36 -08:00
James R
432f691852 Free unused texture lumps in R_LoadTextures 
PU_CACHE never gets freed automatically and Z_Unlock does
NOTHING.
 2022-01-26 23:53:36 -08:00
Hannu Hanhi
89843d0eca did not mean to remove this line 2022-01-25 05:01:23 +02:00
Hannu Hanhi
ba04b045e6 Fix portals 
- Resetting portalcullsector fixes the major visual glitches

- Using 32 bits for nummasks and i fixes crashes when rendering lots of portals
 2022-01-25 04:53:40 +02:00
spherallic
cdef5a679b disable develop 2022-01-23 20:39:17 +01:00
spherallic
be7f628e2c Add new plant object for the revamped tutorial. 2022-01-23 20:13:26 +01:00
spherallic
6d19a55de9 oops 2022-01-23 19:19:26 +01:00
spherallic
15755ef992 Remove unneeded R_GetTranslucencyTable calls, add V_HUDTRANS* comments 2022-01-19 13:17:57 +01:00
spherallic
9a07c1ca8c Fix HUD/graphic blendmodes not working at full opacity in Software. 2022-01-19 10:09:57 +01:00
lachablock
1a5995968c Revert server-sidedness of bots 2022-01-19 00:48:25 +11:00
spherallic
bf2809b213 Fix crosshairs not displaying and refactor their code. 2022-01-15 17:12:33 +01:00
MascaraSnake
a342703b50 Merge branch 'udmf-sector-fields' into udmf-full 
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
 2022-01-14 21:16:23 +01:00
MascaraSnake
13b8d1cf7e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a Merge branch 'udmf-thing-types' into udmf-more-linedef-types 
# Conflicts:
#	src/p_setup.c
 2022-01-14 21:06:45 +01:00
MascaraSnake
0833f0bd4f Merge branch 'udmf-executor-triggers' into udmf-thing-types 
# Conflicts:
#	src/p_setup.c
#	src/p_spec.h
 2022-01-14 21:01:39 +01:00
MascaraSnake
0d9860c368 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-14 20:42:59 +01:00
MascaraSnake
4b8f5bd7f3 Merge branch 'udmf-lighting' into udmf-linedef-executors 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/doomdata.h
#	src/r_defs.h
 2022-01-14 20:30:29 +01:00
MascaraSnake
79cf2f53e8 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-14 20:24:51 +01:00
MascaraSnake
7d2a188c31 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-14 20:24:13 +01:00
MascaraSnake
940d076190 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
 2022-01-14 20:21:48 +01:00
MascaraSnake
5d343f9c13 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
 2022-01-14 20:17:18 +01:00
Hannu Hanhi
49d03913d7 Add missing optimization to npo2 sloped floor sprites 2022-01-14 20:45:28 +02:00
MascaraSnake
323cfaace9 Add blendmode support to FOFs 2022-01-14 19:40:45 +01:00
Hannu Hanhi
d0966f123f Fix software splats not being clipped by ceiling walls 2022-01-14 20:11:49 +02:00
Hannu Hanhi
f72f45d93a Fix software splats breaking and crashing in skyboxes 2022-01-14 19:53:03 +02:00
MascaraSnake
6bb6dc88ca Merge branch 'next' into udmf-fofs-mkii 
# Conflicts:
#	src/hardware/hw_main.c
#	src/lua_maplib.c
#	src/p_spec.c
#	src/p_user.c
 2022-01-14 07:24:05 +01:00
MascaraSnake
37bb9d9c11 Fix oversight with rising FOFs 2022-01-13 23:11:10 +01:00
MascaraSnake
7c0687bc33 P_WriteTextmap: Copy colormap only to first tagged sector and do the rest via the linedef 2022-01-13 23:02:38 +01:00
MascaraSnake
1fdfb6ba6e P_WriteTextmap: Add warning for linedef type 61 2022-01-13 22:14:41 +01:00
MascaraSnake
b8524fc741 P_WriteTextmap: Convert linedef executors that rely on mapthings 2022-01-13 21:59:00 +01:00
MascaraSnake
2d4aabe48e P_WriteTextmap: Remove superfluous whitespaces in moreids 2022-01-13 18:57:41 +01:00
MascaraSnake
1dcee17fa4 P_WriteTextmap: Convert linedef type 76 2022-01-13 18:54:18 +01:00
spherallic
8007aa82ca Merge branch 'next' into tutorial-scenery 2022-01-13 16:03:57 +01:00
katsy
fe3a201df5 fix oldringexplode not scaling or flipping 2022-01-13 02:52:10 -06:00
lachablock
4af820e82c Restore a cast I didn't realize used to be there 2022-01-13 09:56:47 +11:00
lachablock
70a1dd6db0 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-13 09:52:38 +11:00
LJ Sonic
b7dbb7782e Only load map lumps that are WADs or have no extension 2022-01-12 23:06:26 +01:00
MascaraSnake
25fe26badc P_WriteTextmap: Add more warnings for unconvertable stuff 2022-01-12 21:36:19 +01:00
sphere
f8532d4ad1 Merge branch 'blentran-update' into 'next' 
Blentran - updated

See merge request STJr/SRB2!1656
 2022-01-11 21:53:49 +00:00
sphere
53f9d4b2e0 Merge branch 'new-default-controls' into 'next' 
Several changes to default control settings

See merge request STJr/SRB2!1682
 2022-01-11 21:19:05 +00:00
sphere
0ca74432f9 Merge branch 'ogl-better-gpu-error' into 'next' 
Improve OpenGL GDI Generic error message

See merge request STJr/SRB2!1673
 2022-01-11 21:16:32 +00:00
sphere
ea3b867c7e Merge branch 'rotationcrash' into 'next' 
Fix 2.2.10 pre1 rollangle crash (resolves #747)

Closes #747

See merge request STJr/SRB2!1707
 2022-01-11 21:16:14 +00:00
sphere
af925c1742 Merge branch 'taglists-refactor' into 'next' 
Speed up taglist creation

See merge request STJr/SRB2!1702
 2022-01-11 21:15:06 +00:00
MascaraSnake
666833e64b P_WriteTextmap: Add warnings for deprecated sector specials and reserved tags 2022-01-11 20:24:07 +01:00
lachablock
8ed18a12a4 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-11 20:04:22 +11:00
katsy
2e4c5d1446 alternate fix to #555 which doesn't crash the game 2022-01-10 19:32:21 -06:00
MascaraSnake
0b9876d61b P_WriteTextmap: Clear out colormap linedef special after copying the colormap 2022-01-10 22:10:19 +01:00
spherallic
af5173c90f Increase Eggman's hitboxes to actually match the current sprites. 2022-01-10 21:38:30 +01:00
MascaraSnake
3b4fad16db P_WriteTextmap: Convert global colormaps 2022-01-10 21:23:55 +01:00
MascaraSnake
576ded6537 Fix incorrectly applied FOF blendmodes 2022-01-10 20:59:57 +01:00
LJ Sonic
a6808de96c Fix message sending code using hardcoded buffer size 2022-01-10 20:12:27 +01:00
LJ Sonic
de9d6ecbe6 Fix long chat messages causing net command failures 2022-01-10 20:05:58 +01:00
LJ Sonic
aee7803621 Add SKIPSTRINGL macro 2022-01-10 20:03:36 +01:00
LJ Sonic
05f1a9edc1 Revert "Fix long chat messages causing net command failures" 
This reverts commit 1377824799.
 2022-01-10 19:57:15 +01:00
LJ Sonic
7ea81eacc5 Fix say command and its variants using hardcoded buffer size 2022-01-10 19:31:41 +01:00
LJ Sonic
3083290af8 Add READSTRINGL and WRITESTRINGL macros 2022-01-10 18:57:18 +01:00
LJ Sonic
a668546088 Make byte stream manipulation code easier to read 2022-01-10 18:56:42 +01:00
GoldenTails
e0afc2d2b6 Add a player->mo check before attempting to account for ztargetting. 2022-01-09 17:09:57 -06:00
MascaraSnake
868b2577ad Merge branch 'udmf-sector-fields' into udmf-full 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_setup.c
#	src/p_spec.c
 2022-01-09 13:58:27 +01:00
MascaraSnake
020b738aa9 Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-09 13:52:59 +01:00
MascaraSnake
e7a281d994 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-01-09 13:52:26 +01:00
MascaraSnake
e19ba99f57 Merge branch 'udmf-executor-triggers' into udmf-thing-types 2022-01-09 13:51:50 +01:00
MascaraSnake
95bf8ea4bb Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-09 13:51:21 +01:00
MascaraSnake
fba986ff1c Merge branch 'udmf-lighting' into udmf-linedef-executors 2022-01-09 13:50:47 +01:00
MascaraSnake
0b8204491d Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-09 13:50:14 +01:00
MascaraSnake
904b434c65 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-09 13:49:46 +01:00
MascaraSnake
0c6e2c70c7 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-01-09 13:49:14 +01:00
MascaraSnake
5e7547b822 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 2022-01-09 13:48:40 +01:00
MascaraSnake
3104504848 Merge branch 'blentran-update' into udmf-full 2022-01-09 13:47:59 +01:00
MascaraSnake
95e909400f Fix blendmode regression in OpenGL caused by faulty fog wall support 2022-01-09 13:45:56 +01:00
MascaraSnake
0a2294118e Merge branch 'udmf-scrollers' into udmf-full 2022-01-09 12:53:35 +01:00
MascaraSnake
ce29d05be8 Fix typo in wall scroller conversion 2022-01-09 12:53:12 +01:00
MascaraSnake
b3ca6845c1 P_WriteTextmap: Don't bother with equation slopes because binary maps can't have them anyway 2022-01-09 12:38:49 +01:00
MascaraSnake
7276c6bef5 P_WriteTextmap: Correctly write linedef executor delays 2022-01-09 12:37:46 +01:00
MascaraSnake
1fbfc9bea9 P_WriteTextmap: Convert custom gravity and custom exit 2022-01-09 11:44:53 +01:00
MascaraSnake
5f6014223d Don't convert global colormaps 2022-01-09 10:41:50 +01:00
MascaraSnake
c1f03e7720 P_WriteTextmap: Convert colormaps 2022-01-09 10:22:25 +01:00
MascaraSnake
a46619684f Disable NiGHTS objectplace, which serves no purpose anymore without writethings 2022-01-09 09:30:15 +01:00
MascaraSnake
8615e86a0b P_WriteTextmap: Don't try to write invalid textures 2022-01-09 09:27:39 +01:00
spherallic
8651123463 Fix errors with the hardcoded Nightopians from Dream Hill. 2022-01-08 19:47:00 +01:00
MascaraSnake
90cd009b23 Remove writethings because it no longer works properly with the binary-to-UDMF conversion 2022-01-08 16:58:55 +01:00
MascaraSnake
1269fe6c0e Implement faster textmap parser 2022-01-08 13:17:15 +01:00
MascaraSnake
b7f9626fda Merge branch 'taglists-refactor' into udmf-full 2022-01-07 18:45:52 +01:00
MascaraSnake
3248556fa9 Speed up taglist creation 2022-01-07 18:42:56 +01:00
MascaraSnake
5149699def Update VS project files 2022-01-07 18:00:56 +01:00
MascaraSnake
b05bcc4657 P_WriteTextmap: Correct flat offsets 2022-01-07 15:44:56 +01:00
MascaraSnake
c912222df6 Merge branch 'znodes-offset-fix' into udmf-full 2022-01-07 14:44:42 +01:00
MascaraSnake
56b00fac54 P_WriteTextmap: Rearrange properties and remove some defaults 2022-01-07 13:39:25 +01:00
MascaraSnake
95ce2aca98 P_WriteTextmap: Update friction to float 2022-01-07 12:59:29 +01:00
MascaraSnake
b6a5ff98f0 Merge branch 'udmf-sector-fields' into udmf-full 2022-01-07 12:46:47 +01:00
MascaraSnake
8b5f6cca37 Add command line parameter for saving the current map in TEXTMAP format 2022-01-07 12:45:40 +01:00
MascaraSnake
1de5b77710 Fix typo 2022-01-07 10:25:32 +01:00
MascaraSnake
659410dde1 Use Slope Skew flag instead of Upper Unpegged for FOF skewing 2022-01-05 23:47:05 +01:00
MascaraSnake
e406a52446 Remove weird special behavior for two-sided upper textures in software 2022-01-05 22:33:14 +01:00
MascaraSnake
fcb69b9c2f Rename more linedef flags 2022-01-05 19:43:40 +01:00
MascaraSnake
2bef8da42f Remove access to unused effect6 flag in UDMF 2022-01-05 18:42:53 +01:00
MascaraSnake
5f97047b96 Rename linedef flags 2022-01-05 18:40:02 +01:00
MascaraSnake
55559a5f98 Split P_ConvertBinaryMap into multiple functions 2022-01-05 18:15:04 +01:00
MascaraSnake
06b7d7ceb8 Make only ML_EFFECT3 affect midtexture pegging in UDMF 2022-01-05 18:05:47 +01:00
MascaraSnake
549569e75b Fix offset calculation for segs that represent linedef backsides 2022-01-05 10:08:49 +01:00
spherallic
a08c7eac1f wip: staterange actions 2022-01-05 09:55:46 +01:00
MascaraSnake
d25bc75a92 Remove redundant UDMF check in P_LoadSidedefs 2022-01-05 09:22:13 +01:00
MascaraSnake
a8e32cfe12 Fix incorrect turnaround behavior for bounceFloor and bounceCeiling 2022-01-05 00:26:10 +01:00
Hannu Hanhi
a8fe12ae98 Hack that fixes software drop shadow crashes by bypassing incorrectly set variables 2022-01-04 22:30:50 +02:00