lachwright
3ebc17ac3a
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
James R
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Steel Titanium
62d73968e2
Merge branch 'next' into sal-oglshaderport
2020-06-08 19:36:23 -04:00
Lachlan Wright
191e2e094d
Merge branch 'fix-spawn-desynch' into 'next'
...
Fix desynch when a player spawns
See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
Lachlan Wright
614a98bd9d
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Hannu Hanhi
da98ea242e
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
Louis-Antoine
9be188ff02
Minor edit
2020-06-02 10:31:56 +02:00
LJ Sonic
e2b860dc28
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
MascaraSnake
8d7f4e3265
Merge branch 'movement-refactor' into 'next'
...
Clean up some movement code
See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
lachwright
b874da5229
Ensure followmobj ghost exists before applying fuse
2020-05-30 18:26:11 +08:00
lachwright
51b640ad5a
Feedback so far indicates the old booster effect is preferred
2020-05-30 18:21:39 +08:00
lachwright
ae5d5b9546
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
Louis-Antoine
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
MascaraSnake
ff37975892
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
33a22331f8
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
Louis-Antoine
d0abd6e86c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
9cd9d2e0d7
Merge branch 'carry-dust-devil' into 'next'
...
Add carry types to Dust devils
See merge request STJr/SRB2!886
2020-05-15 02:50:29 -04:00
ZipperQR
6a9543b1c2
no message
2020-05-14 03:35:46 +03:00
MascaraSnake
36843cbfd6
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Louis-Antoine
0c4f983eb5
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
7257fc730a
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
lachwright
215ff828f8
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Lachlan
426925c5fc
Play the 1-up sound when 1upsound is set to sound
2020-05-08 04:07:00 +08:00
Zipper
87f7100d2e
Update p_user.c
2020-05-06 09:30:15 -04:00
MascaraSnake
d0d25025e1
Refactor P_CheckBouncySectors
2020-05-03 10:01:58 +02:00
Steel Titanium
887c25e047
Remove inline keyword from P_DoTwinSpin function
...
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
2020-05-02 17:39:55 -04:00
MascaraSnake
d9ed914e14
Merge branch 'amyswings' into 'next'
...
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
MascaraSnake
452fd100b8
Refactor P_CheckBustableBlocks
2020-05-02 15:50:18 +02:00
MascaraSnake
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Zipper
dd645d88ea
Update p_user.c
2020-05-01 08:25:37 -04:00
lachwright
165b6c2435
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
lachwright
f9b831c00b
Restore jump-related pflags properly during twinspin
2020-05-01 06:34:30 +08:00
James R
fe9b933b97
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
Monster Iestyn
d1d006a1a7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Zipper
657ee8287e
Update p_user.c
2020-04-22 07:59:08 -04:00
ZipperQR
64edd91dbd
Dust devil support
2020-04-22 00:59:12 +03:00
James R
abb338d650
Merge branch 'continue_tweaks' into 'next'
...
A tangible mechanism to disable Continues
See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
MascaraSnake
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
James R
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
aad225932d
Merge branch 'SF_NONIGHTSSUPER' into 'next'
...
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
James R
1edc300d0c
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
toaster
da86c17ee1
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
Monster Iestyn
23b6679b3a
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Louis-Antoine
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
