Jaime Passos
68f4d415fe
Merge remote-tracking branch 'origin/next' into sal-oglshaderport
2020-02-01 23:02:15 -03:00
Jaime Passos
828961264e
Update w_wad.c
2020-02-01 22:50:52 -03:00
Jaime Passos
59cc097d94
Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
2020-02-01 22:26:40 -03:00
Jaime Passos
65da251a2f
Fix ACZ fence texture
2020-02-01 22:25:48 -03:00
LJ Sonic
bd6438dda1
Merge branch 'fix-splitscreen' into 'next'
...
Fix splitscreen player being unable to move
See merge request STJr/SRB2!749
2020-02-01 16:18:40 -05:00
Louis-Antoine
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
GoldenTails
fe17933156
Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString()
2020-02-01 11:01:39 -06:00
GoldenTails
7d9f138160
Make V_DrawRightAlignedSmallThinString() a less precise wrapper for V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-right" option in v.drawString()
2020-02-01 11:01:22 -06:00
GoldenTails
b2b4c4c79e
Create V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-fixed-center" option in v.drawString()
...
Thankfully "center" is just "right" but with the X offset divided by 2.
2020-02-01 11:01:03 -06:00
GoldenTails
4cbcb68795
Create V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-fixed-right" option in v.drawString()
...
You guys have no idea how long this took to code.
2020-02-01 11:00:45 -06:00
GoldenTails
c858d9fd4d
Make V_DrawSmallThinString() a less precise wrapper for V_DrawSmallThinStringAtFixed() to fix rounding errors.
2020-02-01 11:00:24 -06:00
GoldenTails
75d94c6c1a
Create V_DrawSmallThinStringAtFixed() for new "small-thin-fixed" option in v.drawString()
...
I removed the limitation present in "small-thin" by converting all relevant variables to fixed_t's and using FixedMul() and FixedDiv() when necessary. Who'da thunk it would actually work?
2020-02-01 11:00:02 -06:00
GoldenTails
a216736ef4
Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString()
2020-02-01 10:59:38 -06:00
GoldenTails
5f56d19a43
Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString()
2020-02-01 10:59:21 -06:00
GoldenTails
f7085fc171
Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString()
2020-02-01 10:58:55 -06:00
GoldenTails
f1655d32f5
Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning.
2020-02-01 10:58:19 -06:00
GoldenTails
cb5c90fc40
Create V_DrawRightAlignedThinStringAtFixed() for new "thin-fixed-right" option in v.drawString()
...
These function names are starting to become rediculous...
2020-02-01 10:55:54 -06:00
GoldenTails
d147a50e9b
remove large commented broken version of V_DrawSmallThinString() lol
2020-02-01 10:54:10 -06:00
GoldenTails
6527b5d16b
Create V_DrawSmallThinString() for new "small-thin" option in v.drawString()
...
Note this has some major limitations to prevent squished text. It defaults to using V_MONOSPACE|V_OLDSPACING and you cannot change the size of characters. V_6WIDTHSPACE seems to act exactly the same as V_OLDSPACING too.
2020-02-01 10:53:06 -06:00
GoldenTails
9f50b6ef73
Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString()
2020-02-01 10:51:43 -06:00
GoldenTails
b0e66874d3
Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed()
2020-02-01 10:51:31 -06:00
GoldenTails
dc1871a74f
Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString()
2020-02-01 10:50:57 -06:00
GoldenTails
426ccc9203
Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString()
2020-02-01 10:50:50 -06:00
GoldenTails
df15ad82d2
Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString()
2020-02-01 10:50:46 -06:00
GoldenTails
37cef69c95
Add V_COLORMAP support for small-fixed and thin-fixed text.
2020-02-01 10:46:26 -06:00
GoldenTails
63721b99cf
Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString()
2020-02-01 10:43:04 -06:00
GoldenTails
93b64a8d7d
Create V_DrawThinStringAtFixed() for new "thin-fixed" option in v.drawString()
2020-02-01 10:42:15 -06:00
lachwright
af7366058d
Merge branch 'next' into knuxtweaks
2020-02-01 18:00:55 +08:00
lachwright
d2bfc673a9
Distance orbital camera appropriately when gr_shearing is enabled
2020-02-01 17:01:27 +08:00
Jaime Passos
77f373c903
Merge branch 'am-line' into 'master'
...
Automap fixes
See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
Jaime Passos
decc381698
Merge branch 'colorlutfix' into 'master'
...
Fix color LUT using the wrong palette
See merge request STJr/SRB2!739
2020-02-01 03:22:26 -05:00
lachwright
f5e49ace00
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
lachwright
ec02a90ebc
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
lachwright
d67388ece0
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
Steel Titanium
a2c15c5cb2
Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print
2020-01-31 20:21:09 -05:00
James R
a46b397659
Remove code that does effectively nothing
2020-01-31 14:35:19 -08:00
James R
71707e6dca
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
Steel Titanium
7c83e5e420
Implement folder blacklisting
2020-01-31 16:37:55 -05:00
James R
3afc766f5e
Oops
2020-01-30 23:58:35 -08:00
James R
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
James R
aad4b6f8a1
Merge branch 'i-can-see-myself' into 'master'
...
Don't draw yourself in first person!
See merge request STJr/SRB2!697
2020-01-31 02:34:11 -05:00
James R
6528b4a0f8
Merge branch 'opengl-skipintro-sigabrt' into 'master'
...
Fix crash when using -skipintro and the renderer is set to OpenGL from config
See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
James R
d7fcd3384a
Merge branch 'cybrak_flamedmg' into 'next'
...
Fix damagetype for Cybrak flamethrower.
See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00
James R
d1e954ec9c
Merge branch 'angle-clamp' into 'master'
...
Fix the minecart angle thing in netgames
Closes #69
See merge request STJr/SRB2!732
2020-01-31 02:33:59 -05:00
James R
56839f428d
Merge branch 'ttfixes2' into 'next'
...
Fix title card not showing up at all if focus lost
See merge request STJr/SRB2!736
2020-01-31 02:33:57 -05:00
James R
8297dbd373
Merge branch 'ntsatkbgfix' into 'master'
...
Fix M_DrawNightsAttackMountains integer overflow
See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
James R
4e9fb2de7d
Merge branch 'startcontinue' into 'master'
...
Fix F_StartContinue fading out incorrectly in OpenGL
See merge request STJr/SRB2!738
2020-01-31 02:33:51 -05:00
James R
8815b9f326
Merge branch 'chat-memory-leak-fix' into 'master'
...
Fix memory leak while chat is on screen
See merge request STJr/SRB2!743
2020-01-31 02:33:48 -05:00
Steel Titanium
f4de193809
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -05:00
lachwright
2e48539251
Merge branch 'next' into platform-fixes
2020-01-30 21:39:01 +08:00