fickleheart
bea7ad2185
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06: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
Jaime Passos
aea720ef65
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-01-25 22:22:20 -03:00
Jaime Passos
9e79b337b1
Fix NOTEXTURE_NUM
2020-01-25 22:20:27 -03:00
Jaime Passos
e576c1ada1
make up for the lack of ogllog.txt
2020-01-25 22:17:39 -03:00
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
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
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
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
Louis-Antoine
2d142f734f
Remove all potentially dangerous functions
...
Basically any function that calls fopen() is gone,
except the ones created by me.
And no access to stdin/stdout/stderr
through io.read()/io.write().
Not really harmful but why would you want that in SRB2.
2020-01-25 01:37:50 +01: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
Louis-Antoine
16c7981bb8
Fix the compiler warning fix
2020-01-24 23:34:39 +01:00
Louis-Antoine
51947319ee
Fix two compiler warnings
2020-01-24 23:24:54 +01: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
Louis-Antoine
9658ef2c5b
Add .dat and .csv to whitelisted file extensions
2020-01-24 17:51:20 +01:00
Louis-Antoine
e0f0984fcc
Rename "luafiles/shared/" to "luafiles/client/"
2020-01-24 17:11:00 +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
Tatsuru
295f052f2d
I don't know how these even come up
2020-01-24 01:03:38 -03:00
