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
Steel Titanium 4281de3b89 Update file hashes 2020-02-09 21:29:46 -05:00
Steel Titanium 13e5911de7 Merge branch 'next' into 2.2.1-prep 2020-02-09 20:30:48 -05:00
Monster Iestyn e5a325994e Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c 
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
 2020-02-09 19:15:04 +00:00
Jaime Passos d0d7fd1589 Don't add a TOL_ twice. 2020-02-09 16:11:52 -03:00
Alam Ed Arias 1d2f6c9581 Merge branch 'master' into next 2020-02-09 10:37:10 -05:00
Alam Ed Arias 15c263e9c7 Z_Zone: fixup Valgrind support 2020-02-09 10:35:23 -05:00
Jaime Passos 2162cbd794 Merge branch 'customgametypeswtf' into 'next' 
Fix broken GT_ constants with custom gametypes

See merge request STJr/SRB2!769
 2020-02-08 23:17:35 -05:00
Jaime Passos 2d0e72d756 Fix broken GT_ constants with custom gametypes 2020-02-08 21:40:30 -03:00
Jaime Passos 598daac093 allow models for skin/sprites with same name 2020-02-08 20:44:43 -03:00
Jaime Passos 5e516eb98d 1 left shifted by zero is still 1 2020-02-08 18:50:05 -03:00
lachwright 7a5d7afb30 Add Rob as the game's producer 2020-02-06 23:06:15 +08:00
Steel Titanium d03d09f397 Update credits again 2020-02-05 15:20:35 -05:00
Monster Iestyn f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION. 
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
 2020-02-05 19:55:40 +00:00
James R 7805828c4a Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
colette 01433c3648 Fix title/card hud hooks grabbing the wrong functions 2020-02-03 23:09:18 -05:00
James R 700d9426d4 Merge branch 'name-stuck' into 'master' 
Fix game hanging on server creation/splitscreen if your name is whack

See merge request STJr/SRB2!752
 2020-02-03 03:49:13 -05:00
Jaime Passos d1e8744583 What 2020-02-03 02:24:22 -03:00
Jaime Passos af66a2e5fa Restore some functionality that went missing 2020-02-03 02:12:55 -03:00
Jaime Passos 520e2148fe Merge remote-tracking branch 'origin/master' into local-color-table 2020-02-03 01:52:43 -03:00
James R bd90c20366 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-02 18:00:02 -08:00
Steel Titanium 1794949696
Add empty entry 2020-02-02 18:52:41 -05:00
James R 57492347ed Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
James R 5a524f21da Merge branch 'starpost-config-additions' into 'next' 
Starpost config additions

See merge request STJr/SRB2!680
 2020-02-01 21:42:43 -05:00
James R ce3a79e51a Merge branch 'bruh2' into 'master' 
Fix fuckup 2

See merge request STJr/SRB2!744
 2020-02-01 21:42:21 -05:00
James R ec995d620f Merge branch 'rotsprite-memory-leak' into 'next' 
Fix memory leak when caching rotsprite

See merge request STJr/SRB2!745
 2020-02-01 21:42:12 -05:00
James R c069cf94bc Merge branch 'tnt-is-laggy' into 'next' 
Make flying TNTs' explosions not so laggy the first time

See merge request STJr/SRB2!746
 2020-02-01 21:41:59 -05:00
James R 52c1e73035 Merge branch 'platform-fixes' into 'next' 
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
 2020-02-01 21:41:49 -05:00
James R 5c8406f6d7 Merge branch 'protect-wrists' into 'next' 
Remove flight cutoff property

See merge request STJr/SRB2!748
 2020-02-01 21:41:33 -05:00
James R c46d9a1b87 Merge branch 'file-param-error' into 'master' 
Don't I_Error if non base files fail to load with -file

See merge request STJr/SRB2!678
 2020-02-01 21:41:22 -05:00
James R d5ced42f06 Remove Player 0 2020-02-01 18:22:03 -08:00
James R bf3b7fc5b0 Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R ab8eed6efb Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
Louis-Antoine 7dd0f2b808 Fix splitscreen player being unable to move 2020-02-01 20:19:39 +01:00
Jaime Passos 77f373c903 Merge branch 'am-line' into 'master' 
Automap fixes

See merge request STJr/SRB2!735
 2020-02-01 03:22:53 -05:00
Jaime Passos decc381698 Merge branch 'colorlutfix' into 'master' 
Fix color LUT using the wrong palette

See merge request STJr/SRB2!739
 2020-02-01 03:22:26 -05:00
lachwright f5e49ace00 Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior 2020-02-01 14:49:48 +08:00
lachwright ec02a90ebc Make flight controls less bullshit 2020-02-01 14:29:49 +08:00
lachwright d67388ece0 Merge branch 'next' into platform-fixes 2020-02-01 13:34:04 +08:00
Steel Titanium a2c15c5cb2
Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print 2020-01-31 20:21:09 -05:00
James R a46b397659 Remove code that does effectively nothing 2020-01-31 14:35:19 -08:00
James R 71707e6dca Reset rollangle on TNT explosion 
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
 2020-01-31 14:32:47 -08:00
Steel Titanium 7c83e5e420
Implement folder blacklisting 2020-01-31 16:37:55 -05:00
James R 3afc766f5e Oops 2020-01-30 23:58:35 -08:00
James R 4238003887 Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R aad4b6f8a1 Merge branch 'i-can-see-myself' into 'master' 
Don't draw yourself in first person!

See merge request STJr/SRB2!697
 2020-01-31 02:34:11 -05:00
James R 6528b4a0f8 Merge branch 'opengl-skipintro-sigabrt' into 'master' 
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
 2020-01-31 02:34:08 -05:00
James R d7fcd3384a Merge branch 'cybrak_flamedmg' into 'next' 
Fix damagetype for Cybrak flamethrower.

See merge request STJr/SRB2!731
 2020-01-31 02:34:05 -05:00
James R d1e954ec9c Merge branch 'angle-clamp' into 'master' 
Fix the minecart angle thing in netgames

Closes #69

See merge request STJr/SRB2!732
 2020-01-31 02:33:59 -05:00
James R 56839f428d Merge branch 'ttfixes2' into 'next' 
Fix title card not showing up at all if focus lost

See merge request STJr/SRB2!736
 2020-01-31 02:33:57 -05:00
James R 8297dbd373 Merge branch 'ntsatkbgfix' into 'master' 
Fix M_DrawNightsAttackMountains integer overflow

See merge request STJr/SRB2!737
 2020-01-31 02:33:53 -05:00
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