fickleheart
124077f1d9
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
James R
3c5a4462c4
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
7346932122
Don't cancel Knuckles' landing animation on rising surfaces
2020-01-26 04:51:00 +08:00
lachwright
56c5132c79
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
toaster
6d3f0c6a90
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
46d217b731
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
MascaraSnake
485f505142
Skyboxes: Remove obsolete modulo operation
2020-01-25 15:37:23 +01:00
Nev3r
242b5b0168
Merge branch 'credits-again' into 'next'
...
Credit Tatsuru
See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
LJ Sonic
f49c14300c
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
e04596d611
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
MascaraSnake
08386ead09
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +01:00
MascaraSnake
0080844c5b
Use tag instead of angle for polyobject spawn points and anchors
2020-01-25 10:15:20 +01:00
MascaraSnake
0cb61af3d2
Use tag field to setup vertex slopes
2020-01-25 10:01:01 +01:00
MascaraSnake
436d375dc0
Add mapthing tag field (not used yet)
2020-01-25 09:52:13 +01:00
MascaraSnake
aaa1723ca9
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
7bcb2ec0f6
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
0cba39d7a4
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
87a278ad02
Signed is unsigned, cool
2020-01-24 16:44:53 -08:00
James R
cc5fa4c685
Credit Tatsuru, he's done a bit
2020-01-24 16:38:46 -08:00
Louis-Antoine
ce7aa23155
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
0beae26e9d
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
ad00bc7000
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
ad1d8f96f3
Fix the compiler warning fix
2020-01-24 23:34:39 +01:00
Louis-Antoine
4cf1e19030
Fix two compiler warnings
2020-01-24 23:24:54 +01:00
LJ Sonic
09fc88f03a
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
13c00969dc
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
260de0fca4
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
e47a0313d7
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
bf24c18ba2
Rename some UDMF fields whose names have different meanings in other UDMF implementations
2020-01-24 23:02:42 +01:00
SteelT
03be093a38
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
a0d8b7ec24
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
588a76efe4
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
MascaraSnake
383eccd630
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
Louis-Antoine
ba0a02d2b3
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
8e92f3829c
Add .dat and .csv to whitelisted file extensions
2020-01-24 17:51:20 +01:00
Louis-Antoine
1b6d056b91
Rename "luafiles/shared/" to "luafiles/client/"
2020-01-24 17:11:00 +01:00
James R
596ff92e69
Name the archive like the EXE
2020-01-23 21:06:48 -08:00
James R
f3ffc2f82b
Windows is dumb so no colon
...
srb2win-jameds-appveyor-exename-0a41f77a2.exe
2020-01-23 20:35:53 -08:00
James R
98297f3de2
Check if this actually is a PR before using those variables
2020-01-23 20:34:26 -08:00
James R
56abe74c18
I promise I know what I'm doing
2020-01-23 20:13:57 -08:00
Tatsuru
96a33f315c
I don't know how these even come up
2020-01-24 01:03:38 -03:00
James R
745f4b6492
Use the pull request repo, branch and commit
...
srb2win-jameds:appveyor-exename-0a41f77a2.exe
2020-01-23 19:58:26 -08:00
James R
0a41f77a22
Well I'm an idiot
2020-01-23 18:55:25 -08:00
James R
a5d62ef3bb
Put the abbreviated commit hash in the EXENAME for AppVeyor
...
srb2win-master-003f3769d.exe
2020-01-23 18:10:31 -08:00
James R
12da266baa
Put branch name and commit hash in EXENAME for AppVeyor builds
...
srb2win-master-003f3769dfc531eae0071c07e45803c17fd53460.exe
2020-01-23 18:01:59 -08:00
Louis-Antoine
7f48cc9ed5
Split open() into open() and openlocal()
...
open() for normal, consistency-friendly reading,
openlocal() for writing and local reading.
2020-01-24 02:47:51 +01:00
James R
128f0757b6
Semantics
2020-01-23 13:57:39 -08:00
Louis-Antoine
a04004071b
Do not spam player quit net commands
2020-01-23 19:59:41 +01:00
Louis-Antoine
bb157866b7
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
f98be013ea
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00