thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-05 14:06:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14498 commits 2 branches 14 tags 207 MiB
Commit graph

14498 commits

This branch
This branch
All branches
Author SHA1 Message Date
toasterbabe
32ee846c4a * Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector. 
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
 2019-07-17 21:34:04 +01:00
toaster
c9b560b083 Fix spindash being broken in quicksand 
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
 2019-07-17 21:33:18 +01:00
Sryder
564fa58c77 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-07-17 21:29:35 +01:00
Sryder
0767f4b8aa Merge branch 'public-master' into 'master' 
Changes in public master

See merge request KartKrew/Kart!163
 2019-07-17 16:27:32 -04:00
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
James R
e123b2acd7 Stop drawing after the scores hud 2019-07-17 12:29:10 -07:00
Sryder
316c7fe7ee Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-07-17 20:23:30 +01:00
Sal
e9cd3073e0 Merge branch 'upside-down-rings' into 'master' 
Correctly animate rings in reverse gravity

See merge request KartKrew/Kart!159
 2019-07-17 15:15:41 -04:00
Sryder
ad034a083b Merge branch 'copy-slope-thing-spawning-backport' into 'master' 
Copy slope thing spawning fix backport

See merge request KartKrew/Kart!160
 2019-07-17 15:14:44 -04:00
Nev3r
35ebe947c4 Things spawning over copied slopes now properly align on the new plane 
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-07-17 12:04:14 -07:00
James R
d82e86d4cd Declare z in scope under case 2019-07-16 20:06:26 -07:00
Steel Titanium
1d5f417a86 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium
93acb98aa7 New icons 
Also update IMG_xpm.c
 2019-07-16 19:20:00 -04:00
TehRealSalt
407157496a Fix colors looking washed-out on models 2019-07-16 16:03:31 -04:00
Monster Iestyn
f266eda97b Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Monster Iestyn
f563f95c32 Merge branch 'master' into next 2019-07-16 18:26:46 +01:00
Monster Iestyn
784fc70e7e Merge branch 'fix-gme-free' into 'master' 
Fix crash with GME sounds when being freed

See merge request STJr/SRB2!504
 2019-07-16 13:25:51 -04:00
Monster Iestyn
82cfd76402 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00
Steel Titanium
83eab15c78 menu stuff 2019-07-16 00:07:55 -04:00
James R
6fdfd3b90c Don't send login final hashes to everyone 
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.

P.S. The netcode is LOL XD by VincyTM -Telos
 2019-07-15 16:14:00 -07:00
Monster Iestyn
b0f30ca0df Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. 
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
 2019-07-15 20:25:57 +01:00
Monster Iestyn
b53f5ec41f Merge branch 'titlesky-fixes' into 'master' 
Titlemap fixes

See merge request STJr/SRB2Internal!258
 2019-07-14 19:38:07 -04:00
Monster Iestyn
a424fce29d Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn
1ec917f44e remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn
5303475033 Fixes for menus: 
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
 2019-07-14 21:58:48 +01:00
Steel Titanium
db525c43a7 Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn
157808c0b5 The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol. 
(Neither were the CTF starts but those didn't directly cause any problems luckily)
 2019-07-14 18:10:03 +01:00
sphere
76d6a96c69 Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
Monster Iestyn
3fec42c436 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Monster Iestyn
1ba1318f37 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Monster Iestyn
97404e9b8c Merge branch 'libopenmpt-fixes' into 'master' 
Improved libopenmpt loading

See merge request STJr/SRB2Internal!251
 2019-07-14 11:03:14 -04:00
MascaraSnake
1b79c29559 Merge branch 'wallspike-fix' into 'master' 
Fix wall spikes that start retracted

See merge request STJr/SRB2Internal!255
 2019-07-14 10:55:10 -04:00
Monster Iestyn
a001167bb4 Merge branch 'thinkerlists-fix' into 'master' 
Thinkerlists fix

Closes #161

See merge request STJr/SRB2Internal!253
 2019-07-14 10:52:56 -04:00
sphere
aabf7ed113 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
sphere
3f2f037456 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
toaster
85d46b49e1 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
MascaraSnake
d506e70c51 Merge branch 'wood-debris-unmute' into 'master' 
Unmute wood debris

See merge request STJr/SRB2Internal!254
 2019-07-14 04:07:38 -04:00
sphere
530683ae01 Whoops, forgot to revert this. 2019-07-14 02:31:33 +02:00
sphere
6b6efa3909 Add spring flags: float for horizontal & no gravity for diagonal. 2019-07-14 02:17:44 +02:00
sphere
af3089cda5 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00
sphere
d244f7d18e Assign sound to the wood debris object. 2019-07-13 23:15:56 +02:00
toaster
6a90505009 Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^) 2019-07-13 14:07:40 +01:00
toaster
2fbb0bbb52 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
Latapostrophe
c6710c3044 fix thrust on spring pads for shrink and the likes 2019-07-13 14:07:57 +02:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
James R
7354ce200e Correct reverse gravity offsets 
Woah reverse gravity sucks.
 2019-07-12 13:28:25 -07:00
MascaraSnake
a1a22929ac Used toaster's new P_PlayerCanDamage function for the barrel collision 2019-07-10 09:08:57 +02:00
MascaraSnake
d1554b531f Merge branch 'master' into acz-fixes 2019-07-10 08:47:22 +02:00
Monster Iestyn
b7b32167f7 fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn
b820635130 Fix MascaraSnake's issues with sign-compare (hopefully) 2019-07-09 21:43:38 +01:00