Commit graph

6493 commits

Author SHA1 Message Date
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
Steel Titanium
dc273d3f23 Merge branch 'next' into jimita-flashpals-on-screenshots 2019-05-25 19:37:17 -04: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
Jaime Passos
d3dfd77ae7 Hardware mode y-shearing matches software mode mouselook 2019-05-17 17:49:04 -03:00
Jaime Passos
315f941573 dude how do I co-author in Git? 2019-05-17 13:18:33 -03: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
Monster Iestyn
600a373739 Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Monster Iestyn
2a9019c15e Merge branch 'archiveworld-sigsegv-fix' into 'next'
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.

See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
Alam Ed Arias
addf2bb3c4 Fix NONET build 2019-05-13 01:51:36 -04:00
Steel Titanium
8a14427420 Merge branch 'perpetual-modifier-updates' into 'master'
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Steel Titanium
06961a8f5e Merge branch 'no-frameskip' into 'next'
Don't skip frames when connecting or paused

See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
Steel Titanium
cad65ad5e9 Properly fix crash due to duplicated lines. 2019-05-13 00:23:43 -04:00
Steel Titanium
4e0cc2505a Revert "Check that lumps are okay"
This reverts commit 7ac0a8b4d2.
2019-05-13 00:20:39 -04: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
James R
7ac0a8b4d2 Check that lumps are okay 2019-05-08 20:30:19 -04:00