Commit graph

6420 commits

Author SHA1 Message Date
Sryder
636724aeb6 Stop OpenGL having infinite precipitation draw distance 2019-06-19 20:05:20 +01:00
Sryder
3c64cdc6ed Merge branch 'playerinfo_mscompat' into 'master'
Fix compatibility with the MS (Specifically Doomseeker)

See merge request KartKrew/Kart-Public!142
2019-06-19 14:57:41 -04:00
Sryder
3d6161c7ca 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
James R
8faff03f31 Index displayplayers correctly 2019-06-10 14:24:11 -07:00
James R
6bee5435d2 Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD 2019-06-09 14:22:32 -07:00
James R
62b957d348 Revert "Unfuck MS connecting and error reporting"
This reverts commit 50ae248b84.
2019-06-09 14:21:04 -07:00
James R
a8d1ddd1c2 Revert "Check error on select"
This reverts commit 1d77716d7e.
2019-06-09 14:20:33 -07:00
James R
154ce80a9b Revert "Force of habit"
This reverts commit 9f0887fafc.
2019-06-09 14:20:32 -07:00
Sryder
96f92f8183 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange
# Conflicts:
#	src/k_kart.c
2019-05-31 22:29:32 +01:00
Sal
2ce77fdce9 Merge branch 'rings' into 'master'
Rings

See merge request KartKrew/Kart!128
2019-05-30 01:58:34 -04:00
TehRealSalt
3967a5d409 Reduce angle offset back down again 2019-05-30 01:46:25 -04:00
TehRealSalt
ccdcb1dbd4 Minor change 2019-05-29 23:31:33 -04:00
TehRealSalt
dfe197b380 Double ring rotate speed, base it off current angle, slightly offset it 2019-05-29 23:21:58 -04:00
TehRealSalt
8ca96168b9 enable patch file 2019-05-29 23:19:52 -04:00
TehRealSalt
cba86ee6ea Unused i 2019-05-29 22:55:59 -04:00
TehRealSalt
d7374d33d6 missed a parathesis 2019-05-29 22:53:31 -04:00
TehRealSalt
4e24831e33 Reduce kartspeed increase to draftpower 2019-05-29 22:38:08 -04:00
TehRealSalt
4f13f8b98e Change version num to v2, disable 1.0.x demo compatiblity 2019-05-29 22:29:06 -04:00
TehRealSalt
31534fe96b Merge branch 'master' into versus-record 2019-05-29 22:23:17 -04:00
TehRealSalt
e8edfb03fb Merge branch 'master' into rings 2019-05-29 22:15:05 -04:00
TehRealSalt
0bfe8249d4 Fix Garden having a few steel blues from improper conversion
This has been bothering me for a while
2019-05-29 21:53:21 -04:00
TehRealSalt
792b41c406 Merge branch 'v1' into master 2019-05-29 21:50:14 -04:00
wolfs
ab88884351 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
2b79547512 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
88ba895d18 Fix GCC 8 Travis error 2019-05-28 19:00:24 -07:00
James R
d8967112c6 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
9ec9c639dd Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 392f357b1a.
2019-05-28 15:09:29 -07:00
James R
c0e7c17cce Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
TehRealSalt
cedbed20b3 Draft speed increases with kartspeed 2019-05-28 12:48:54 -04:00
wolfs
6b568e4f43 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
1a038ad463 Don't guard the return 2019-05-28 06:56:35 -05:00
wolfy852
96b5a1df43 Update patch.kart hash
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
wolfs
4acec35221 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
01a0fb1c8f Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R
392f357b1a Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit 1a9b21c195.
2019-05-27 14:20:12 -07:00
James R
88d5e9b7d2 wip 2019-05-27 14:20:07 -07:00
Sryder
1a9b21c195 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
TehRealSalt
127935edc2 New papersprite sparkle effect 2019-05-27 00:03:02 -04:00
wolfs
93a91e222d 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
7420795f1f Merge branch 'fix-brakes' into 'v1'
Make brakes stronger

See merge request KartKrew/Kart!154
2019-05-26 20:10:46 -04:00
Latapostrophe
1bcebaadfd Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe
ba3e682e0e fix banana's SpinPlayer using the wrong inflictor 2019-05-26 11:19:26 +02:00
Latapostrophe
142c6aacac Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
Latapostrophe
d97a0ce2b4 Move the friction change out of the offroad check 2019-05-25 14:13:35 +02:00
Latapostrophe
cb8af8eb95 add k_booostangle to dehacked 2019-05-25 14:11:26 +02:00
Latapostrophe
8628a543a5 give friction to brakes 2019-05-25 13:51:19 +02:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
James R
38360f29ec Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R
e1451b7a98 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
Sryder
7756620028 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange
# Conflicts:
#	src/k_kart.c
2019-05-17 22:39:01 +01:00