Sally Coolatta
cfb9c92ec9
Merge dehacked.c/h
2020-08-02 16:59:24 -04:00
Sally Coolatta
70692f4c3f
Merge d_netfil.c
2020-08-02 16:40:22 -04:00
Sally Coolatta
b156899390
More d_netcmd.h
2020-08-02 16:36:40 -04:00
Sally Coolatta
178087289e
Merge d_netcmd.c/h
2020-08-02 15:38:53 -04:00
Sally Coolatta
c1b1641f35
Merge d_main.c
2020-08-02 14:45:23 -04:00
Sally Coolatta
6ddae4728f
Merge d_net.c
2020-08-02 14:15:29 -04:00
Sally Coolatta
a6396d5734
Utilize SendKick more
2020-08-02 14:07:02 -04:00
Sally Coolatta
6b1e9e4937
Merge d_clisrv.c/h
2020-08-02 13:56:43 -04:00
SteelT
ecf0b38bbb
Resolve m_misc.c and z_zone.c
2020-06-03 20:16:48 -04:00
Sryder
3c538de360
Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge
2020-06-01 23:28:31 +01:00
Sryder
5b6ed47113
hw_main
...
I wouldn't be surprised if some vanilla changes haven't made it in here
I also wouldn't be too surprised if this broke a lot.
My recommendation for when Hannu finishes implementing his changes for vanilla is to take the files as-is from there and re-implement our changes.
2020-06-01 23:28:15 +01:00
SteelT
751c89d45b
Resolve m_anigif.c conflicts.
2020-05-31 19:39:42 -04:00
toaster
83f1abecb3
Merge conflict resolution for console.c/h
2020-06-01 00:10:44 +01:00
toaster
555d7f960b
Merge conflict resolution for command.c
2020-05-31 23:42:59 +01:00
Sally Coolatta
0e79ec29be
p_map & p_maputl merge conflicts
2020-05-30 13:53:30 -04:00
SteelT
417859020d
Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge
2020-05-29 16:19:48 -04:00
SteelT
9ff6af856e
Resolve conflicts on the SDL interface files.
2020-05-29 16:17:26 -04:00
Sryder
5cccff08aa
Basic merge some of the easier HW files.
...
hw_main and hw_md2 still need merge.
hw_cache needs evaluating for encore mode.
2020-05-29 20:43:34 +01: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
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
