thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11592 commits 1 branch 12 tags 205 MiB
Commit graph

11592 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
10fd3606ce Merge branch 'firemelt' into 'next' 
Fix objects with MF_FIRE disappearing in lava (Closes #366)

Closes #366

See merge request STJr/SRB2!1287
 2020-12-10 15:37:57 -05:00
James R
ff9c21c80b Merge branch 'dehacked-hell-bruh' into 'next' 
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops

See merge request STJr/SRB2!1286
 2020-12-10 15:36:01 -05:00
James R
c7907f9b15 Merge branch 'ffloorclip-fixes' into 'next' 
ffloorclip fixes (resolves #385 and #391)

Closes #385 and #391

See merge request STJr/SRB2!1284
 2020-12-10 15:35:39 -05:00
James R
ff6eecb64d Merge branch 'metal-sigfpe' into 'next' 
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
 2020-12-10 15:35:03 -05:00
James R
1cc3ed77ff Merge branch 'fixargstr' into 'next' 
Fixargstr

See merge request STJr/SRB2!1280
 2020-12-10 15:31:05 -05:00
James R
9796b60cb0 Merge branch 'my-junk' into 'next' 
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
 2020-12-10 15:29:10 -05:00
James R
63a2ee1378 Merge branch 'super-giverings' into 'next' 
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
 2020-12-10 15:27:01 -05:00
James R
477ae9d1af Merge branch 'gamequit-argument' into 'next' 
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
 2020-12-10 15:25:52 -05:00
James R
bd560130d5 Merge branch 'holy-zip' into 'next' 
Disallow pk3s with extra bytes

See merge request STJr/SRB2!1275
 2020-12-10 15:21:20 -05:00
James R
79df0c5366 Merge branch 'CR_BRUH' into 'next' 
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
 2020-12-10 15:20:11 -05:00
James R
1d39ba59ad Merge branch 'dumb-stuff' into 'next' 
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags

See merge request STJr/SRB2!1273
 2020-12-10 15:17:28 -05:00
James R
a8f61b9f7b Merge branch 'mario1up' into 'next' 
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
 2020-12-10 15:15:08 -05:00
James R
ed9d5960ef Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R
35c212f8ef Merge branch 'exposed!!!' into 'next' 
Expose player.skin and player.availabilities to Lua as Read-only

See merge request STJr/SRB2!1269
 2020-12-10 15:09:55 -05:00
James R
167715d8e0 Merge branch 'expose-selectheading' into 'next' 
Expose mapheader_t's selectheading option to Lua

See merge request STJr/SRB2!1268
 2020-12-10 15:07:23 -05:00
James R
df56fcca37 Merge branch 'crunchyroll' into 'next' 
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
 2020-12-10 15:07:01 -05:00
James R
f1b060f695 Merge branch 'blua-urite' into 'next' 
Fix crash when trying to use bitwise NOT on true/false/nil

See merge request STJr/SRB2!1262
 2020-12-10 15:03:39 -05:00
James R
fc27bbc6e4 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
James R
34f09b2845 Merge branch 'marathon-mode-tokens' into 'next' 
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
 2020-12-10 14:57:23 -05:00
James R
6793020c0c Merge branch 'fixmul' into next 2020-12-10 11:53:03 -08:00
James R
5ce1c63969 Merge branch 'fixmul' into next 2020-12-10 11:51:18 -08:00
Louis-Antoine
d7a4e24e70 Add a shorthand alias for FRACUNIT 2020-12-10 11:49:29 -08:00
Louis-Antoine
0a4c8555a8 Add shorthand aliases for fixed-point functions 2020-12-10 11:48:40 -08:00
James R
a6d045cc18 Merge branch 'reload-bans' into 'next' 
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes

See merge request STJr/SRB2!1215
 2020-12-10 14:28:13 -05:00
James R
6f5b5c7d7f Oops! 2020-12-10 03:06:41 -08:00
James R
2e649de64f Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
GoldenTails
4eae6aaf3f Fix weird spelling mistake 2020-12-05 05:00:59 -06:00
Tatsuru
e9a7d98522 Initialize in p_spec.c too + magic number replacement 2020-12-03 17:50:10 -03:00
Zippy_Zolton
dc53970fac g 2020-12-03 02:05:10 -06:00
Zippy_Zolton
5fc6864cc2 Fix fire objects disappearing in lava 2020-12-03 01:28:54 -06:00
GoldenTails
db7cc8e988 Fix missing stuff 2020-12-02 19:47:00 -06:00
Jaime Ita Passos
4b8b5d928d Don't clip if the 3D floor is fog 2020-12-02 15:34:11 -03:00
Jaime Ita Passos
fefd953a83 Fix 3D floor culling with polyobject segs 2020-12-02 15:31:11 -03:00
Tatsuru
2f44a9ab02 Don't spawn the projectile if you're just gonna delete it 2020-12-02 12:05:40 -03:00
Nev3r
0b6585b51d Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r
f17cae1b5d Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
Zachary McAlpin
7eebfdc7d4 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-30 23:48:49 -06:00
James R
6dea40beaa Fix double define 2020-11-30 19:04:23 -08:00
Zippy_Zolton
3015ee07ae thanks zap 2020-11-30 16:39:24 -06:00
Tatsuru
8502675e1b Initialize junk line tag lists 2020-11-30 18:21:06 -03:00
Zippy_Zolton
6bfccec3c3 oops 2020-11-30 12:05:45 -06:00
Zippy_Zolton
8c836971de overhaul 2020-11-30 12:04:35 -06:00
Zippy_Zolton
556dd3bfca P_GivePlayerRings 2020-11-29 17:39:54 -06:00
Zippy_Zolton
96ff6d002d Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it 2020-11-29 17:16:57 -06:00
GoldenTails
d8ab3a75ed Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00
LJ Sonic
079df8df4d Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next 
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
 2020-11-29 21:54:15 +01:00
Zachary McAlpin
522dd26376 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-29 13:59:10 -06:00
GoldenTails
7c8a447d8f Always call GameQuit when quitting via the Quit menu option on the title screen. 2020-11-29 08:32:04 -06:00
GoldenTails
ded87cb54c Send a quitting argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
Nev3r
ed041a88a4 Merge branch 'fix-playercmd' into 'next' 
Fix PlayerCmd not handling angle and aiming correctly

See merge request STJr/SRB2!1265
 2020-11-29 05:30:01 -05:00