c46d9a1b87
Merge branch 'file-param-error' into 'master'
...
Don't I_Error if non base files fail to load with -file
See merge request STJr/SRB2!678
2020-02-01 21:41:22 -05:00
d5ced42f06
Remove Player 0
2020-02-01 18:22:03 -08:00
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
ab8eed6efb
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
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
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
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
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
c858d9fd4d
Make V_DrawSmallThinString() a less precise wrapper for V_DrawSmallThinStringAtFixed() to fix rounding errors.
2020-02-01 11:00:24 -06:00
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
a216736ef4
Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString()
2020-02-01 10:59:38 -06:00
5f56d19a43
Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString()
2020-02-01 10:59:21 -06:00
f7085fc171
Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString()
2020-02-01 10:58:55 -06:00
f1655d32f5
Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning.
2020-02-01 10:58:19 -06:00
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
d147a50e9b
remove large commented broken version of V_DrawSmallThinString() lol
2020-02-01 10:54:10 -06:00
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
9f50b6ef73
Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString()
2020-02-01 10:51:43 -06:00
b0e66874d3
Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed()
2020-02-01 10:51:31 -06:00
dc1871a74f
Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString()
2020-02-01 10:50:57 -06:00
426ccc9203
Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString()
2020-02-01 10:50:50 -06:00
df15ad82d2
Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString()
2020-02-01 10:50:46 -06:00
37cef69c95
Add V_COLORMAP support for small-fixed and thin-fixed text.
2020-02-01 10:46:26 -06:00
63721b99cf
Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString()
2020-02-01 10:43:04 -06:00
93b64a8d7d
Create V_DrawThinStringAtFixed() for new "thin-fixed" option in v.drawString()
2020-02-01 10:42:15 -06:00
77f373c903
Merge branch 'am-line' into 'master'
...
Automap fixes
See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
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
f5e49ace00
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
ec02a90ebc
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
d67388ece0
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
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
a46b397659
Remove code that does effectively nothing
2020-01-31 14:35:19 -08:00
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
7c83e5e420
Implement folder blacklisting
2020-01-31 16:37:55 -05:00
3afc766f5e
Oops
2020-01-30 23:58:35 -08:00
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
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
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
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
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
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
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
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
f4de193809
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -05:00
2e48539251
Merge branch 'next' into platform-fixes
2020-01-30 21:39:01 +08:00
85211dcc09
Only write a Local Color Table if the frame's palette differs from the header's palette
2020-01-29 17:31:27 -03:00
999e72ab32
Uh
2020-01-29 13:56:39 -03:00
99c755c186
Update the Screenshot Options menu
2020-01-29 13:52:02 -03:00
5a330803ec
Local Color Table for GIF movie mode
2020-01-29 13:47:55 -03:00
3a6c7e9577
Merge branch 'dehacked-hud-fix' into 'next'
...
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items
See merge request STJr/SRB2!733
2020-01-28 20:25:07 -05:00
31ce076411
Only call P_CheckSurvivors() in tag gametypes
2020-01-28 14:02:36 +01:00
636093a59d
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -03:00
28fd2380df
Fix F_StartContinue fading out incorrectly in OpenGL
2020-01-27 13:28:07 -03:00
1548a22ea9
Fix M_DrawNightsAttackMountains being broken for obvious reasons
2020-01-27 00:44:10 -03:00
1774ba22b6
Fix title card not showing up at all if focus lost
2020-01-26 23:50:36 -03:00
cf7b4d826a
Remove redundancy
2020-01-26 23:46:07 -03:00
7f57327ff7
"changes" not "changed"
2020-01-26 23:41:34 -03:00
46cbe63b43
Fix going big
2020-01-26 23:39:31 -03:00
2cfeaa63d2
Fix movement to accomodate to window scale changes
2020-01-26 23:34:04 -03:00
8f3855d09f
Don't stop the automap (just restart it instead.)
2020-01-26 23:12:28 -03:00
dd8166ca5f
Doesn't matter.
2020-01-26 22:57:14 -03:00
ba6018aea4
Optimise pixel drawing
2020-01-26 22:52:15 -03:00
d08929b3d7
Move line drawer setting to AM_Drawer
2020-01-26 22:46:57 -03:00
bea7ad2185
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
ef53672deb
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
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
e57589b106
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
65e84978fa
Don't cancel Knuckles' landing animation on rising surfaces
2020-01-26 04:51:00 +08:00
cddc4e1500
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
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
2dd13bb2a4
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
842099b74d
Merge branch 'credits-again' into 'next'
...
Credit Tatsuru
See merge request STJr/SRB2!728
2020-01-25 08:54:41 -05:00
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
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
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
c9bc3837f9
Signed is unsigned, cool
2020-01-24 16:44:53 -08:00
59ed381fc0
Credit Tatsuru, he's done a bit
2020-01-24 16:38:46 -08:00
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
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
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
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
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
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
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
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
7ac1b9298f
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
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
3d9466e5f5
Semantics
2020-01-23 13:57:39 -08:00
ba127008cf
Do not spam player quit net commands
2020-01-23 19:59:41 +01:00
b0b22b53d6
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
ce20642fa7
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00
f0daea39d4
Don't set controls to keys out of array bounds
...
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
875774a45f
no message
2020-01-22 22:08:08 +01:00
c72e0efee4
"page x of y"
2020-01-22 21:57:28 +01:00
912734ffe6
Extra emblems display, take 2.
2020-01-22 21:52:15 +01:00
aa05581de2
Added support for 10+ emblem hints
2020-01-22 18:53:17 +01:00
fb28ede660
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
...
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
cfec8609f9
Fix missing declaration
2020-01-22 04:01:06 +01:00
f209721ded
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
412ba38a81
Refactor player spawning code a little
2020-01-22 03:19:15 +01:00
d03c928baa
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
73d0549fa4
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 03:11:05 +01:00
d374bf4f9b
Let clients rejoin the server without losing their status
...
This is accomplished by simply preserving
the player's body after disconnecting.
Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.
Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.
From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.
Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
2373a0aa83
Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH
2020-01-21 16:47:47 -08:00
d90c0b8fbd
Don't check "Too many flats in level" with P_AddLevelFlatRuntime
...
Also moved the debug down in case anyone uses that.
2020-01-21 15:35:07 -08:00
9cd101c68d
Revert "Fix Ploadflat closing the game with "Too many flats in level" error message"
...
This reverts commit ea129f701c
2020-01-21 15:35:07 -08:00
f297f4ff56
Sonic is dead again
2020-01-21 12:24:24 -08:00
c347254e80
Reorder Sonic's ass so the OpenGL wipe doesn't see garbage
2020-01-21 12:23:34 -08:00
dfcd058c80
(BRUH MOMENT) activettscale was -1, so do recache after it's set
2020-01-21 12:21:18 -08:00
49a4c7d5f3
Separate "turnmultiplier"s for splitscreen players
...
This fixes player 2 using player 1's "cam_turnmultiplier"
instead of player 2's "cam2_turnmultiplier"
2020-01-21 14:53:05 +01:00
5b08e1802d
Trim the trailing zeros off floats for cvars
2020-01-20 23:14:26 -08:00
2d8ea7125c
Remove unnecessary optimization
2020-01-20 15:36:27 -08:00
0d460aed1d
Merge branch 'gl-dropshadows' into 'next'
...
OpenGL drop shadows
See merge request STJr/SRB2!703
2020-01-20 16:52:40 -05:00
c1097813f4
Fix "cam2_turnmultiplier"
...
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
2020-01-20 16:14:20 +01:00
431206ebee
Die
2020-01-20 10:04:44 -03:00
fed000b724
Remove Tails pick-up lock
2020-01-19 23:18:49 -03:00
697dbd58e7
Turn cv_exitmove on by default
2020-01-19 21:56:53 -03:00
db22d503a4
HUD visual indicator + property fix
2020-01-19 21:55:08 -03:00
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
e9a8c2d21a
No more losing lives when finished
2020-01-19 14:30:05 -03:00
ad505a6fe7
Fix title screen broken when leaving during resynch
2020-01-19 17:55:22 +03:00
a7770c3e97
Merge branch 'add-exitmove-to-menu' into 'next'
...
Put cv_exitmove in the server options menu
See merge request STJr/SRB2!704
2020-01-19 02:18:49 -05:00
9dbc54284e
Opt into new MUSICDEF format (2.2.0 compatibility)
...
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
2020-01-18 23:12:30 -08:00
1317dba3e4
Refactor MUSICDEF parsing, actually count lines
...
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
2020-01-18 22:17:47 -08:00
512435c59f
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01:00
ec89015662
Fix loss of aimingtody precision at high FOV
2020-01-18 11:19:59 -06:00
f6efe19fca
Use generally higher zooms and fix fuzzy edges
2020-01-18 11:15:36 -06:00
5757f24342
Reduce the number of distinct roll angles
2020-01-18 10:53:45 -06:00
8679606ebb
Remove a couple adds from each pixel of morph mapping
2020-01-18 10:53:23 -06:00
af4479924a
Fully clip drawing to roll-used screen bounds
2020-01-18 10:53:00 -06:00
8348123a70
Goal posts
2020-01-18 13:15:24 -03:00
cdc3386d48
Fix missing constant
2020-01-18 12:10:48 -03:00
0c7c5742a8
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03:00
ffc274643c
Let "+" command line parameters specify more than one argument
...
Previously each parameter after the first would be quoted into one argument to
pass to the command buffer.
2020-01-18 00:23:47 -08:00
8868fc4d8a
Fix lighting discrepancies between different FOVs
2020-01-18 00:16:18 -06:00
e82d19572d
Merge branch 'intangable' into 'next'
...
Add FF_INTANGABLEFLATS as an alternative spelling for FF_INTANGIBLEFLATS
See merge request STJr/SRB2!702
2020-01-18 00:49:08 -05:00
1d221a453a
Avoid rendering unused left/right edges of screen while rolling
2020-01-17 23:21:11 -06:00
94a2f0bb4f
Don't draw Tails' tails in first person (MF2_LINKDRAW)
2020-01-17 20:56:32 -08:00
762223db7c
Duplicated code is gone, so sad
2020-01-17 20:53:36 -08:00
21ccefe4eb
Fix sky texture scaling wrong with fov changes
2020-01-17 22:03:16 -06:00
7bd9344dd0
I think this fixes the compile errors
2020-01-17 21:55:16 -06:00
43828f265c
Use shadow cvar
2020-01-17 22:20:04 -05:00
ba51f83aaf
Merge branch 'next' into gl-dropshadows
2020-01-17 22:19:51 -05:00
64c4a4c02c
Fisheye lens experiments
2020-01-17 20:39:38 -06:00
2b7d75126e
Add DBG_VIEWMORPH to view pre-transformed view
2020-01-17 20:39:15 -06:00
84329fcd26
OGL can have little a viewroll
2020-01-17 19:01:45 -06:00
7cf563eadd
Un/archive viewrollangle in netsaves
2020-01-17 18:32:13 -06:00
d63aa1031e
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-17 18:27:15 -06:00
9a1cb0e30e
Merge branch 'software-dropshadows' into 'next'
...
Software dropshadows
See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
96c91ce716
Merge branch 'r_ispointinsubsector' into 'next'
...
Add R_IsPointInSubsector to lua baselib
See merge request STJr/SRB2!700
2020-01-17 18:24:04 -05:00
999094f2f6
backwards compat
2020-01-17 16:11:17 -03:00
b09341383f
Merge branch 'master' into next
2020-01-17 11:12:10 -05:00
b38921ff53
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
Fuck NONET
See merge request STJr/SRB2!699
2020-01-17 11:11:02 -05:00
f59ed6b2f4
DOUBLE DAMNIT
2020-01-17 00:34:57 -06:00
d39d8506ca
Let nerds turn off shadows
2020-01-17 00:20:10 -06:00
919661ff8f
Give me a break
2020-01-17 00:18:00 -06:00
4ca44f2d57
Bosses need dropshadows too
2020-01-17 00:16:15 -06:00
9a4ad20947
DAMNIT
2020-01-17 00:13:13 -06:00
f0843cba13
Let vissprites have shadows too
...
fuck it, hopefully it works
2020-01-17 00:13:05 -06:00
8bfdb52231
add R_IsPointInSubsector to lua baselib
2020-01-17 00:49:43 -03:00
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
e4f0fa46f5
Dumbass NONET stuff...
2020-01-16 18:07:28 -08:00
b6f68be52c
Merge branch 'credits-woopises' into 'next'
...
Add missing name to the credits
See merge request STJr/SRB2!696
2020-01-16 20:33:35 -05:00
098e41e518
Merge branch 'larger-chat' into 'master'
...
Larger chat
See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
d4e0bfe87f
Merge branch 'snac-bruh' into 'master'
...
Try to set a 21 character name and SIGABRT
See merge request STJr/SRB2!689
2020-01-16 20:32:58 -05:00
d7b6a3dd61
Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
...
-bindaddr for mserv
See merge request STJr/SRB2!688
2020-01-16 20:32:49 -05:00
b97b9ac7a8
Merge branch 'master' into next
2020-01-16 20:18:54 -05:00
d9742afb45
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
daab7a0d21
Merge remote-tracking branch 'origin/master'
2020-01-16 20:17:05 -05:00
f93ddc3f37
Merge branch 'keywords-back-again' into 'next'
...
Level header keywords
See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
f8666d6cee
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
601d4aec34
Merge branch 'FALLTHRU' into 'next'
...
FALLTHRU versus fallthru, which will win?
See merge request STJr/SRB2!692
2020-01-16 19:59:00 -05:00
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
1f36bde25f
Merge branch 'musicdef' into 'next'
...
MUSICDEF parser changes.
See merge request STJr/SRB2!599
2020-01-16 19:35:38 -05:00
54ec64062c
Revert "Move to the end of the list"
...
This reverts commit 32c65ae844
2020-01-16 19:20:05 -05:00
32c65ae844
Move to the end of the list
2020-01-16 18:59:39 -05:00
4c6edd87df
Restore this that got removed shomehow
2020-01-16 14:31:36 -05:00
36511afda9
Add missing name to the credits
2020-01-16 14:28:47 -05:00
4e481340ce
OpenGL shadows
2020-01-16 12:37:32 -05:00
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
0134be8b78
please stop breaking clang
2020-01-16 12:05:21 -05:00
28c466a0a5
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
28cd5b2f03
Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows
2020-01-16 09:38:12 -05:00
542e38e717
Don't draw player mobj in first person
...
This solves that annoying albeit slightly amusing bug
where your sprite clips into your view during a quake.
For OpenGL, this also solves the player's model
rendering while in first person. So you'll no
longer be looking through Sonic's body!
2020-01-16 03:18:05 -08:00
bbbe76d2ca
Expose viewmobj as r_viewmobj
2020-01-16 03:09:02 -08:00
36b9549b23
Merge branch 'locale-liberation' into 'master'
...
Locale liberation
Closes #113
See merge request STJr/SRB2!677
2020-01-15 23:38:40 -05:00
55cc978f40
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
0197a83db7
bruh
2020-01-15 15:57:38 +01:00
ec5db89e55
Cleanup chat code a little
2020-01-15 15:48:03 +01:00
9504ba96da
Increase maximum and default chat width
2020-01-15 15:36:11 +01:00
1489b4bcdd
It's FALLTHRU not fallthru
...
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
2020-01-15 02:14:20 -08:00
e23f632cdb
Clean up fisheye and fix crashes
2020-01-14 23:44:21 -06:00
708ab6ff90
Update buffer for SendNameAndColor
2020-01-14 21:40:58 -08:00
cdbea0be26
Revert "LMAO fisheye"
...
This reverts commit cd957d84f7
2020-01-14 23:30:39 -06:00
cd957d84f7
LMAO fisheye
2020-01-14 23:30:19 -06:00
c25e969676
wip viewroll stuff
2020-01-14 23:29:56 -06:00
619efb3d4e
And free addrinfo
...
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
2020-01-14 19:33:52 -08:00
af2d3cfd16
Let MS_Connect use -bindaddr
...
And so now you really can host from multiple IP addresses.
(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
2020-01-14 19:33:52 -08:00
James R