Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
fickleheart
7bf9bc4b9e
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
fickleheart
d7421d14c7
> building SRB2 without Lua in 2020
2020-03-18 22:38:18 -05:00
fickleheart
2176136480
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
SteelT
2e25a5b56d
Merge branch 'viewpointswitch-fix' into 'next'
...
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
fickleheart
5aebc0ed6d
Add JingleStatus hook for carrying custom jingle tunes
...
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
fickleheart
d55ef8db71
Make P_PlayLivesJingle player optional in Lua
2020-02-23 15:40:59 -06:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
Tatsuru
9368818731
Oopsie 2
2020-02-22 22:36:44 -03:00
Tatsuru
2e71bbf96e
Oopsie
2020-02-22 21:14:05 -03:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
Tatsuru
4f150cb811
Enough
2020-02-18 22:55:40 -03:00
Tatsuru
522a51b3a1
Standards 2
2020-02-18 22:50:22 -03:00
fickleheart
51ef6b3684
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
fickleheart
6a076091f7
Improvements to polyobjects carrying things:
...
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
actual problem :]
2020-02-10 00:07:25 -06:00
James R
8c713b3467
Merge branch 'platform-fixes' into 'next'
...
Reset pmomz after applying it to momz
See merge request STJr/SRB2!747
2020-02-01 21:41:49 -05:00
lachwright
17b6155df9
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
lachwright
693d4b1120
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
lachwright
51fa7c17a5
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
James R
ff2ec925ee
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
fickleheart
62c75c0c81
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
fickleheart
124077f1d9
Fix the minecart angle thing
2020-01-25 19:03:15 -06: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
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
Louis-Antoine
f98be013ea
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00
Louis-Antoine
f07b432df4
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
Louis-Antoine
a997683d1c
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
Louis-Antoine
08589dcd96
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
Louis-Antoine
bb74b090cb
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 03:11:05 +01:00
Tatsuru
065b8adf42
In-map visual indicator
2020-01-19 19:02:03 -03:00
fickleheart
186ef1852b
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-17 18:27:15 -06:00
Alam Ed Arias
2ce99b7914
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
Alam Ed Arias
282abfd4ac
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
lachwright
9a41bca7d7
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
James R
522ef41b98
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
James R
ce4e6aa36b
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
fickleheart
6a80bf2629
wip viewroll stuff
2020-01-14 23:29:56 -06:00
James R
5e9a1003b6
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
Monster Iestyn
54f1cd601e
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
toaster
0a720e70c5
Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place.
2020-01-11 14:41:37 +00:00
James R
47af4f51ee
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
James R
5d281ebfd3
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
James R
f2445b27b5
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
James R
e76c98b2b7
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
Alam Ed Arias
f267f7bb3e
whitespace cleanup
2020-01-09 16:19:12 -05:00
