katsy
|
ead6180ef5
|
lol
|
2020-12-14 05:32:51 -06:00 |
|
katsy
|
03c9543db9
|
you too
|
2020-12-14 04:06:28 -05:00 |
|
katsy
|
f76803d8c0
|
go away whitespace
|
2020-12-14 04:05:14 -05:00 |
|
katsy
|
3e73577b8e
|
add checks for new flag, make emergency jump call shieldspecial
|
2020-12-14 04:03:14 -05:00 |
|
katsy
|
e6aff20076
|
ditto
|
2020-12-14 04:02:17 -05:00 |
|
katsy
|
708fc52543
|
add SF_NOSHIELDABILITY
|
2020-12-14 04:01:50 -05:00 |
|
James R
|
375c83d492
|
Merge branch 'fix-playintro-crash' into 'next'
Fix intro crash
See merge request STJr/SRB2!1310
|
2020-12-13 22:17:25 -05:00 |
|
James R
|
55bc602dbd
|
Merge branch 'apng-downscale' into 'next'
Add aPNG downscaling
See merge request STJr/SRB2!1197
|
2020-12-12 17:39:56 -05:00 |
|
James R
|
e305de037c
|
Merge branch 'player-speed' into 'next'
Make player->speed and other things use R_PointToDist2
See merge request STJr/SRB2!1309
|
2020-12-12 17:38:02 -05:00 |
|
James R
|
394b9a752c
|
Merge branch 'credits-229' into 'next'
Add Zolton and Ors to the credits
See merge request STJr/SRB2!1308
|
2020-12-12 17:35:29 -05:00 |
|
James R
|
956fd338f0
|
Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
|
2020-12-12 17:34:04 -05:00 |
|
James R
|
20e0d99ea0
|
Remove trailing whitespace
|
2020-12-12 02:40:46 -08:00 |
|
James R
|
887f4a0919
|
Merge branch 'master' into next
|
2020-12-12 02:38:51 -08:00 |
|
James R
|
19af2b9afe
|
Remove trailing whitespace
|
2020-12-12 02:37:03 -08:00 |
|
James R
|
41f1b3b97c
|
Kill SEENAMES
|
2020-12-12 02:11:23 -08:00 |
|
Jaime Ita Passos
|
d69430dd04
|
Fix intro crash
|
2020-12-10 22:01:53 -03:00 |
|
Zippy_Zolton
|
3c041d7304
|
snailer
|
2020-12-10 19:01:09 -06:00 |
|
Zippy_Zolton
|
59f7b40497
|
Make player->speed use R_PointToDist2
|
2020-12-10 16:09:43 -06:00 |
|
James R
|
15d4732015
|
Credits: add Zolton and Ors to the programming section
|
2020-12-10 13:40:47 -08:00 |
|
James R
|
b899610f0f
|
Merge branch 'lua-skinsprites' into 'next'
Lua: Allow access to skin.sprites[]
See merge request STJr/SRB2!1238
|
2020-12-10 15:49:48 -05:00 |
|
James R
|
60ce05de38
|
Merge branch 'fix-gl-draw-cropped' into 'next'
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
See merge request STJr/SRB2!1297
|
2020-12-10 15:44:51 -05:00 |
|
James R
|
8cc312a16d
|
Merge branch 'saloondoor-revengeance' into 'next'
Saloon door fixes (closes #394)
Closes #394
See merge request STJr/SRB2!1296
|
2020-12-10 15:43:31 -05:00 |
|
James R
|
073c011589
|
Merge branch 'caret-color-letter' into 'next'
Make caret coloring support letters.
See merge request STJr/SRB2!1295
|
2020-12-10 15:41:02 -05:00 |
|
James R
|
a83a78ac88
|
Merge branch 'brak' into 'next'
Fix brak barrier size (Closes #139)
Closes #139
See merge request STJr/SRB2!1294
|
2020-12-10 15:39:42 -05:00 |
|
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
|
7d93995aae
|
Merge branch 'what-is-a-standard'
|
2020-12-10 11:23:53 -08:00 |
|
James R
|
6f5b5c7d7f
|
Oops!
|
2020-12-10 03:06:41 -08:00 |
|