stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
9339 commits 171 branches 41 tags 312 MiB
Commit graph

9339 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
af4e4cb0a8 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-01 16:29:55 -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
James R
8815b9f326 Merge branch 'chat-memory-leak-fix' into 'master' 
Fix memory leak while chat is on screen

See merge request STJr/SRB2!743
 2020-01-31 02:33:48 -05:00
Steel Titanium
f4de193809 Fix memory leak while chat is on screen 2020-01-30 22:11:50 -05: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
LJ Sonic
48cb5a326d Merge branch 'fix-keep-body-tag' into 'next' 
Only call P_CheckSurvivors() in tag gametypes

See merge request STJr/SRB2!740
 2020-01-28 08:45:09 -05:00
Louis-Antoine
31ce076411 Only call P_CheckSurvivors() in tag gametypes 2020-01-28 14:02:36 +01: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
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
James R
9d9c685dad Merge branch 'appveyor-exename' into 'master' 
Put the (pull request repo owner) branch and commit in Appveyor EXE names

See merge request STJr/SRB2!725
 2020-01-25 19:10:12 -05: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
LJ Sonic
2686ce8ad0 Merge branch 'fix-fire-shield' into 'next' 
Fix fire shield being removed under lava

See merge request STJr/SRB2!729
 2020-01-25 08:08:59 -05:00
Louis-Antoine
d30b48cfd1 Fix lava removing fire shield 2020-01-25 14:04:16 +01: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
4304fe91e6 Name the archive like the EXE 2020-01-23 21:06:48 -08:00
James R
70cf119a84 Windows is dumb so no colon 
srb2win-jameds-appveyor-exename-b1d931d47.exe
 2020-01-23 20:35:53 -08:00
James R
e082553f6d Check if this actually is a PR before using those variables 2020-01-23 20:34:26 -08:00
James R
6337932190 I promise I know what I'm doing 2020-01-23 20:13:57 -08:00
James R
ef2febe1e0 Use the pull request repo, branch and commit 
srb2win-jameds:appveyor-exename-b1d931d47.exe
 2020-01-23 19:58:26 -08:00
James R
b1d931d471 Well I'm an idiot 2020-01-23 18:55:25 -08:00
James R
d3315ae03c Put the abbreviated commit hash in the EXENAME for AppVeyor 
srb2win-master-a6d49eaaa.exe
 2020-01-23 18:10:31 -08:00
James R
c3f4285988 Put branch name and commit hash in EXENAME for AppVeyor builds 
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe
 2020-01-23 18:01:59 -08: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