Commit graph

14505 commits

Author SHA1 Message Date
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
Sal
dcd2f790ba Merge branch 'pet-robo' into 'master'
This is my PET ROBO!

See merge request KartKrew/Kart!257
2020-05-29 13:27:28 -04:00
LJ Sonic
4bed63b888 Merge branch 'luacolors-gcc10-fix' into 'next'
Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
2020-05-29 11:23:54 -04:00
Sally Coolatta
990733a5cc Minimum prediction distance
Lets them properly steer while respawning
2020-05-28 18:46:33 -04:00
Sally Coolatta
d2aa03b44e Change 3*rad/4 to rad
Should let them use slightly more of the track
2020-05-28 18:45:14 -04:00
Sally Coolatta
5f97070a47 FixedDiv should be here instead of FixedMul 2020-05-28 18:29:00 -04:00
Sally Coolatta
896c6b3952 Rewrite K_BotHatesThisSector slightly
Fixed a lot of its false positives, as well as some copy-paste errors
2020-05-28 17:58:35 -04:00
Sally Coolatta
fdb13b76d1 Make K_BotTopSpeedRubberband a function 2020-05-28 16:46:21 -04:00
Sally Coolatta
08198ef1b4 Don't display ping for bots 2020-05-28 13:50:47 -04:00
Sally Coolatta
b8b4d913a8 Reverse order bots are removed 2020-05-28 13:44:53 -04:00
Sally Coolatta
5ad6812f17 No modify power level for beating/losing to players with no power level set
This mainly is intended for bots, but also applies to splitscreen guests who also probably shouldn't have any power level
2020-05-28 13:42:11 -04:00
sphere
a0a16e2e79 Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
Monster Iestyn
239b758cd1 Merge branch 'master' into next 2020-05-28 16:34:06 +01:00
SteelT
b99dd5ae98 Merge branch 'nowipe-fixes' into 'master'
NOWIPE fixes for colormap and title card wipes

See merge request STJr/SRB2!962
2020-05-28 11:30:01 -04:00
SteelT
1f0feb84b8 Merge branch 'scroller-tweaks' into 'next'
Add back side wall scrollers & allow using offsets for tagged wall scrollers.

See merge request STJr/SRB2!955
2020-05-28 11:29:39 -04:00
LJ Sonic
8c5149f180 Merge branch 'possibly-fix-dedi-crash' into 'next'
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)

See merge request STJr/SRB2!963
2020-05-28 11:29:00 -04:00
SteelT
2739f989dc Merge branch 'fix-input-buffer' into 'next'
Allow input buffer to hold more than 64 tics

See merge request STJr/SRB2!950
2020-05-28 11:27:39 -04:00
SteelT
4b77741f37 Merge branch 'next-lc-uint16' into 'next'
Custom skincolors

See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
Monster Iestyn
9a122fd9c4 Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array 2020-05-25 21:27:48 +01:00
Monster Iestyn
5c6004f213 Merge branch 'crumblebob-fixes' into 'next'
Fix crumbling floatbob FOFs in MP SS5 rising up into space for no reason

See merge request STJr/SRB2!961
2020-05-25 07:58:21 -04:00
mazmazz
0294f8d26a Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
mazmazz
505fb1761d Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
Sally Coolatta
9933687c6e Merge branch 'master' into pet-robo 2020-05-24 17:18:02 -04:00
Sally Coolatta
4916516e2e Prevent duplicate skins, fix bots not being able to be disabled, change default to "off" 2020-05-24 17:12:58 -04:00
Sally Coolatta
5d77807a78 const radreduce, removed unused "dir" property 2020-05-24 16:16:01 -04:00
Monster Iestyn
dbe7b57c74 T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result) 2020-05-24 21:15:31 +01:00
Sally Coolatta
597baf212b Allow rubberbanding up to exiting players 2020-05-24 15:55:26 -04:00
Sally Coolatta
dbc30da69f Dial back the bot steering changes a bit 2020-05-24 15:55:10 -04:00
Sally Coolatta
02605a5ace Split bot code into multiple files & clean up 2020-05-24 15:08:10 -04:00
SwitchKaze
77a501ecae Fix typo SKINCOLOT 2020-05-24 12:36:20 -05:00
Sal
e18d71d562 Merge branch 'flame-shield-adjust' into 'master'
Flame shield adjust

See merge request KartKrew/Kart!270
2020-05-24 11:20:30 -04:00
Sally Coolatta
5e11068328 Merge branch 'pet-robo' of https://git.magicalgirl.moe/KartKrew/Kart into pet-robo 2020-05-24 11:13:26 -04:00
Sally Coolatta
56867fb203 Going above top speed makes radius smaller 2020-05-24 11:13:20 -04:00
Sally Coolatta
edfc14c506 Better steering
- If they're already turning in one direction, they are more likely to steer in that direction for objects
- Bots have to want to turn in 1 direction for a few frames in a row before it'll let them

Prevents twitching & makes them less indecisive in general
2020-05-24 11:12:38 -04:00
Sal
a31ac14e61 Merge branch 'pet-robo-toast' into 'pet-robo'
toast robo

See merge request KartKrew/Kart!268
2020-05-24 01:08:45 -04:00
Sally Coolatta
7cb574351d Merge branch 'master' into flame-shield-adjust 2020-05-23 21:51:03 -04:00
Sally Coolatta
12be3ea882 Increase handling with flame shield dash 2020-05-23 21:50:52 -04:00
Sally Coolatta
b1ec2d8f74 Scale with mapobjectscale 2020-05-23 21:34:30 -04:00
Sal
5d923226aa Merge branch 'let-spec-have-fun' into 'master'
Allow spectators through Block Players lines

See merge request KartKrew/Kart!266
2020-05-23 21:29:59 -04:00
Sal
f0ed1a58ce Merge branch 'demoman-tf2' into 'master'
Additional local explosion effects.

See merge request KartKrew/Kart!263
2020-05-23 21:29:38 -04:00
Sal
0524def20b Merge branch 'flameshield-spectate-fix' into 'master'
Fix Spectating With a flameshield on Crashing

See merge request KartKrew/Kart!269
2020-05-23 21:29:24 -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
sphere
8e068e94b0 Rename the rest of the wall scrollers in the ZB config. 2020-05-23 16:41:38 +02:00
MascaraSnake
4fcbb59116 Merge branch 'splitshot-notarget-fix' into 'next'
A_SplitShot no target fix

See merge request STJr/SRB2!956
2020-05-23 07:52:36 -04:00
MascaraSnake
8c38d4e261 Merge branch 'lua-mapthing-len' into 'next'
Lua mapthing len

See merge request STJr/SRB2!957
2020-05-23 07:51:58 -04:00
Sally Coolatta
ca7154f521 Make rubberband air speed cap even harsher 2020-05-22 21:19:50 -04:00
Sally Coolatta
38ec153e90 A bit redundant 2020-05-22 20:49:33 -04:00
Sally Coolatta
f442b934cc Adjust wall steer radius with speed 2020-05-22 20:20:17 -04:00
Sally Coolatta
19f352e4a4 Commentate K_BotReducePrediction better, use angle rather than distance for path split picking 2020-05-22 20:19:58 -04:00