toaster
2dd13bb2a4
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
MascaraSnake
3775e6447e
Skyboxes: Remove obsolete modulo operation
2020-01-25 15:37:23 +01: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
MascaraSnake
d947558576
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +01:00
MascaraSnake
5656d77c82
Use tag instead of angle for polyobject spawn points and anchors
2020-01-25 10:15:20 +01:00
MascaraSnake
37375972e2
Use tag field to setup vertex slopes
2020-01-25 10:01:01 +01:00
MascaraSnake
261f049f6c
Add mapthing tag field (not used yet)
2020-01-25 09:52:13 +01:00
MascaraSnake
d22be10050
Merge branch 'argstr-to-stringarg' into 'udmf-next'
...
Rename some UDMF fields whose names have different meanings in other UDMF implementations
See merge request STJr/SRB2!726
2020-01-25 03:30:38 -05: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
MascaraSnake
60cde39042
Rename some UDMF fields whose names have different meanings in other UDMF implementations
2020-01-24 23:02:42 +01: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
97c58957ee
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01: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
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
