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
68b78f44d8
Load flats first so textures with the same name are prefered on walls
2020-01-13 15:21:35 -08:00
0d6b6efe0f
Refactor R_LoadTextures into something manageable (no goto!!)
2020-01-13 15:20:50 -08:00
223edd8ee0
Merge branch 'disable-titlemap-in-netgames' into 'master'
...
Disable title map when entering a netgame
See merge request STJr/SRB2!683
2020-01-13 16:47:17 -05:00
339ceafdf0
Remove adminplayer from SERVERINFO (PACKETVERSION 2)
2020-01-12 20:21:35 -08:00
84ac743d73
Kill Lua adminplayer
2020-01-12 20:04:05 -08:00
bff6875b95
Merge branch 'fangpogo' into 'next'
...
Make Fangboss' player pogo a little less bullshit.
See merge request STJr/SRB2!676
2020-01-12 17:54:02 -05:00
2b95ea0135
Merge remote-tracking branch 'origin/master' into next
2020-01-12 14:17:52 -08:00
2bb8b85754
Merge branch 'split-emblem-hints' into 'next'
...
"Symmetrical"-ish Emblem Hint pages
See merge request STJr/SRB2!670
2020-01-12 17:16:03 -05:00
66c9e8e3aa
Fix "symmetrical"-ish emblem hints for ERRORMODE
...
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
2020-01-12 23:09:27 +01:00
6eba68bc3b
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
70bd7132c5
Merge branch 'egg2pogo' into 'next'
...
Egg Slimer Pogo Bruh Moment (resolves #112 )
See merge request STJr/SRB2!674
2020-01-12 15:43:24 -05:00
34b42507d1
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
34f73ec083
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node numbers being used in place of player numbers
See merge request STJr/SRB2!681
2020-01-12 15:40:25 -05:00
50d1226224
Merge branch 'you-cant-escape-console' into 'master'
...
Open the console in menus and draw backpic correctly
See merge request STJr/SRB2!665
2020-01-12 15:38:51 -05:00
5d6d6a7d4d
Merge branch 'escape-console' into 'master'
...
Let Escape close the console
See merge request STJr/SRB2!664
2020-01-12 15:38:35 -05:00
f6244ec9a4
Disable title map when entering a netgame
2020-01-12 20:08:41 +01:00
e9108de365
Replace all instances of XD_KICK with a SendKick function
2020-01-12 19:43:04 +01:00
5b34923352
Fix node numbers being used in place of player numbers
2020-01-12 18:34:08 +01:00
8a6173a3f2
Declare checkbase for both sides of the if statement
2020-01-12 09:11:57 -06:00
9e101fc2bb
Limit shadow Y scale to prevent graphical bugs
2020-01-12 09:10:09 -06:00
e60ba92a92
Checkpoint players at star post exact location with Ambush flag
2020-01-11 22:30:07 -06:00
1e2a4c2cce
Allow starpost Parameter to dictate order
2020-01-11 22:26:20 -06:00
cfb9b3c234
Expose mobj->shadowscale to Lua
2020-01-11 18:28:15 -06:00
ba8ff3d502
Add mobj shadowscale property
2020-01-11 18:24:08 -06:00
1b0a3d0fe3
Use dedicated shadow graphic
2020-01-11 17:56:49 -06:00
bf8a39f7ee
Only exit if base files fail to load
2020-01-11 15:40:18 -08:00
4e5f49c60d
Fix player shadows while on rope hangs etc
2020-01-11 17:39:53 -06:00
27bd7e4a7f
Merge remote-tracking branch 'upstream/next' into software-dropshadows
2020-01-11 17:09:57 -06:00
1643e6623d
whoops, forgot to do this
2020-01-11 20:24:43 +00:00
9c8988ab57
Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff!
2020-01-11 18:48:47 +00:00
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
a5ad02eab9
Make Fangboss' player pogo a little less bullshit by having an actually sensible calculation instead of trying to be smart.
...
The old behaviour was trying way too hard to be smart and as a consequence made the hitbox way too huge.
2020-01-11 17:08:08 +00:00
e938f16fef
Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????)
2020-01-11 16:40:42 +00:00
661c44b260
Merge branch 'udmf-vslopes' into 'next'
...
Add textmap vertex slope support
See merge request STJr/SRB2!633
2020-01-11 10:02:51 -05:00
926cbc4141
Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place.
2020-01-11 14:41:37 +00:00
e6ddfc7cdf
Make >5 <10 emblem hints appear "symmetrical"-ish
...
With more than 5 but less than 10 emblem hints,
only put half of the hints on each side of the hint menu,
instead of putting e.g. 5 on the left and 1 on the right.
2020-01-11 14:59:10 +01:00
afcaa94cd0
Clarify ambiguity regarding mapthing-based vertex slopes.
2020-01-11 08:53:29 +01:00
2046f524c7
Fix incorrect cast
2020-01-10 23:32:31 +01:00
0345a32c37
Merge branch 'brickblockbustin' into 'next'
...
Brick Block Bustin
See merge request STJr/SRB2!666
2020-01-10 16:02:59 -05:00
e1303a2b5c
Merge branch 'orbital-flickering' into 'master'
...
Don't give player translucency when looking down with the orbital camera
See merge request STJr/SRB2!659
2020-01-10 16:02:44 -05:00
dc151fc7a4
Merge branch 'accurate-papersprites' into 'master'
...
Accurate papersprite projection
See merge request STJr/SRB2!657
2020-01-10 16:02:23 -05:00
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
2491046bc2
Merge branch 'morehints' into 'next'
...
Allow for 10 emblem hints on a map by poking the drawer a bit.
See merge request STJr/SRB2!650
2020-01-10 15:59:22 -05:00
a16c444166
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
134d1831e3
Menu option for 1upsound
2020-01-10 12:55:22 -08:00
1113a13621
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
e532efa5d0
Merge branch 'stars-fix' into 'next'
...
Add MT_FLINGNIGHTSSTAR mobj type
See merge request STJr/SRB2!663
2020-01-10 13:34:43 -05:00
023624ebb7
Merge branch 'minor-ogl-improvements' into 'next'
...
Minor OpenGL improvements
See merge request STJr/SRB2!661
2020-01-10 13:32:37 -05:00
cbbc76b673
Fix snapping of extra multiplayer text. ( Resolves #101 )
2020-01-10 12:50:58 +00:00
80b801e91e
Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually.
2020-01-10 11:43:41 +00:00
2459ca255f
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
ef3d462eb7
Let the console open in menus
2020-01-09 22:42:00 -08:00
48dd6b0580
Show Sonic's ass if con_backpic. No wait, I mean crop the backpic...
2020-01-09 22:39:01 -08:00
3179797331
Let Escape close the console
2020-01-09 22:16:46 -08:00
5c60f8b529
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
ced5ca81a4
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
71c2ee3850
whitespace cleanup
2020-01-09 16:19:12 -05:00
57a31077e7
Merge branch 'public_hexang' into 'next'
...
Hexafaceted sprite angle support.
See merge request STJr/SRB2!652
2020-01-09 16:14:49 -05:00
682e683a71
Merge branch 'fakeplanes-colormap' into 'next'
...
Don't create colormap data out of sidedef text for fake planes linedef
See merge request STJr/SRB2!648
2020-01-09 15:04:33 -05:00
10e9dd2c23
*bends over seductively to pick up whitespace*
2020-01-09 16:16:24 -03:00
3e3cb48feb
This is stupid
2020-01-09 12:15:26 -03:00
487e1b02f1
Remove smooth setting
...
It got denied before for Software so I won't include it in the merge request :(
2020-01-09 01:28:14 -05:00
7d2402ac62
Fix shadows under hiresscale characters
2020-01-08 23:33:43 -06:00
9e8d20504e
Refactor shadow scale into an argument
2020-01-08 23:24:31 -06:00
fa4b49d52c
Refactor shadow floor finding code a bit
...
I tried to fix ring shadows on polyobjects and got this in return:
https://media.discordapp.net/attachments/629477786943356938/664695818913185822/srb20156.png
2020-01-08 23:19:52 -06:00
66cf1be0d8
Don't clip player MD2 either!
2020-01-08 20:52:34 -08:00
0f8c736188
Don't make player transparent if the orbital camera is looking straight down
2020-01-08 20:49:38 -08:00
a7edf51cb9
Stop misusing papersprite vars for sprite skew
2020-01-08 21:52:10 -06:00
ef4974ab4d
Apply portal clipping to drop shadows too
2020-01-08 21:37:44 -06:00
8757194d73
Make ring shadows smaller and fix scale bug
2020-01-08 21:37:43 -06:00
c078ab630d
Fix more shadow crashes and save my sanity
2020-01-08 21:37:41 -06:00
9c49e020c3
FUCK IT, SLOPED SHADOWS NOW
2020-01-08 21:37:40 -06:00
5929b4797e
This acursed crash-inducing typo spat in my face and called me a bitch
2020-01-08 21:37:39 -06:00
c46c92d605
Prevent linkdraw sprites from connecting to shadows
2020-01-08 21:37:38 -06:00
48c1ce3ac3
Add render-based drop shadows to some objects
...
Uses a hardcoded list for now. I was experiencing some
crashes with this, but the shadowyscale check seems to
have suppressed them.
2020-01-08 21:37:36 -06:00
ccc473917e
Check for papersprites per-sprite instead of per-row
...
In theory, should be a performance improvement. In practice idk
2020-01-08 21:14:11 -06:00
1790891fd8
Reduce disappearance of vissprites close to the camera
2020-01-08 21:14:09 -06:00
c0380a3052
Make papersprite projection completely correct in software
...
I heard properpaper had some weird crashes? I couldn't reproduce
them no matter how hard I tried, but I added some bounds checking
to this version too just in case. Gotta get other people's help
to try to reproduce those.
2020-01-08 21:14:07 -06:00
11d21dd950
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-08 18:52:56 -06:00
735289502c
Call it KEYWORDS
2020-01-08 14:41:38 -08:00
004cfb45aa
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
74364b84f9
Revert "Oh right, the keywords..."
...
This reverts commit a00dfcf420
2020-01-08 14:26:47 -08:00
d89050f073
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
...
# Conflicts:
# src/r_defs.h
2020-01-08 21:47:47 +00:00
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
4d8c916ca1
Merge branch 'names-update' into 'master'
...
Update copyright statements for changed names
See merge request STJr/SRB2!644
2020-01-08 16:16:41 -05:00
551df5f93a
Merge branch 'state-fix' into 'next'
...
Fix S_HAMMER being off by one
See merge request STJr/SRB2!654
2020-01-08 16:15:55 -05:00
a63bd720b9
Merge branch 'next-newcontrols' into 'next'
...
fcam simple controls but slightly less hacky
See merge request STJr/SRB2!647
2020-01-08 16:15:47 -05:00
117d5ab66f
Merge branch 'highresscale-continue' into 'master'
...
Apply skin's highresscale to continue screen
See merge request STJr/SRB2!645
2020-01-08 16:15:15 -05:00
6870492cf2
Merge branch 'more-opengl-fixes' into 'master'
...
More OpenGL fixes plus masked PNG conversion
See merge request STJr/SRB2!619
2020-01-08 16:14:51 -05:00
3b90571987
Merge branch 'local-lua-commands' into 'next'
...
Local Lua commands + no magic numbers
See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05:00
07dfc5cce7
Fix S_HAMMER being off by one
2020-01-08 16:00:02 -05:00
8bc7b4c72d
Give chat word jumping
2020-01-08 12:58:34 -08:00
702b23ec3f
Put the word jumping code in functions
2020-01-08 12:58:19 -08:00
0b1108425d
Hexafaceted sprite angle support (See merge request description coming soon).
...
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
377194b077
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
...
# Conflicts:
# src/m_menu.c
2020-01-08 20:00:50 +00:00
d2da441a57
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints
...
# Conflicts:
# src/m_menu.c
2020-01-08 19:18:35 +00:00
d49cd9755b
Fullbright transparent planes
...
(I disagree with this feature so hard but w/e)
(cherry picked from commit fe809b2734
2020-01-08 13:13:07 -05:00
15075d4e1b
More blend image updates
...
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software
(cherry picked from commit 74d7f256a7
2020-01-08 13:12:37 -05:00
65a02b0f8f
Increase precision of smooth contrast
...
(cherry picked from commit 4c6664292e
2020-01-08 13:12:15 -05:00
SteelT
