Commit graph

14537 commits

Author SHA1 Message Date
MascaraSnake
a1a3b54108 Remove "explicitly include line in polyobject" code which has never worked 2020-05-03 23:47:26 +02:00
Latapostrophe
78a328328a Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-05-03 22:37:07 +02:00
MascaraSnake
2df5758ecf Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +02:00
MascaraSnake
89dd809e04 Merge branch 'next' into egg-capsule
# Conflicts:
#	extras/conf/SRB2-22.cfg
2020-05-03 16:00:05 +02:00
MascaraSnake
c39fd8053a Add object dye linedef executors to ZB config 2020-05-03 15:57:18 +02:00
MascaraSnake
40f228c952 Merge branch 'next' into egg-capsule
# Conflicts:
#	src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
6002a0e443 Add "trigger egg capsule" linedef executor 2020-05-03 15:22:13 +02:00
ZipperQR
d229445d43 no message 2020-05-03 14:02:23 +03:00
James R
e52d569c58 Use all your momentum to push back the camera 2020-05-02 19:10:38 -07:00
James R
01cdc1af49 Also preserve player angle on speed pads 2020-05-02 19:10:05 -07:00
James R
652b7bbb9e Retain drift on speed pads 2020-05-02 19:10:04 -07: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
Monster Iestyn
145b7d8f66 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01: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
96ae5dda22 Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects

See merge request STJr/SRB2!911
2020-05-02 09:53:37 -04:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
58508e199d Make the laser thinker find the FOF itself instead of storing it in the thinker struct 2020-05-02 10:03:16 +02:00
MascaraSnake
b9c5f65cbf Clean up Thwomp spawning code 2020-05-02 09:15:34 +02:00
Sally Coolatta
cb34ea1388 Consider FOFs when figuring out sectors to be careful near 2020-05-02 02:01:39 -04:00
Sally Coolatta
e6e2cd5d82 Adjust air speed cap easing with bot rubberbanding 2020-05-02 00:54:54 -04:00
Sally Coolatta
df099864b6 Whoops 2020-05-01 23:45:12 -04:00
Sally Coolatta
69e5cf8205 Bots can use bubble shield and flame shield, albiet a bit simplisticly
This means they can now use ALL items!
2020-05-01 23:44:03 -04:00
Sally Coolatta
664a9528ed Eggbox stuff
- Bots can roll & use eggboxes now
- Bots can be "tricked" by eggboxes and treat them like normal items, depending on their difficulty and how many normal items are around them.
- If exploding and in 1st place, they'll slow down to try and find someone to explode next to.
- Item usage is difficulty dependent, and thus far more aggressive for the rivals
2020-05-01 22:55:58 -04:00
Zipper
d6511190fd Update p_user.c 2020-05-01 08:25:37 -04:00
MascaraSnake
238513ffd6 Merge branch 'find-sector-from-tag' into 'next'
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag

See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
e967c32a10 Merge branch 'more-thinker-refactor' into 'next'
More thinker refactoring

See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
d295996d88 Merge branch 'elevator-cleanup' into 'next'
elevator_t cleanup

See merge request STJr/SRB2!896
2020-05-01 05:46:37 -04:00
MascaraSnake
5cf3fd0074 Merge branch 'next' into elevator-cleanup
# Conflicts:
#	src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
2973b79715 Remove bogus comments from p_saveg.c 2020-05-01 11:25:32 +02:00
LJ Sonic
2c74085826 Merge branch 'join-delay' into 'next'
Add a minimum delay between connections

See merge request STJr/SRB2!889
2020-05-01 03:29:15 -04:00
lachwright
d780d82ba8 Restore jump-related pflags properly during twinspin 2020-05-01 06:34:30 +08:00
Sally Coolatta
b9e24d921c Bots reduce their rubberbanding top speed if they're facing the wrong way 2020-04-30 17:28:34 -04:00
Monster Iestyn
a96f0a0df3 Merge branch 'strncpy-brullshit' into 'next'
Fix a few strncpy bullshit

See merge request STJr/SRB2!895
2020-04-30 14:53:46 -04:00
Monster Iestyn
405d5e1fc6 Merge branch 'netarchive-cleanup' into 'next'
Netgame $$$.sav code cleanup

See merge request STJr/SRB2!894
2020-04-30 14:53:22 -04:00
Sally Coolatta
1fcfdd5bae Bot hints
Thing type 2004, adds a map-defined point for bots to gravitate towards or away from.
Angle: Changes radius, defaults to a 32 radius (or 64x64 area) without.
Ambush: When off, makes bots steer towards. When on, makes bots steer away.
Parameter: Changes how much the bot steers away/towards this point. If 0, defaults to 2.

(also, made bots ignore strong offroad if they could take a shortcut)
2020-04-30 14:15:10 -04:00
James R
a1502046cf Merge remote-tracking branch 'origin/master' into resume 2020-04-30 09:32:40 -07:00
Latapostrophe
6bf117300b Add back viewpoint names & fix console inputs in replays 2020-04-30 15:50:30 +02:00
Wolfy
cd11abafa9 Merge remote-tracking branch 'remotes/james/awful-mix-fucked' into awful-mix 2020-04-30 04:40:11 -05:00
Monster Iestyn
edfbd799db Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
Monster Iestyn
0ab7d0b4b5 Don't discard const, added missing & 2020-04-29 15:24:28 +01:00
Monster Iestyn
5f3a827609 Whoops the third 2020-04-29 14:45:52 +01:00
Louis-Antoine
4130a30008 Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit b03e0d1289.
2020-04-29 10:55:49 +02:00
Wolfy
c3d34198ef Shader batching additions 2020-04-29 00:03:02 -05:00
James R
2e6e13cc07 Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked 2020-04-28 21:56:35 -07:00
Sally Cochenour
174a76f7e8 Merge branch 'master' into pet-robo 2020-04-28 21:10:16 -04:00
Sally Cochenour
fb68e4f164 Merge branch 'master' into pet-robo 2020-04-28 20:20:05 -04:00
Sal
fae498f097 Merge branch 'fof-things-suck' into 'master'
Generic raise things line special, Waypoint Riser and Waypoint Anchor

See merge request KartKrew/Kart!233
2020-04-28 20:19:03 -04:00
Latapostrophe
0897f6f21a Cam lockon, allow viewpoint change during freecam 2020-04-28 23:24:48 +02:00
Louis-Antoine
1f830836ba Optimise number archiving 2020-04-28 23:12:02 +02:00