James R
|
cab089c5b1
|
Merge branch 'gl-colormap-update' into 'next'
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)
Closes #187, #247, #301, and #370
See merge request STJr/SRB2!1301
|
2020-12-15 20:50:45 -05:00 |
|
James R
|
14c6d93c0c
|
Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes
See merge request STJr/SRB2!1312
|
2020-12-15 20:47:45 -05:00 |
|
James R
|
804e049579
|
Merge branch 'intermission-double-free-fix' into 'next'
Fix double free occuring when unloading the intermission patches
See merge request STJr/SRB2!1304
|
2020-12-15 20:44:57 -05:00 |
|
James R
|
73a7365798
|
Merge branch 'circuit-finallap' into 'next'
Final lap text for circuit
See merge request STJr/SRB2!1303
|
2020-12-15 20:42:59 -05:00 |
|
James R
|
503364f5f8
|
Merge branch 'gme-spc-fix' into 'next'
Fix SPC looping on libgme versions >= 0.6.3
See merge request STJr/SRB2!1302
|
2020-12-15 20:40:10 -05:00 |
|
katsy
|
d999e436f1
|
GETFLAG
|
2020-12-14 20:23:24 -05:00 |
|
Zippy_Zolton
|
07034cf441
|
fixes spaces
|
2020-12-14 16:14:20 -06:00 |
|
Zippy_Zolton
|
9b8bacd088
|
Redone colormaps by SonicX8000
|
2020-12-14 12:52:24 -06:00 |
|
Jaime Ita Passos
|
3b36005ceb
|
Replace the first entry in the taglist, instead of adding into it
|
2020-12-14 14:13:24 -03:00 |
|
James R
|
d0f3a6d737
|
Better check for tag list userdata
|
2020-12-14 08:08:01 -08:00 |
|
James R
|
00dff6d283
|
Push "valid" only once
|
2020-12-14 05:53:57 -08:00 |
|
katsy
|
f09198788d
|
Merge remote-tracking branch 'stjr/next' into dusty
|
2020-12-14 05:39:35 -06:00 |
|
katsy
|
721170f5a0
|
lol
|
2020-12-14 05:32:51 -06:00 |
|
katsy
|
4521827e2c
|
you too
|
2020-12-14 04:06:28 -05:00 |
|
katsy
|
200e444016
|
go away whitespace
|
2020-12-14 04:05:14 -05:00 |
|
katsy
|
2bebaf12d0
|
add checks for new flag, make emergency jump call shieldspecial
|
2020-12-14 04:03:14 -05:00 |
|
katsy
|
dfbb1825f4
|
ditto
|
2020-12-14 04:02:17 -05:00 |
|
katsy
|
0ce9d9127a
|
add SF_NOSHIELDABILITY
|
2020-12-14 04:01:50 -05:00 |
|
katsy
|
2b23468359
|
remove amy
|
2020-12-14 02:36:00 -05:00 |
|
Zippy_Zolton
|
c247b94be7
|
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
|
2020-12-14 00:16:38 -06:00 |
|
Jaime Ita Passos
|
ca78fc69ca
|
Restore the viewpoint's angle in R_DrawPlanes instead
|
2020-12-14 01:14:55 -03:00 |
|
Jaime Ita Passos
|
7e0a1709de
|
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
|
2020-12-14 00:53:42 -03:00 |
|
James R
|
760e083c30
|
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
|
e94bccc503
|
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
|
9649a9fbae
|
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
|
69ea84db80
|
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
|
7b6675178e
|
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
|
c8cc9c7a6f
|
Remove trailing whitespace
|
2020-12-12 02:40:46 -08:00 |
|
James R
|
143ec3e40b
|
Merge branch 'master' into next
|
2020-12-12 02:38:51 -08:00 |
|
James R
|
b31c4db89d
|
Remove trailing whitespace
|
2020-12-12 02:37:03 -08:00 |
|
James R
|
e55d842d7f
|
Kill SEENAMES
|
2020-12-12 02:11:23 -08:00 |
|
katsy
|
2971156ba7
|
Update info.c
|
2020-12-11 23:39:42 -05:00 |
|
katsy
|
ddf743d521
|
make fire spindust dust fullbright
|
2020-12-11 20:59:14 -05:00 |
|
Zippy_Zolton
|
68de9f4bbe
|
Make Ring Drain sectors play the depletion sound instead of the ring sound
|
2020-12-11 12:34:30 -06:00 |
|
Zippy_Zolton
|
f2095b57fd
|
Player-Colored Elemental Fire for competitive gametypes
|
2020-12-10 20:37:50 -06:00 |
|
Jaime Ita Passos
|
440f46144a
|
Fix intro crash
|
2020-12-10 22:01:53 -03:00 |
|
Zippy_Zolton
|
916cacb38f
|
snailer
|
2020-12-10 19:01:09 -06:00 |
|
Jaime Ita Passos
|
3472b3ece3
|
Fix ERZ3 mode
|
2020-12-10 21:55:22 -03:00 |
|
Zippy_Zolton
|
317c107064
|
Make player->speed use R_PointToDist2
|
2020-12-10 16:09:43 -06:00 |
|
James R
|
69d98b22ad
|
Credits: add Zolton and Ors to the programming section
|
2020-12-10 13:40:47 -08:00 |
|
James R
|
29745f80dc
|
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
|
e05433f282
|
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
|
6d3442a5d7
|
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
|
d8bf015467
|
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
|
7e8fc66654
|
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
|
fc5708b2f2
|
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
|
c6dd218e2b
|
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
|
8c74dd26a9
|
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
|
e46c6e75f3
|
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
|
413fa89555
|
Merge branch 'fixargstr' into 'next'
Fixargstr
See merge request STJr/SRB2!1280
|
2020-12-10 15:31:05 -05:00 |
|
James R
|
0b2e60ba1d
|
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
|
5a0d3981f1
|
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
|
9ea969b62d
|
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
|
f180a1fc3c
|
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
|
ef6f69ee22
|
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
|
703631956b
|
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
|
ee48fa2de3
|
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
|
9a77cf6306
|
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
|
1d31fe3759
|
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
|
77c51c62c2
|
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
|
857113b60e
|
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
|
8701caa110
|
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
|
c841750868
|
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
|
4275d52267
|
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 |
|
Louis-Antoine
|
3aecc22764
|
Add a shorthand alias for FRACUNIT
|
2020-12-10 11:49:29 -08:00 |
|
Louis-Antoine
|
39a320734d
|
Add shorthand aliases for fixed-point functions
|
2020-12-10 11:48:40 -08:00 |
|
James R
|
a5d228773d
|
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
|
e4cf8ebcf5
|
Merge branch 'what-is-a-standard'
|
2020-12-10 11:23:53 -08:00 |
|
James R
|
0df5d8ff58
|
Oops!
|
2020-12-10 03:06:41 -08:00 |
|
James R
|
2ab71571aa
|
Merge branch 'high-resolution-timer-2' into next
|
2020-12-10 02:55:02 -08:00 |
|
James R
|
e7883f3f8e
|
That moment when you see HAVE_BLUA crawl back from the grave
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
|
2020-12-10 00:36:14 -08:00 |
|
Zippy_Zolton
|
7082db485b
|
CTF text 2, branch is finished
|
2020-12-08 16:09:51 -06:00 |
|
Zippy_Zolton
|
1b888c689c
|
CTF text 1
|
2020-12-08 15:56:45 -06:00 |
|
Zippy_Zolton
|
45a4b728b3
|
zwip suggestion
|
2020-12-08 12:05:06 -06:00 |
|
Steel Titanium
|
c2de684150
|
Fix double free occuring when unloading the intermission patches due to the same patch being cached twice
|
2020-12-07 17:54:08 -05:00 |
|
Zippy_Zolton
|
2721725962
|
Final lap text for circuit
|
2020-12-07 16:46:05 -06:00 |
|
Steel Titanium
|
11bbad9be8
|
Tab fix
|
2020-12-06 22:58:17 -05:00 |
|
Steel Titanium
|
c3a560f51d
|
Let's check for looping first
|
2020-12-06 22:30:50 -05:00 |
|
Steel Titanium
|
284205baac
|
Fix SPC looping on libgme versions >= 0.6.3
|
2020-12-06 22:20:06 -05:00 |
|
Jaime Ita Passos
|
18ee97c583
|
Fix animated skincolors in OpenGL
|
2020-12-06 20:17:14 -03:00 |
|
Jaime Ita Passos
|
6f9c48a305
|
Move a few mobj spawn defaults to its own function
|
2020-12-06 17:46:35 -03:00 |
|
Jaime Ita Passos
|
24ba782144
|
Fix archived mobjs having no default blend mode and sprite scales
|
2020-12-06 17:29:20 -03:00 |
|
GoldenTails
|
6546fc8ce7
|
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
|
2020-12-06 12:01:31 -06:00 |
|
Tatsuru
|
3b85abdee7
|
Kill saloon doors without a tracer, add height check for non-blocking doors
|
2020-12-06 14:11:08 -03:00 |
|
GoldenTails
|
233990099d
|
Make caret coloring support letters.
|
2020-12-06 04:28:12 -06:00 |
|
katsy
|
8f4d23197c
|
space
|
2020-12-06 04:32:30 -05:00 |
|
katsy
|
5853a0b4d8
|
Revert "add noclipheight on chaingrab"
This reverts commit 8541409329
|
2020-12-06 07:44:59 +00:00 |
|
katsy
|
ffd20ee753
|
Revert "ensure the new flag is cleared properly"
This reverts commit 3dbb44e7b1
|
2020-12-06 07:44:49 +00:00 |
|
katsy
|
2fcf613a31
|
brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved
|
2020-12-06 00:13:10 -05:00 |
|
katsy
|
fd4674971a
|
Replace p_inter.c
|
2020-12-06 00:10:45 -05:00 |
|
katsy
|
768ee57057
|
Replace p_user.c
|
2020-12-06 00:10:28 -05:00 |
|
katsy
|
3dbb44e7b1
|
ensure the new flag is cleared properly
|
2020-12-05 23:17:01 -05:00 |
|
katsy
|
8541409329
|
add noclipheight on chaingrab
|
2020-12-05 23:13:47 -05:00 |
|
GoldenTails
|
f6af04ecbb
|
Fix weird spelling mistake
|
2020-12-05 05:00:59 -06:00 |
|
James R
|
0b0f2e1e35
|
Invalidate taglist userdata
|
2020-12-05 02:26:00 -08:00 |
|
James R
|
5d1040c924
|
Reset taggroup iterator on successive calls
|
2020-12-05 02:08:00 -08:00 |
|
James R
|
8dd964e3a7
|
Lua: taglist.add and taglist.remove for sector tag lists
|
2020-12-05 02:02:06 -08:00 |
|
James R
|
e5a3e6a845
|
Fix removing a tag unsetting the bit array even if more elements with that tag exist
|
2020-12-05 01:14:52 -08:00 |
|
James R
|
ae663e7247
|
Don't realloc twice when adding to the taggroup
|
2020-12-05 00:46:51 -08:00 |
|
James R
|
828d7e71ce
|
Fix uninitialized last element when using Taggroup_Remove
|
2020-12-05 00:36:54 -08:00 |
|