Commit graph

10886 commits

Author SHA1 Message Date
Jaime Passos
da45526b63 DoScreenWipe is void 2020-01-28 00:17:07 -03:00
Jaime Passos
85f016e4d8 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
e1ee02c308 Fix color LUT using the wrong palette 2020-01-27 13:55:13 -03:00
Jaime Passos
5da3b2a0e7 Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
MascaraSnake
2ad05d1d57 Merge branch 'thingtag' into 'udmf-next'
Implement thing tags

See merge request STJr/SRB2!730
2020-01-27 02:34:24 -05:00
Jaime Passos
6f60fd2a64 Fix shader reading yet again 2020-01-27 02:15:34 -03:00
Jaime Passos
444d50c5f8 Fix -OGLlib 2020-01-27 01:57:55 -03:00
Jaime Passos
ada3f58d25 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Jaime Passos
cfafdf7bed Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Jaime Passos
447ee1a04c Remove redundancy 2020-01-26 23:46:07 -03:00
Jaime Passos
aa6eecb0ec "changes" not "changed" 2020-01-26 23:41:34 -03:00
Jaime Passos
9e84b10af4 Fix going big 2020-01-26 23:39:31 -03:00
Jaime Passos
cc5d8a3bf8 Fix movement to accomodate to window scale changes 2020-01-26 23:34:04 -03:00
Jaime Passos
34e5b13acf Don't stop the automap (just restart it instead.) 2020-01-26 23:12:28 -03:00
Jaime Passos
a1fbf69fdb Doesn't matter. 2020-01-26 22:57:14 -03:00
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
MascaraSnake
e22661e150 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01: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
lachwright
433a2f4cf3 Don't spawn glide dust for SF_NOSKID characters 2020-01-26 04:33:41 +08:00
lachwright
8b7f90d645 Fix P_SpawnSkidDust description 2020-01-26 03:44:10 +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