Commit graph

7958 commits

Author SHA1 Message Date
James R
2610163096 Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.

(cherry picked from commit bf90fbb91f28af30ff79523681e7f73e60121535)
2020-07-15 14:47:16 -07:00
Sryder
f1ba06351c Merge branch 'float-in-mobjscale' into 'master'
Rings float height is not mobjscaled!

See merge request KartKrew/Kart!295
2020-07-14 07:54:29 -04:00
James R
716898ebf6 Probably a good idea to flip with mobjscaled height 2020-07-13 19:58:00 -07:00
James R
f348cd0f1f Multiply ring float height by mobjscale 2020-07-13 19:55:00 -07:00
James R
56da04bdec Merge branch 'compiler-error' into 'master'
Compiler warnings

See merge request KartKrew/Kart!293
2020-07-10 21:32:26 -04:00
Sryder
ae249b2f67 Merge branch 'pathfind-shadowed-declaration' into 'master'
Fix shadowed declaration in pathfind code

See merge request KartKrew/Kart!294
2020-07-10 09:14:19 -04:00
James R
65550cc9b7 Make drift explode animation LONGER 2020-07-09 18:03:27 -07:00
Sryder
376f4d3116 Fix shadowed declaration in pathfind code 2020-07-10 01:32:46 +01:00
James R
dc83e6ee0b Merge remote-tracking branch 'origin/master' into driftboost 2020-07-09 16:48:33 -07:00
James R
856eda9f95 Don't scale drift explosion 2020-07-09 16:48:21 -07:00
James R
f1648fbf5c Followers compiler warnings 2020-07-09 16:39:47 -07:00
James R
8399079f35 Merge branch 'followme-internal' into 'master'
Followers

See merge request KartKrew/Kart!252
2020-07-09 19:15:37 -04:00
Latapostrophe
fb978f9b91 Merge branch 'v2-master' into followme-internal 2020-07-09 23:34:24 +02:00
Sryder
7d17046942 Merge branch 'flameshield-dist' into 'master'
Fix Flameshield in mapobjectscale maps.

See merge request KartKrew/Kart!292
2020-07-09 12:59:17 -04:00
Sryder
c6c81c7fab Fix Flameshield in mapobjectscale maps.
FixedMul instead of FixedDiv
2020-07-09 17:54:28 +01:00
Sal
e81c192a9f Merge branch 'replay-hut-addon-crash-fix' into 'master'
Fix replay hut menu crashing when trying to display missing skins 2 electric boogaloo

See merge request KartKrew/Kart!291
2020-07-09 02:05:13 -04:00
James R
e250796886 WIP "Drift explosion" 2020-07-08 21:30:34 -07:00
SteelT
d67ad1a08f Fully fix replay hut crashing if addons isn't loaded. 2020-07-09 00:29:46 -04:00
James R
47a7c285de Merge branch 'pathfind-realloc-fix' into 'master'
Pathfinding reallocation fix

See merge request KartKrew/Kart!290
2020-07-08 22:05:18 -04:00
Sal
5397594ceb Merge branch 'i-am-jimita' into 'master'
Line feeds don't work when drawing strings

See merge request KartKrew/Kart!289
2020-07-08 18:54:01 -04:00
Sryder
87069a86d8 Fix the cause of the waypoint debug message spam in Canyon Rush.
Not calling the indexchanged callback here meant that if K_BHeapSortDown didn't make any changes, the item at index 0 would never call the callback despite changing position.
2020-07-08 21:36:28 +01:00
Sryder
c7a00d4800 Update pointers to nodes when the nodesarray is reallocated.
Fixes crash in Gust Planet.
2020-07-08 18:01:47 +01:00
James R
1af2ecdf15 Wow!
(cherry picked from commit be01a5917639f4b05de99ef92bdafb50a204ee56)
2020-07-05 18:40:37 -07:00
lachwright
d62f4d4d1a Merge remote-tracking branch 'origin/master' into spindash 2020-07-06 08:10:22 +08:00
lachwright
8ab98011f6 Spindash charge (WIP) 2020-07-06 08:10:03 +08:00
Latapostrophe
01ecc8573a Actually use the proper player for followercolor, for real this time 2020-06-14 17:06:46 +02:00
Latapostrophe
6d07126283 Use the proper player to save followercolor in replays this time around 2020-06-14 16:59:46 +02:00
Latapostrophe
4eac7f8366 Merge branch 'v2-master' into followme-internal 2020-06-10 23:38:19 +02:00
Sal
07cf9cddf1 Merge branch 'v2-nametags-crash' into 'master'
Fix potentially NULL colormap on nametags upon joining a netgame

See merge request KartKrew/Kart!287
2020-06-10 17:37:11 -04:00
Latapostrophe
c98b76bf32 Fix potentially NULL colormap on nametags upon joining a netgame 2020-06-10 23:32:26 +02:00
Latapostrophe
9fec0562c9 Don't do anything if you somehow have a negative follower in menus 2020-06-10 23:21:25 +02:00
Sal
929dddfa75 Merge branch '169-string-offset' into 'master'
Fix text alignment in 16:9 (closes #77)

Closes #77

See merge request KartKrew/Kart!286
2020-06-10 17:15:21 -04:00
Sal
5870652f73 Merge branch 'replay-menu-crash' into 'master'
Fix replay hut menu crashing when trying to display missing skins

See merge request KartKrew/Kart!285
2020-06-10 17:14:25 -04:00
Latapostrophe
fbd10d0e6c Fix a bruh moment where I deleted follower from relinkpointers when fixing a conflict and it broke every netgame :oh: 2020-06-10 22:52:32 +02:00
Latapostrophe
84a31e288f Fix some V_FLIP stuff in player/follower drawing 2020-06-09 20:09:18 +02:00
Latapostrophe
478e9cee7c Use P_SetTarget 2020-06-09 19:59:46 +02:00
Latapostrophe
396bd69e84 Don't save follower skin in replays if there's no follower... 2020-06-09 18:10:09 +02:00
James R
b5df372143 Don't offset left side of V_DrawStringScaled
This line wasn't in the the original functions,
I don't know where I got it from. :V
2020-06-09 01:44:49 -07:00
lachwright
8087352f9e Spindash: new braking 2020-06-09 05:27:05 +08:00
Latapostrophe
3914128ce3 Check for missing skin before the lump 2020-06-08 22:11:42 +02:00
Latapostrophe
232cc1a20b Fix replay hut crashing when skins were missing 2020-06-08 22:00:24 +02:00
lachwright
b4057d10e7 Merge branch 'master' into spindash 2020-06-09 03:55:55 +08:00
Sal
39898e6db9 Merge branch 'hyper-spin' into 'master'
Let first person camera work in demos (closes #46)

Closes #46

See merge request KartKrew/Kart!264
2020-06-08 15:01:36 -04:00
Sal
7555177cb1 Merge branch 'viewpoint-reset' into 'master'
Reset some viewpoints properly (closes #69)

Closes #69

See merge request KartKrew/Kart!282
2020-06-08 15:01:25 -04:00
Sal
0d371cfb18 Merge branch 'chat-colors-broken' into 'master'
Fix chat messages showing garbage before the name (closes #78)

Closes #78

See merge request KartKrew/Kart!284
2020-06-08 15:01:16 -04:00
Latapostrophe
406d7c0b32 Remove old debug prints 2020-06-08 20:37:27 +02:00
Latapostrophe
ef45949202 Fix followercolor not being saved in replays 2020-06-08 20:36:48 +02:00
James R
5f39dba432 Don't add color code to string address 2020-06-07 19:36:29 -07:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Latapostrophe
3954e1770b Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-06-07 23:56:22 +02:00