Commit graph

7017 commits

Author SHA1 Message Date
Sal
e23027d678 Merge branch 'let-there-be-var' into 'master'
Change netvars in replays

See merge request KartKrew/Kart!234
2020-04-22 16:40:29 -04:00
Sal
9671090d06 Merge branch 'distance-to-finland' into 'master'
More consistent finish line distance & positions

See merge request KartKrew/Kart!237
2020-04-22 16:40:19 -04:00
Sal
fc32689b36 Merge branch 'folders-plus' into 'master'
Directory revision

See merge request KartKrew/Kart!231
2020-04-15 16:13:39 -04:00
Sal
80ce1c7c6d Merge branch 'dropstuff' into 'master'
Item drop code cleanup

See merge request KartKrew/Kart!236
2020-04-15 16:12:55 -04:00
Sally Cochenour
371cc18bf6 Update ALL finish line distances & positions, separately, before player thinkers happen, ensuring it's never inaccurate 2020-04-12 21:04:07 -04:00
Sal
71b6c44af0 Merge branch 'spb-shit' into 'master'
Fix item distances underflowing in rare instances due to order of operations

See merge request KartKrew/Kart!235
2020-04-10 13:51:27 -04:00
Sally Cochenour
8b5bd645ca See if cleaning the pointer here fixes shrink/eggbox syncbombs 2020-04-09 22:57:05 -04:00
Sally Cochenour
9b4e10d5d7 Item dropping code cleanup 2020-04-09 22:56:31 -04:00
Sally Cochenour
c8da95cbda Revert "Fix being able to hold items to get them as early as possible"
This reverts commit 43732b386d.
2020-04-09 21:05:46 -04:00
Sally Cochenour
43732b386d Fix being able to hold items to get them as early as possible
(Doesn't matter in v2 because it'd waste your rings to do it, but y'know how it is. Maybe port for v1.2 if it works?)
2020-04-09 20:57:21 -04:00
Sally Cochenour
1618d61bfc Fix potential overflow 2020-04-09 20:56:15 -04:00
James R
ccc746fbf4 Change netvars in replays 2020-04-09 17:21:30 -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
James R
3fa22c508b Put screenshots, movies and replays under a "media" directory 2020-03-30 17:41:48 -07: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
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
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
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
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
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
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
Sally Cochenour
8a3c7ad2fb Add fire trail to flame shield 2020-03-26 03:13:49 -04:00
Sally Cochenour
7ec398e579 Slow down animation speed, fix meter bugs 2020-03-26 03:13:10 -04:00
Sally Cochenour
bf221c7afa Another bugfix for hyu stuff 2020-03-26 01:16:04 -04:00
Sally Cochenour
4ddf1e4280 Don't allow k_flamedash to damage without flame shield 2020-03-26 01:14:57 -04:00
Sally Cochenour
b6c282ec12 Move Eggman item code to k_collide 2020-03-26 00:47:30 -04:00
Sally Cochenour
985aa44c95 Flame shield destroys items while being used 2020-03-26 00:47:03 -04:00
Sally Cochenour
6333dc4737 Thrust slightly when used in the air 2020-03-26 00:07:03 -04:00
Sally Cochenour
46209a96cf Double leniency period 2020-03-25 23:52:45 -04:00
Sally Cochenour
81fa5d7f51 Start on new flame shield dash visuals 2020-03-25 23:49:39 -04:00
Sally Cochenour
505b0176c0 Horizon line apply to FOFs backport 2020-03-25 22:30:52 -04:00
Latapostrophe
6d0513aa9a Fix conflict 2020-03-25 23:31:53 +01:00