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
f0ff7e7b05
Merge branch 'master' into model-gradients
2019-05-29 22:10:45 -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
c6a0a41d1a
Model tilts
...
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
2019-05-28 17:21:22 -04: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
TehRealSalt
e1d73d0e35
Tiny optimization
2019-05-26 15:20:16 -04:00
Latapostrophe
1bcebaadfd
Lua fixes + new drawOnMinimap function
2019-05-26 15:05:10 +02:00
TehRealSalt
ee60e6d76c
Minor touchup to colorization code
2019-05-26 07:44:40 -04:00
TehRealSalt
179bb2bd8b
Update colorize blending
...
Didn't notice for a moment that it was back to 2.0-style rainbow blending -- this is horrible but it keeps the brightness of the textures in-tact
2019-05-26 06:22:14 -04: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
TehRealSalt
dca1a05a7f
Gradient skincolors for MD2 blend textures
2019-05-26 03:41:18 -04: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
Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01: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
wolfy852
519a289373
Fix the permanent instashield bug
2019-05-17 08:06:18 -05:00
wolfy852
1c52319d08
More credits updates
2019-05-17 03:55:51 -05:00
Latapostrophe
cd4b9abb78
SPB intangibility
2019-05-17 03:55:23 -05:00
TehRealSalt
1e2c7e3461
Update combi-band colors
2019-05-14 23:00:15 -04:00
TehRealSalt
bb6fe9fc54
Merge branch 'master' into rings
2019-05-14 22:26:22 -04:00
Sal
33492573f4
Merge branch 'new-palette' into 'master'
...
New palette
See merge request KartKrew/Kart!151
2019-05-14 22:16:35 -04:00
TehRealSalt
ce39456a24
Merge branch 'v1' into new-palette
2019-05-14 21:01:32 -04:00
TehRealSalt
407344299c
Rename colors
...
My attempt at compromise didn't work, so I'll just have it my way
2019-05-14 21:00:40 -04:00
TehRealSalt
ddaf5658d5
Finish skincolors
...
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
2019-05-13 23:21:07 -04:00
wolfy852
f3b6b732f8
Update bonuschars credits
2019-05-13 12:49:44 -05:00
TehRealSalt
62aeeea9cb
Fix a couple of things not using pure white
2019-05-13 12:50:36 -04:00
