lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9698 commits 1 branch 29 tags 122 MiB
Commit graph

9698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn ef53672deb Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
MascaraSnake cedfc02f19 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01: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
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
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
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
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
Louis-Antoine 3b22a84296 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 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