Commit graph

4574 commits

Author SHA1 Message Date
TehRealSalt
1cb602aec6 Fix squishing on mobj scale maps 2018-11-21 19:40:56 -05:00
TehRealSalt
a30563da22 Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately 2018-11-21 19:30:00 -05:00
TehRealSalt
f65a8796df SPB retargets the same person after death 2018-11-21 19:22:28 -05:00
TehRealSalt
e07e89055d Remove drift & pogo spring on hit and a few other places 2018-11-21 19:00:14 -05:00
Monster Iestyn
4a88ddf897 Merge branch 'disappearing-servers-fix' into 'master'
Disappearing servers fix

See merge request STJr/SRB2!334
2018-11-21 17:12:37 -05:00
Monster Iestyn
3acc312923 Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop. 2018-11-21 20:45:03 +00:00
Monster Iestyn
66900c70ee Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
Monster Iestyn
948466658f Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
TehRealSalt
b03d87c80a Be more consistent with how we lock kartspeed/kartweight
- The skin values are now locked between 1 and 9.
- kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value.
- Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds.
- Removed the overzealous weight locking when in offroad.

If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.
2018-11-20 02:59:10 -05:00
TehRealSalt
5c67e22c22 Random map buffer only gets added to when
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
TehRealSalt
9a4ebb916a Allow yeah in splitscreen 2018-11-20 00:10:54 -05:00
TehRealSalt
9b1c2b8dc0 Make Map Hell a 1% chance 2018-11-19 23:41:15 -05:00
TehRealSalt
9b7eea408d Change "player" to "user" to make it easier to read 2018-11-19 23:13:09 -05:00
TehRealSalt
0a3183aa82 Don't shrink spectators
Another typo here
2018-11-19 23:07:53 -05:00
TehRealSalt
c6053c8265 Don't do wipeout dust for spectators 2018-11-19 23:06:31 -05:00
TehRealSalt
555deddb6a Offroad effect fixes
- Make dust retain some of your speed so it's more visible
- Only play effect when moving and on the ground
2018-11-19 22:45:12 -05:00
TehRealSalt
4590d5c5cf Fix SKINCOLOR_ prefix not registering in Lua 2018-11-19 22:38:54 -05:00
TehRealSalt
39e644a7f5 Move countdown setting to P_CheckRacers
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
Steel Titanium
d16888b611 Restore patch.dta, but commented out just in case. 2018-11-19 18:22:11 -05:00
Monster Iestyn
2d1f927a17 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...that was a mouthful
2018-11-19 22:12:26 +00:00
Steel Titanium
f398300fd1 Update CMakeLists.txt 2018-11-19 13:55:33 -05:00
Monster Iestyn
418943acdc change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn
797f9d180e Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages 2018-11-19 17:46:38 +00:00
TehRealSalt
20ac8ed126 Mistake 2018-11-18 23:31:36 -05:00
Alam Ed Arias
f34e1edb4d Travis-CI: allow GCC 8.x to fail 2018-11-18 21:25:33 -05:00
Alam Ed Arias
a290c4727b Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias
42afd3532d Merge branch 'master' into next 2018-11-18 20:22:40 -05:00
Alam Ed Arias
0b5069f36c We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias
5a09d44fd2 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00
Monster Iestyn
ab39534ef6 Merge branch 'mingw-64bit' into 'master'
MinGW: Fix compiling on 64-bit Windows.

See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
Steel Titanium
9ff0761ab2 Remove 64-bit libgme 2018-11-18 18:24:03 -05:00
Steel Titanium
243f4eedd8 Statically link stdc++ and libgcc into libgme
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05:00
TehRealSalt
ce9f95ce6b Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next 2018-11-18 17:57:12 -05:00
TehRealSalt
a68550600d Merge remote-tracking branch 'kartinternal/master' 2018-11-18 17:53:49 -05:00
TehRealSalt
b58cbd2c08 Move Shrink out of P_DamageMobj 2018-11-18 17:51:49 -05:00
TehRealSalt
a3211df748 Apply banana drag effect to offroad 2018-11-18 17:01:43 -05:00
Sal
22b3a29d12 Merge branch 'countdown-on-all-win' into 'master'
Finish countdown only starts when all winners are declared

See merge request KartKrew/Kart!99
2018-11-18 16:09:09 -05:00
Sal
ddff42d9e0 Merge branch 'avoid_fixing_manual' into 'master'
Avoid Modifying Default Controller Layout Manual Page

See merge request KartKrew/Kart!102
2018-11-18 16:07:33 -05:00
Sal
b47d10645a Merge branch 'show16playersinrankings' into 'master'
Fix the player in 16th not being visible in rankings

See merge request KartKrew/Kart!103
2018-11-18 16:02:32 -05:00
Sal
0aa251b18a Merge branch 'nextmerge_again' into 'master'
Nextmerge again

See merge request KartKrew/Kart!101
2018-11-18 16:01:09 -05:00
toaster
ffcb6eb6ab Merge branch 'fix-memory-leak' into 'master'
Fix the Memory Leak

See merge request KartKrew/Kart!100
2018-11-18 15:11:49 -05:00
toaster
a6d48f0ef4 Fix the player in 16th not being visible in rankings 2018-11-18 20:05:17 +00:00
toaster
cdeeac6ba1 Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30) 2018-11-18 19:31:07 +00:00
toaster
c5a6460e18 Update ASSET_HASH_PATCH_KART for the latest patch.kart 2018-11-18 18:28:46 +00:00
toaster
aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
2018-11-18 18:26:50 +00:00
Monster Iestyn
8c71cd0b90 Merge branch 'master' into next 2018-11-18 17:11:57 +00:00
Sryder
4ee48194c4 Fix the Memory Leak
The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.
2018-11-18 14:43:31 +00:00
toaster
0720264bc2 Negate (netgame || multiplayer) condition for countdown to use defaultvalue instead of value per the specifics of the previous implementation 2018-11-18 09:10:26 -05:00
Monster Iestyn
a400bb9ef6 Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix

See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
Sryder
24a551238d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-11-18 12:33:27 +00:00