lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9466 commits 1 branch 29 tags 122 MiB
Commit graph

8281 commits

Author SHA1 Message Date
James R 4e9fb2de7d Merge branch 'startcontinue' into 'master' 
Fix F_StartContinue fading out incorrectly in OpenGL

See merge request STJr/SRB2!738
 2020-01-31 02:33:51 -05:00
Steel Titanium f4de193809 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05:00
lachwright 2e48539251 Merge branch 'next' into platform-fixes 2020-01-30 21:39:01 +08:00
Jaime Passos 85211dcc09 Only write a Local Color Table if the frame's palette differs from the header's palette 2020-01-29 17:31:27 -03:00
Jaime Passos 999e72ab32 Uh 2020-01-29 13:56:39 -03:00
Jaime Passos 99c755c186 Update the Screenshot Options menu 2020-01-29 13:52:02 -03:00
Jaime Passos 5a330803ec Local Color Table for GIF movie mode 2020-01-29 13:47:55 -03:00
SteelT 3a6c7e9577 Merge branch 'dehacked-hud-fix' into 'next' 
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items

See merge request STJr/SRB2!733
 2020-01-28 20:25:07 -05:00
Louis-Antoine 31ce076411 Only call P_CheckSurvivors() in tag gametypes 2020-01-28 14:02:36 +01:00
Jaime Passos 636093a59d Fix color LUT using the wrong palette 2020-01-27 13:55:13 -03:00
Jaime Passos 28fd2380df Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
Jaime Passos 1548a22ea9 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Jaime Passos 1774ba22b6 Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Jaime Passos cf7b4d826a Remove redundancy 2020-01-26 23:46:07 -03:00
Jaime Passos 7f57327ff7 "changes" not "changed" 2020-01-26 23:41:34 -03:00
Jaime Passos 46cbe63b43 Fix going big 2020-01-26 23:39:31 -03:00
Jaime Passos 2cfeaa63d2 Fix movement to accomodate to window scale changes 2020-01-26 23:34:04 -03:00
Jaime Passos 8f3855d09f Don't stop the automap (just restart it instead.) 2020-01-26 23:12:28 -03:00
Jaime Passos dd8166ca5f Doesn't matter. 2020-01-26 22:57:14 -03:00
Jaime Passos ba6018aea4 Optimise pixel drawing 2020-01-26 22:52:15 -03:00
Jaime Passos d08929b3d7 Move line drawer setting to AM_Drawer 2020-01-26 22:46:57 -03:00
Monster Iestyn ef53672deb Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
Zwip-Zwap Zapony ea28304d8c Fix missing "RINGSNUMTICS" in dehacked.c 
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
 2020-01-26 10:53:37 +01:00
fickleheart e57589b106 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
lachwright 65e84978fa Don't cancel Knuckles' landing animation on rising surfaces 2020-01-26 04:51:00 +08:00
lachwright cddc4e1500 Merge branch 'next' into platform-fixes 2020-01-26 04:34:57 +08:00
toaster f90c70ebe2 Make the DMG actually *applied*. Consequence: flame will continue flying through player instead of dying in midair and dropping a flame, but this is actually desirable given the current behaviour looks kind of shitty. 2020-01-25 11:34:30 -05:00
toaster 2dd13bb2a4 Fix damagetype for Cybrak flamethrower. 2020-01-25 11:31:06 -05:00
Nev3r 842099b74d Merge branch 'credits-again' into 'next' 
Credit Tatsuru

See merge request STJr/SRB2!728
 2020-01-25 08:54:41 -05:00
Louis-Antoine d30b48cfd1 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
fickleheart 332b22a87a Move spawnsnap to Special/ignore on sector trigger 
Also includes splitting the starpost logic into its own function.
 2020-01-24 23:54:54 -06:00
SteelT 6c4c122925 Merge branch 'opengl-garbage-fade' into 'master' 
Fix garbage fade on Sonic's ass in OpenGL

See merge request STJr/SRB2!715
 2020-01-25 00:51:07 -05:00
James R c9bc3837f9 Signed is unsigned, cool 2020-01-24 16:44:53 -08:00
James R 59ed381fc0 Credit Tatsuru, he's done a bit 2020-01-24 16:38:46 -08:00
LJ Sonic 53e2cfbde2 Merge branch 'keep-body' into 'next' 
Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722
 2020-01-24 18:50:03 -05:00
SteelT 4b1a402731 Merge branch 'key-out-of-range' into 'master' 
Don't set controls to keys of array bounds

See merge request STJr/SRB2!723
 2020-01-24 18:45:19 -05:00
LJ Sonic d654bbc7de Merge branch 'point-in-subsector-or-null' into 'next' 
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

See merge request STJr/SRB2!719
 2020-01-24 17:08:30 -05:00
SteelT c7b4054a7a Merge branch 'musicdef-versioning' into 'next' 
MUSICDEF cleanup, fixes, and VERSION directive to opt into new format

See merge request STJr/SRB2!708
 2020-01-24 17:06:58 -05:00
SteelT 9677c9f084 Merge branch 'player2-turn-fix-next' into 'next' 
Fix "cam2_turnmultiplier" being unused in "next"

See merge request STJr/SRB2!713
 2020-01-24 17:04:20 -05:00
SteelT 7d740efc78 Merge branch 'player2-turn-fix' into 'master' 
Fix "cam2_turnmultiplier"

See merge request STJr/SRB2!711
 2020-01-24 17:04:06 -05:00
SteelT 72996a50bf Merge branch 'ploadflat-bruh-bruh' into 'master' 
Fix P_AddLevelFlatRuntime again

See merge request STJr/SRB2!717
 2020-01-24 17:00:09 -05:00
SteelT 9a414ff5ab Merge branch 'fix-mouse-controls-setup' into 'master' 
Fix mouse in controls setup menu

See merge request STJr/SRB2!706
 2020-01-24 16:58:06 -05:00
MascaraSnake 7ac1b9298f Merge branch 'master' into next 2020-01-24 22:37:25 +01:00
Louis-Antoine 8bd897a269 Be silent when "kicking" a disconnected player 
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
 2020-01-24 19:56:57 +01:00
James R 3d9466e5f5 Semantics 2020-01-23 13:57:39 -08:00
Louis-Antoine ba127008cf Do not spam player quit net commands 2020-01-23 19:59:41 +01:00
Louis-Antoine b0b22b53d6 Ignore disconnected players in tag gametypes 
Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
 2020-01-23 19:58:13 +01:00
Louis-Antoine ce20642fa7 Do not protect non-IT players in tag gametypes 2020-01-23 18:52:16 +01:00
James R f0daea39d4 Don't set controls to keys out of array bounds 
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
 2020-01-22 22:19:00 -08:00
Louis-Antoine fb28ede660 Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil 
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
 2020-01-22 16:58:57 +01:00
Louis-Antoine cfec8609f9 Fix missing declaration 2020-01-22 04:01:06 +01:00
Louis-Antoine f209721ded Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine 2527b6c389 Teleport disconnected players to starpost if they fall in a pit 2020-01-22 03:20:27 +01:00
Louis-Antoine 412ba38a81 Refactor player spawning code a little 2020-01-22 03:19:15 +01:00
Louis-Antoine d03c928baa Give flashing tics to disconnected players and prevent drowning 2020-01-22 03:14:44 +01:00
Louis-Antoine 73d0549fa4 Ignore players towards exit count 30 seconds after their disconnection 2020-01-22 03:11:05 +01:00
Louis-Antoine d374bf4f9b Let clients rejoin the server without losing their status 
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
 2020-01-22 03:05:08 +01:00
James R 2373a0aa83 Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
James R d90c0b8fbd Don't check "Too many flats in level" with P_AddLevelFlatRuntime 
Also moved the debug down in case anyone uses that.
 2020-01-21 15:35:07 -08:00
James R 9cd101c68d Revert "Fix Ploadflat closing the game with "Too many flats in level" error message" 
This reverts commit ea129f701c.
 2020-01-21 15:35:07 -08:00
James R f297f4ff56 Sonic is dead again 2020-01-21 12:24:24 -08:00
James R c347254e80 Reorder Sonic's ass so the OpenGL wipe doesn't see garbage 2020-01-21 12:23:34 -08:00
James R dfcd058c80 (BRUH MOMENT) activettscale was -1, so do recache after it's set 2020-01-21 12:21:18 -08:00
Zwip-Zwap Zapony 49a4c7d5f3 Separate "turnmultiplier"s for splitscreen players 
This fixes player 2 using player 1's "cam_turnmultiplier"
instead of player 2's "cam2_turnmultiplier"
 2020-01-21 14:53:05 +01:00
James R 5b08e1802d Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
James R 2d8ea7125c Remove unnecessary optimization 2020-01-20 15:36:27 -08:00
James R 0d460aed1d Merge branch 'gl-dropshadows' into 'next' 
OpenGL drop shadows

See merge request STJr/SRB2!703
 2020-01-20 16:52:40 -05:00
Zwip-Zwap Zapony c1097813f4 Fix "cam2_turnmultiplier" 
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
 2020-01-20 16:14:20 +01:00
Confusion ad505a6fe7 Fix title screen broken when leaving during resynch 2020-01-19 17:55:22 +03:00
James R a7770c3e97 Merge branch 'add-exitmove-to-menu' into 'next' 
Put cv_exitmove in the server options menu

See merge request STJr/SRB2!704
 2020-01-19 02:18:49 -05:00
James R 9dbc54284e Opt into new MUSICDEF format (2.2.0 compatibility) 
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
 2020-01-18 23:12:30 -08:00
James R 1317dba3e4 Refactor MUSICDEF parsing, actually count lines 
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
 2020-01-18 22:17:47 -08:00
Louis-Antoine 512435c59f Fix mouse in controls setup menu 2020-01-18 20:18:20 +01:00
Tatsuru 8348123a70 Goal posts 2020-01-18 13:15:24 -03:00
Jaime Passos cdc3386d48 Fix missing constant 2020-01-18 12:10:48 -03:00
Tatsuru 0c7c5742a8 Put cv_exitmove in the menus 2020-01-18 12:06:04 -03:00
James R ffc274643c Let "+" command line parameters specify more than one argument 
Previously each parameter after the first would be quoted into one argument to
pass to the command buffer.
 2020-01-18 00:23:47 -08:00
James R e82d19572d Merge branch 'intangable' into 'next' 
Add FF_INTANGABLEFLATS as an alternative spelling for FF_INTANGIBLEFLATS

See merge request STJr/SRB2!702
 2020-01-18 00:49:08 -05:00
James R 94a2f0bb4f Don't draw Tails' tails in first person (MF2_LINKDRAW) 2020-01-17 20:56:32 -08:00
James R 762223db7c Duplicated code is gone, so sad 2020-01-17 20:53:36 -08:00
Sally Cochenour 43828f265c Use shadow cvar 2020-01-17 22:20:04 -05:00
Sally Cochenour ba51f83aaf Merge branch 'next' into gl-dropshadows 2020-01-17 22:19:51 -05:00
James R 9a1cb0e30e Merge branch 'software-dropshadows' into 'next' 
Software dropshadows

See merge request STJr/SRB2!660
 2020-01-17 18:56:13 -05:00
James R 96c91ce716 Merge branch 'r_ispointinsubsector' into 'next' 
Add R_IsPointInSubsector to lua baselib

See merge request STJr/SRB2!700
 2020-01-17 18:24:04 -05:00
Jaime Passos 999094f2f6 backwards compat 2020-01-17 16:11:17 -03:00
Alam Ed Arias b09341383f Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
Alam Ed Arias b38921ff53 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master' 
Fuck NONET

See merge request STJr/SRB2!699
 2020-01-17 11:11:02 -05:00
fickleheart f59ed6b2f4 DOUBLE DAMNIT 2020-01-17 00:34:57 -06:00
fickleheart d39d8506ca Let nerds turn off shadows 2020-01-17 00:20:10 -06:00
fickleheart 919661ff8f Give me a break 2020-01-17 00:18:00 -06:00
fickleheart 4ca44f2d57 Bosses need dropshadows too 2020-01-17 00:16:15 -06:00
fickleheart 9a4ad20947 DAMNIT 2020-01-17 00:13:13 -06:00
fickleheart f0843cba13 Let vissprites have shadows too 
fuck it, hopefully it works
 2020-01-17 00:13:05 -06:00
Jaime Passos 8bfdb52231 add R_IsPointInSubsector to lua baselib 2020-01-17 00:49:43 -03:00
Jaime Passos 7adc108a2a typoe 2020-01-17 00:34:31 -03:00
James R e4f0fa46f5 Dumbass NONET stuff... 2020-01-16 18:07:28 -08:00
James R b6f68be52c Merge branch 'credits-woopises' into 'next' 
Add missing name to the credits

See merge request STJr/SRB2!696
 2020-01-16 20:33:35 -05:00
James R 098e41e518 Merge branch 'larger-chat' into 'master' 
Larger chat

See merge request STJr/SRB2!691
 2020-01-16 20:33:09 -05:00
James R d4e0bfe87f Merge branch 'snac-bruh' into 'master' 
Try to set a 21 character name and SIGABRT

See merge request STJr/SRB2!689
 2020-01-16 20:32:58 -05:00
James R d7b6a3dd61 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master' 
-bindaddr for mserv

See merge request STJr/SRB2!688
 2020-01-16 20:32:49 -05:00
Alam Ed Arias b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
Alam Ed Arias d9742afb45 Merge remote-tracking branch 'origin/next' into next 2020-01-16 20:17:58 -05:00
Alam Ed Arias daab7a0d21 Merge remote-tracking branch 'origin/master' 2020-01-16 20:17:05 -05:00
James R f93ddc3f37 Merge branch 'keywords-back-again' into 'next' 
Level header keywords

See merge request STJr/SRB2!656
 2020-01-16 20:05:24 -05:00
James R f8666d6cee Merge branch 'word' into 'master' 
Word jumping

See merge request STJr/SRB2!653
 2020-01-16 20:05:12 -05:00
James R 601d4aec34 Merge branch 'FALLTHRU' into 'next' 
FALLTHRU versus fallthru, which will win?

See merge request STJr/SRB2!692
 2020-01-16 19:59:00 -05:00
James R 1be648578f Merge branch 'clear-sign-sprite' into 'next' 
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
 2020-01-16 19:57:54 -05:00
James R 1f36bde25f Merge branch 'musicdef' into 'next' 
MUSICDEF parser changes.

See merge request STJr/SRB2!599
 2020-01-16 19:35:38 -05:00
Steel Titanium 54ec64062c Revert "Move to the end of the list" 
This reverts commit 32c65ae844.
 2020-01-16 19:20:05 -05:00
Steel Titanium 32c65ae844 Move to the end of the list 2020-01-16 18:59:39 -05:00
Steel Titanium 4c6edd87df Restore this that got removed shomehow 2020-01-16 14:31:36 -05:00
Steel Titanium 36511afda9 Add missing name to the credits 2020-01-16 14:28:47 -05:00
Sally Cochenour 4e481340ce OpenGL shadows 2020-01-16 12:37:32 -05:00
Alam Ed Arias 709489cab8 Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Alam Ed Arias 0134be8b78 please stop breaking clang 2020-01-16 12:05:21 -05:00
lachwright 28c466a0a5 Reset pmomz after transfer to momz 2020-01-16 22:56:01 +08:00
Sally Cochenour 28cd5b2f03 Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows 2020-01-16 09:38:12 -05:00
James R 542e38e717 Don't draw player mobj in first person 
This solves that annoying albeit slightly amusing bug
where your sprite clips into your view during a quake.

For OpenGL, this also solves the player's model
rendering while in first person. So you'll no
longer be looking through Sonic's body!
 2020-01-16 03:18:05 -08:00
James R bbbe76d2ca Expose viewmobj as r_viewmobj 2020-01-16 03:09:02 -08:00
James R 36b9549b23 Merge branch 'locale-liberation' into 'master' 
Locale liberation

Closes #113

See merge request STJr/SRB2!677
 2020-01-15 23:38:40 -05:00
James R 55cc978f40 Merge branch 'extra-life-jingle' into 'master' 
Optionally use a sound for 1-Up

See merge request STJr/SRB2!668
 2020-01-15 23:38:21 -05:00
Louis-Antoine 0197a83db7 bruh 2020-01-15 15:57:38 +01:00
Louis-Antoine ec5db89e55 Cleanup chat code a little 2020-01-15 15:48:03 +01:00
Louis-Antoine 9504ba96da Increase maximum and default chat width 2020-01-15 15:36:11 +01:00
James R 1489b4bcdd It's FALLTHRU not fallthru 
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
 2020-01-15 02:14:20 -08:00
James R 708ab6ff90 Update buffer for SendNameAndColor 2020-01-14 21:40:58 -08:00
James R 619efb3d4e And free addrinfo 
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
 2020-01-14 19:33:52 -08:00
James R af2d3cfd16 Let MS_Connect use -bindaddr 
And so now you really can host from multiple IP addresses.

(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
 2020-01-14 19:33:52 -08:00
James R 68b78f44d8 Load flats first so textures with the same name are prefered on walls 2020-01-13 15:21:35 -08:00
James R 0d6b6efe0f Refactor R_LoadTextures into something manageable (no goto!!) 2020-01-13 15:20:50 -08:00
James R 223edd8ee0 Merge branch 'disable-titlemap-in-netgames' into 'master' 
Disable title map when entering a netgame

See merge request STJr/SRB2!683
 2020-01-13 16:47:17 -05:00
James R 339ceafdf0 Remove adminplayer from SERVERINFO (PACKETVERSION 2) 2020-01-12 20:21:35 -08:00
James R 84ac743d73 Kill Lua adminplayer 2020-01-12 20:04:05 -08:00
James R bff6875b95 Merge branch 'fangpogo' into 'next' 
Make Fangboss' player pogo a little less bullshit.

See merge request STJr/SRB2!676
 2020-01-12 17:54:02 -05:00
James R 2b95ea0135 Merge remote-tracking branch 'origin/master' into next 2020-01-12 14:17:52 -08:00
James R 2bb8b85754 Merge branch 'split-emblem-hints' into 'next' 
"Symmetrical"-ish Emblem Hint pages

See merge request STJr/SRB2!670
 2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony 66c9e8e3aa Fix "symmetrical"-ish emblem hints for ERRORMODE 
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
 2020-01-12 23:09:27 +01:00
LJ Sonic 6eba68bc3b Merge branch 'fix-node-player-mixups' into 'master' 
Fix node player mixups

See merge request STJr/SRB2!684
 2020-01-12 15:57:20 -05:00
James R 70bd7132c5 Merge branch 'egg2pogo' into 'next' 
Egg Slimer Pogo Bruh Moment (resolves #112)

See merge request STJr/SRB2!674
 2020-01-12 15:43:24 -05:00
James R 34b42507d1 Merge branch 'targetproblem' into 'next' 
Homing Targetting Issues

See merge request STJr/SRB2!671
 2020-01-12 15:43:08 -05:00
LJ Sonic 34f73ec083 Merge branch 'fix-node-player-mixups' into 'master' 
Fix node numbers being used in place of player numbers

See merge request STJr/SRB2!681
 2020-01-12 15:40:25 -05:00
James R 50d1226224 Merge branch 'you-cant-escape-console' into 'master' 
Open the console in menus and draw backpic correctly

See merge request STJr/SRB2!665
 2020-01-12 15:38:51 -05:00
James R 5d6d6a7d4d Merge branch 'escape-console' into 'master' 
Let Escape close the console

See merge request STJr/SRB2!664
 2020-01-12 15:38:35 -05:00
Louis-Antoine f6244ec9a4 Disable title map when entering a netgame 2020-01-12 20:08:41 +01:00
Louis-Antoine e9108de365 Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
Louis-Antoine 5b34923352 Fix node numbers being used in place of player numbers 2020-01-12 18:34:08 +01:00
fickleheart 8a6173a3f2 Declare checkbase for both sides of the if statement 2020-01-12 09:11:57 -06:00
fickleheart 9e101fc2bb Limit shadow Y scale to prevent graphical bugs 2020-01-12 09:10:09 -06:00
fickleheart e60ba92a92 Checkpoint players at star post exact location with Ambush flag 2020-01-11 22:30:07 -06:00
fickleheart 1e2a4c2cce Allow starpost Parameter to dictate order 2020-01-11 22:26:20 -06:00