Commit Graph

6209 Commits

Author SHA1 Message Date
Sryder 935fec1e15 Fix compatibility with the MS (Specifically Doomseeker)
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
wolfs c96f5dba0c Merge branch 'v1-errors' into 'master'
V1 errors

See merge request KartKrew/Kart-Public!140
2019-05-28 22:13:19 -04:00
James R b15cea53e6 Fix XCode compiler errors
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
James R f070bd2d4d Fix GCC 8 Travis error 2019-05-28 19:00:24 -07:00
James R 6d4cdfaab7 Fix compiler errors
The truncation handling in this one spot is okay, but the compiler isn't smart
enough for it. I'm leaving it as a warning because I'd like to make a dedicated
function for handling snprintf truncation in the future.
2019-05-28 15:11:37 -07:00
James R 71e3ec55bf Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 995edfb1e8.
2019-05-28 15:09:29 -07:00
James R cf36490ca6 Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
wolfs 4743e4bac8 Merge branch 'v1-lua-stuff' into 'v1'
V1 lua stuff

See merge request KartKrew/Kart!155
2019-05-28 07:59:45 -04:00
wolfy852 c28e1702eb Don't guard the return 2019-05-28 06:56:35 -05:00
wolfy852 e266f72a1c Update patch.kart hash
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
wolfs a562673d3f Merge branch 'fix-postprocessing' into 'v1'
Fix Post Processing in 64-bit Software 3P/4P

See merge request KartKrew/Kart!156
2019-05-28 06:35:33 -04:00
Sryder ab7246d1f7 Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R 995edfb1e8 Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit a2a63c5e7f.
2019-05-27 14:20:12 -07:00
James R 06ddf55709 wip 2019-05-27 14:20:07 -07:00
Sryder a2a63c5e7f Fix Post Processing in 64-bit Software 3P/4P
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfs 65763b8745 Merge branch 'spinout-angle' into 'v1'
Spinout angle change when boosting

See merge request KartKrew/Kart!153
2019-05-26 20:10:56 -04:00
wolfs fd9f5b8f58 Merge branch 'fix-brakes' into 'v1'
Make brakes stronger

See merge request KartKrew/Kart!154
2019-05-26 20:10:46 -04:00
Latapostrophe a7917cb4b9 Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe cb74228469 fix banana's SpinPlayer using the wrong inflictor 2019-05-26 11:19:26 +02:00
Latapostrophe 55815eb829 Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
Latapostrophe e42e567489 Move the friction change out of the offroad check 2019-05-25 14:13:35 +02:00
Latapostrophe 93740dc854 add k_booostangle to dehacked 2019-05-25 14:11:26 +02:00
Latapostrophe d4d794ceac give friction to brakes 2019-05-25 13:51:19 +02:00
Latapostrophe 78c2c54a87 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
James R 2fb4dd73fc Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R 05dde43423 Acknowledge fallback models as an OGL option indeed
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
wolfy852 59ca91a825 Fix the permanent instashield bug 2019-05-17 08:06:18 -05:00
wolfy852 ea90778c32 More credits updates 2019-05-17 03:55:51 -05:00
Latapostrophe a40ff75025 SPB intangibility 2019-05-17 03:55:23 -05:00
wolfy852 66439fe812 Update bonuschars credits 2019-05-13 12:49:44 -05:00
wolfy852 7cc5fddbd8 Fix viewpoint being reset on boost when spectating 2019-05-12 16:38:50 -05:00
wolfy852 68ad2a9932 Fix rewind previews not showing for player 1 2019-05-12 14:42:39 -05:00
wolfy852 334056a77d whoops
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05:00
wolfy852 f61f7f4411 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852 90e4a45aa4 Have Look Back reset your color to prefcolor 2019-05-12 03:21:46 -05:00
Alam Arias 3b308c6aa4 Merge branch 'master' into next 2019-05-09 23:12:38 -04:00
Alam Arias 2f31dd3ab7 fix the array-bounds warning by setting a upper limit 2019-05-09 23:11:26 -04:00
Alam Arias 38f33027a0 fix the array-bounds warning by setting a upper limit 2019-05-09 23:10:23 -04:00
Alam Arias 571e9be7d8 fix up misleading indentation of a if statement 2019-05-09 23:03:32 -04:00
Sal a9baf71a65 Merge branch 'upstream-merge' into 'next'
Upstream merge of next

See merge request KartKrew/Kart-Public!139
2019-05-09 19:13:58 -04:00
wolfy852 9df84082e9 Default billboarding to "On" 2019-05-08 00:17:21 -05:00
wolfy852 a357a38ae1 Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge 2019-05-07 21:43:12 -05:00
wolfs e394f41c52 Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
wolfy852 777f1675fc Correct a merge mistake 2019-05-07 02:06:59 -05:00
wolfy852 b98f8f7504 Battle, not Match 2019-05-07 01:34:49 -05:00
wolfy852 2c363c4e1e Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt 167f0bfe8b Forgot to update date 2019-05-06 22:54:47 -04:00
TehRealSalt 4308d3b681 Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
Sal c5577526c5 Merge branch 'cherry-pick-dfc4b22c' into 'v1'
Merge branch 'version-prep' into 'master'

See merge request KartKrew/Kart!150
2019-05-06 22:06:31 -04:00
Sal 5022cde443 Merge branch 'version-prep' into 'master'
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

183e75ff Final v1 colors
9629fb32 Modify the first shade of Byzantium
39bea80b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
f99a5a6a Fix wheel animations
fd148ec2 Dumbass typo
e772a750 Missed a spot
3d71a0aa Merge branch 'next-colors' into 'v1'
071b335d Merge branch 'anim-fix' into 'v1'
0cd815cb Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
2019-05-06 22:05:56 -04:00