lachwright
b4057d10e7
Merge branch 'master' into spindash
2020-06-09 03:55:55 +08: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
Latapostrophe
cab9c2a139
Merge branch 'v2-master' into followme-internal
2020-06-07 23:56:32 +02:00
MascaraSnake
31bdf38f89
Merge branch 'nospinmovecut' into 'next'
...
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
Sal
58dbdc2378
Merge branch 'grand-pricks' into 'master'
...
Grand pricks
See merge request KartKrew/Kart!258
2020-06-07 01:28:35 -04:00
Monster Iestyn
3a7417c8fe
Merge branch 'master' into next
2020-06-06 20:35:48 +01:00
lachwright
207c6d71a9
Merge branch 'next' into nospinmovecut
2020-06-07 02:45:26 +08:00
Sally Coolatta
b7a8c1f128
Merge branch 'master' into trick-panels
2020-06-05 18:41:21 -04:00
Sally Coolatta
25c3774dc1
Let Sneakers stack with each other endlessly.
...
PROBABLY REALLY CONTROVERSIAL, so it's in this other branch... but it's tamer than it sounds, and it's *really* fun.
https://cdn.discordapp.com/attachments/275750804227489794/718541704822784061/kart0158.gif
https://cdn.discordapp.com/attachments/275750804227489794/718545963408687155/kart0161.gif
https://cdn.discordapp.com/attachments/275750804227489794/718543467847876689/kart0160.gif
2020-06-05 15:29:08 -04:00
Latapostrophe
f33e4d62a0
Sort conflicts, fix misordered follower bubble states in dehacked
2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Monster Iestyn
d0d6f76f8e
P_XYMovement: initialise slopemom to all zeros
2020-06-03 20:47:49 +01:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04: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
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
lachwright
534aea9f62
Don't cut momentum if landing in a roll
2020-05-30 19:07:16 +08:00
lachwright
48f167d75c
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
285de3357d
Add back to resynch & savegame, shorten names of a few variables
2020-05-29 13:12:07 -04:00
Sally Coolatta
cf1c7f9f10
FULLY fix the respawn finish line exploit, by adding a "P_HitSpecialLines" function
2020-05-29 11:49:32 -04:00
Sally Coolatta
2bfe5c9dd2
Noclip properly
2020-05-29 11:41:39 -04:00
Sally Coolatta
d062a35a3a
Huge respawn overhaul
...
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -04:00
Sally Coolatta
9933687c6e
Merge branch 'master' into pet-robo
2020-05-24 17:18:02 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Sryder
f5b570da39
Set this variable after making sure the target and player exist.
2020-05-23 16:08:51 +01: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
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sal
843721cc8f
Merge branch 'sprite-offsets' into 'master'
...
Sprite offsets for horizontal springs
See merge request KartKrew/Kart!265
2020-05-18 14:39:09 -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
Sally Coolatta
e425eabf04
Merge branch 'master' into grand-pricks
2020-05-17 11:39:39 -04:00
MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
Sally Coolatta
719d4702c1
Merge branch 'master' into sprite-offsets
2020-05-15 23:00:30 -04:00
Sally Coolatta
0706ec3b16
Merge branch 'master' into colorize-tweak
2020-05-15 22:57:06 -04:00
Sally Coolatta
4555b20e6c
Merge branch 'master' into new-cars-movie
2020-05-14 22:42:29 -04:00
Sally Coolatta
8744df641f
Merge branch 'master' into grand-pricks
2020-05-14 18:48:34 -04:00
Sal
9921dfbb05
Merge branch 'water-physics' into 'master'
...
Altered water physics
See merge request KartKrew/Kart!261
2020-05-14 18:47:08 -04:00
Sally Coolatta
b51f206c1c
Support antigrav
2020-05-14 18:45:54 -04:00
MascaraSnake
c2037391d2
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
Sally Coolatta
e51bceb567
Items respawn in GP
2020-05-13 03:04:33 -04: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
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
