SteelT
7f5913a516
Merge branch 'fix-keepbody-ping' into 'master'
...
Fix disconnected players being kicked for high ping
See merge request STJr/SRB2!866
2020-03-31 20:25:43 -04:00
James R
9bdebe51bf
Fix a dumb warning
2020-03-31 16:54:20 -07:00
James R
c5a5d95a24
Use KART_ITEM_ITERATOR for the lua constants
2020-03-31 16:52:41 -07:00
James R
6975de85b4
Call the substitution macro FOREACH
2020-03-31 16:45:36 -07:00
James R
1243d0940a
Merge remote-tracking branch 'origin/master' into more-debug
2020-03-31 16:44:04 -07:00
James R
4a3a4c0801
This won't be needed
2020-03-31 15:50:39 -07:00
James R
e4094bc2a9
Remove some redundant code
2020-03-31 15:26:22 -07:00
James R
735dd26dc6
Put downloads in addons/downloads instead of DOWNLOAD
2020-03-31 15:23:24 -07:00
Sryder
f190e3bd9e
Merge branch 'fix-waypoint-joins' into 'master'
...
Fix joining netgames not loading up waypoints correctly
See merge request KartKrew/Kart!230
2020-03-31 11:34:15 -04:00
Sryder
902bbb447f
Missed a function header comment in k_waypoint.c
2020-03-31 16:31:01 +01:00
Sally Cochenour
29613dba90
Merge branch 'master' into pet-robo
2020-03-31 10:47:03 -04:00
James R
3fa22c508b
Put screenshots, movies and replays under a "media" directory
2020-03-30 17:41:48 -07:00
Sally Cochenour
fb550f2868
Slightly smarter sneaker usage
...
- Use sneaker if held for too long without a proper use
- Use sneaker if losing too much speed
- Use sneaker if you have another boost (tether, boosters)
- Add triple sneaker & rocket sneaker support
- Don't go towards shortcut waypoints without a shortcut item
- Bots get naturally better handling
2020-03-30 17:17:20 -04:00
Louis-Antoine
dece2adbe6
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02:00
Sryder
956222ad86
Fix joining netgames not loading up waypoints correctly.
...
Mobjs get deleted and loaded from net save. The mobjs in the waypoints need to load into the correct waypoints again.
This doesn't save/load the entire waypoints, so they still cannot be edited/added/removed mid-game.
2020-03-30 20:43:01 +01:00
Monster Iestyn
8aed1de7de
use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
...
(though I could pretend we still support the older ones lol)
2020-03-30 20:25:56 +01:00
Monster Iestyn
4ddb1d170a
Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions.
2020-03-30 19:58:46 +01:00
Sal
860885e2b9
Merge branch 'new-item-sprites' into 'master'
...
Add new item box sprites
See merge request KartKrew/Kart!229
2020-03-30 12:34:52 -04:00
Sally Cochenour
69a67376b3
Oni's suggestions
...
- Only look for players who can pick up the item. Serves as a subtle tell for other players holding onto items, and lets you see the canon color more often
- Held eggman item uses black instead of player color
- Fix karma items not animating
2020-03-30 07:43:22 -04:00
Sally Cochenour
266ad99374
Add new item sprites
2020-03-30 06:57:42 -04:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Sally Cochenour
774c85d660
Rudimentary item usage code
2020-03-29 19:56:05 -04:00
Sally Cochenour
102aca3ab4
Bots have a dumb path prediction
2020-03-29 18:00:35 -04:00
Sally Cochenour
0ef12d3cce
Properly use bot movement when exiting
2020-03-29 17:59:26 -04:00
Sally Cochenour
2e4b1c6ecb
Help reduce waypoint flickering by using closest waypoint to finish line
2020-03-29 17:58:17 -04:00
Sally Cochenour
896f752d94
Fix the compile errors I got
...
- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
2020-03-29 08:39:15 -04:00
Sal
f63b321eb2
Merge branch 'spb-waypoints' into 'master'
...
Dangerous SPB
See merge request KartKrew/Kart!227
2020-03-29 07:58:08 -04:00
Sal
7d1a7b0768
Merge branch '2.2-frames' into 'master'
...
Use the 2.2 frame characters
See merge request KartKrew/Kart!228
2020-03-29 07:34:09 -04:00
Sal
f8905982dc
Merge branch 'gifs-port' into 'master'
...
OpenGL GIF/Flashpal/Color Profile port
See merge request KartKrew/Kart!223
2020-03-29 07:33:48 -04:00
Latapostrophe
b6ae224b18
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master
2020-03-29 10:01:58 +02:00
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
James R
1b6256bd89
Use the 2.2 frame characters
2020-03-28 20:57:27 -07:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
Sally Cochenour
15bda7da2d
Use K_MomentumToFacing to give bots a bit better traction
2020-03-28 14:57:49 -04:00
Sally Cochenour
ff621d3e46
Skins, rudimentary ticcmd building for bots
2020-03-28 12:39:27 -04:00
Louis-Antoine
b0b21aada6
Fix disconnected players being kicked for high ping
2020-03-28 15:23:15 +01:00
Latapostrophe
8960152a7c
Merge branch 'v2-master' into spb-waypoints
2020-03-28 15:12:38 +01:00
Latapostrophe
67f7fe2cc5
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master
2020-03-28 15:11:28 +01:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sryder
26646e57e3
Merge branch 'flame-visual' into 'master'
...
Firework frames for fire shield
See merge request KartKrew/Kart!226
2020-03-28 08:10:16 -04:00
Sally Cochenour
9a8e3aecd9
Fix papersprite appearing on wrong frames
2020-03-28 06:19:25 -04:00
Sally Cochenour
bee6bbf619
Firework frames for fire shield
2020-03-28 03:56:39 -04:00
Sal
5dad8d125a
Merge branch 'horizon-line-update' into 'master'
...
Horizon line apply to FOFs backport
See merge request KartKrew/Kart!225
2020-03-28 00:28:37 -04:00
Sal
683e905ff1
Merge branch 'new-items' into 'master'
...
New items
See merge request KartKrew/Kart!165
2020-03-28 00:27:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
2ca00cf2e9
Try to prevent bubble from going out of bounds
2020-03-28 00:21:41 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
toaster
0f591967ff
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
toaster
c74dde0f0f
Minor optimisations surrounding R_DrawFlippedMaskedColumn.
...
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
2020-03-26 16:09:19 +00:00
Sally Cochenour
d1580a5b42
More Flame Shield visuals
2020-03-26 08:48:02 -04:00