thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11513 commits 1 branch 12 tags 205 MiB
Commit graph

1214 commits

Author SHA1 Message Date
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
kaysrishaq
248cd81ee9 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
lachwright
2215505c2b Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00
lachwright
92a43f2f2e Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain 2020-06-17 01:46:36 +08:00
lachwright
b2b0fc435b Platform fixes 2020-06-14 12:17:30 +08:00
Steel Titanium
b8bbf5d9f4 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
Lachlan Wright
5263b8cf63 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
f9c3a93cf3 Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Louis-Antoine
764f966ffe Minor edit 2020-06-02 10:31:56 +02:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake
69a7ac6b4e 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
984b996c7a Ensure followmobj ghost exists before applying fuse 2020-05-30 18:26:11 +08:00
lachwright
70edaa9afa Feedback so far indicates the old booster effect is preferred 2020-05-30 18:21:39 +08:00
lachwright
48f167d75c Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
MascaraSnake
ccd2371d42 Merge branch 'next' into movement-refactor 
# Conflicts:
#	src/p_map.c
 2020-05-19 09:50:23 +02:00
MascaraSnake
f1744efbd5 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
74fa35221d 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
6af2871fa5 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
MascaraSnake
bb03937054 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
88c32f7790 no message 2020-05-14 03:35:46 +03:00
MascaraSnake
7004d8ca75 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50 Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
Louis-Antoine
be67ca3203 Fix crash with rollout rock 2020-05-11 23:48:35 +02:00
James R
1065ded275 Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
lachwright
a4cba6a5f9 Merge branch 'master' into next 2020-05-11 01:29:10 +08:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Lachlan
05c83bbd68 Play the 1-up sound when 1upsound is set to sound 2020-05-08 04:07:00 +08:00
Zipper
6d26c6e180 Update p_user.c 2020-05-06 09:30:15 -04:00
MascaraSnake
bfe0ad5d6a Refactor P_CheckBouncySectors 2020-05-03 10:01:58 +02:00
Steel Titanium
72b83986fa 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
4346d22480 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
c4190f2d3f Refactor P_CheckBustableBlocks 2020-05-02 15:50:18 +02:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Zipper
d6511190fd Update p_user.c 2020-05-01 08:25:37 -04:00
lachwright
1568114d13 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
d780d82ba8 Restore jump-related pflags properly during twinspin 2020-05-01 06:34:30 +08:00
Nev3r
dbf2b9c0f0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +02:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Monster Iestyn
f26e8f3df7 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
e794810d47 Update p_user.c 2020-04-22 07:59:08 -04:00
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03:00
Nev3r
d0340c864f Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
James R
7e981edfcc 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
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
df87feaba7 Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
e11e19a5c0 Make a commented out debug code account for taglists. 2020-04-17 10:41:26 +02:00