Jaime Passos
89a58888b8
Optimise pixel drawing
2020-01-26 22:52:15 -03:00
Jaime Passos
3986c28725
Move line drawer setting to AM_Drawer
2020-01-26 22:46:57 -03:00
fickleheart
62c75c0c81
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
Monster Iestyn
eca4bc63da
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
Zwip-Zwap Zapony
ff57802823
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
8dab4eb789
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-01-25 22:22:20 -03:00
Jaime Passos
c80d7a2430
Fix NOTEXTURE_NUM
2020-01-25 22:20:27 -03:00
Jaime Passos
6df32ce34d
make up for the lack of ogllog.txt
2020-01-25 22:17:39 -03:00
fickleheart
124077f1d9
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
Jaime Passos
ec5da2966b
I'll put this back in here, I guess.
2020-01-25 21:57:05 -03:00
Jaime Passos
f6b9b14c21
Same deal for screen textures
2020-01-25 21:46:52 -03:00
Jaime Passos
3efd1f3f6d
Stop using NextTexAvail you dunce
2020-01-25 21:37:33 -03:00
Jaime Passos
5228b0b9fe
make NOTEXTURE_NUM 1
2020-01-25 21:22:24 -03:00
Jaime Passos
8345d7b99c
remove includes
2020-01-25 21:21:44 -03: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
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
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
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
383eccd630
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
Steel Titanium
788c8deddb
Add newlines to GL debug print.
2020-01-24 15:44:57 -05:00
Jaime Passos
36fcd35108
Redundant define?
2020-01-24 17:05:40 -03:00
Jaime Passos
e8b942a3b8
GL_DBG_Printf instead of CONS_Alert
2020-01-24 17:04:38 -03:00
Jaime Passos
5a0119ee59
I_Error is too extreme I think, just CONS_Alert instead
2020-01-24 17:03:00 -03:00
Jaime Passos
3d97a0b73d
Fix custom shader loading
2020-01-24 16:57:21 -03:00
Jaime Passos
b8862e7475
Un-HWRENDER shader lump names
2020-01-24 16:42:55 -03: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
