stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-06 01:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
9419 commits 173 branches 41 tags 356 MiB
Commit graph

9419 commits

This branch
This branch
All branches
Author SHA1 Message Date
fickleheart
e57589b106 Fix the minecart angle thing 2020-01-25 19:03:15 -06:00
Jaime Passos
8bcdd105ce I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos
647107a220 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos
c219a170da Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos
b9b1958886 make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos
8401e09787 remove includes 2020-01-25 21:21:44 -03: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
Steel Titanium
2731c9e92d Add newlines to GL debug print. 2020-01-24 15:44:57 -05:00
Jaime Passos
bdc1594b07 Redundant define? 2020-01-24 17:05:40 -03:00
Jaime Passos
075ae996fa GL_DBG_Printf instead of CONS_Alert 2020-01-24 17:04:38 -03:00
Jaime Passos
1c7b584dee I_Error is too extreme I think, just CONS_Alert instead 2020-01-24 17:03:00 -03:00
Jaime Passos
7c4c04ca6a Fix custom shader loading 2020-01-24 16:57:21 -03:00
Jaime Passos
b18c0cfcab Un-HWRENDER shader lump names 2020-01-24 16:42:55 -03: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
Jaime Passos
0246026ade I don't know why this happened 2020-01-24 00:35:51 -03:00
James R
b1d931d471 Well I'm an idiot 2020-01-23 18:55:25 -08:00
Jaime Passos
686d8e418e st_translucency went missing in here for... reasons... 2020-01-23 23:52:11 -03:00
Jaime Passos
afa9b58cee fix corona compiling lol 2020-01-23 23:41:09 -03:00
Jaime Passos
922ac73594 Menu organisation 2020-01-23 23:15:27 -03: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
Jaime Passos
a521e40c0e bye 2020-01-23 23:09:53 -03: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
Jaime Passos
d019080327 I LOVE MENU CODE! 2020-01-23 22:38:54 -03:00
Jaime Passos
11c3721db4 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Jaime Passos
d24060bb94 Wait. 2020-01-23 22:24:35 -03:00
James R
968fea0383 Fix implicit operand because GLSL is a goof or such 2020-01-23 17:22:02 -08:00
Jaime Passos
770135451f Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos
1755c240bf Fix the gl_leveltime problem, I guess. 
This is probably superfluous.
 2020-01-23 21:25:54 -03:00