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
James R
314fd2783a
Lua tag lists
...
Index and take length of tag lists like a table, 1-indexed. There are three
methods which may be used on tag lists:
list:iterate() - returns an iterator over the tags in the list
list:has(tag) - returns a boolean whether the tag is in the list
list.shares(list2) - returns whether two lists share a tag
"find" is also an alias to "has". Each method may be accessed from the global
taglist library too, e.g. taglist.iterate(list)
Tag lists may be compared with an equality operator too. This will tell you if
the two lists are composed of identical tags.
Accessible from sector.taglist, line.taglist and mapthing.taglist.
2020-12-04 13:53:27 -08:00
James R
c2217bb426
Mkae Lua taggroups indexable
...
They are 1-indexed.
2020-12-04 04:54:12 -08:00
James R
96851e52a1
hehehehehe what if I forgot to git add?
2020-12-04 02:27:46 -08:00
James R
621efbfa15
Lua taglib for accessing taggroups
...
The global "tags" can be iterated upon for every unique tag which is set in the
level. If a tag is set on a sector/line/thing, it will be included. Taking the
length of "tags" will give you the number of these unique tags. (If a tag is
set on multiple sectors/lines/things, it will only be counted once though.)
For sectors, lines and mapthings, call the field "tagged". This function takes
one argument, which is the tag. The return value can be iterated over for all
the sectors/lines/things with that tag. The length can also be taken for the
number of such objects. If no argument is given, the global tag is default.
2020-12-04 00:30:08 -08:00
Steel Titanium
4c53eabc59
Reword the error to be more consistent with other errors
2020-12-03 21:14:27 -05:00
Steel Titanium
7d45a7c91a
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites
2020-12-03 17:29:08 -05:00
Tatsuru
fae845f935
Initialize in p_spec.c too + magic number replacement
2020-12-03 17:50:10 -03:00
Zippy_Zolton
29f56fb2d8
g
2020-12-03 02:05:10 -06:00
Zippy_Zolton
c28bd8005e
Fix fire objects disappearing in lava
2020-12-03 01:28:54 -06:00
GoldenTails
b5526312e7
Fix missing stuff
2020-12-02 19:47:00 -06:00
Jaime Ita Passos
47b8c0648b
Don't clip if the 3D floor is fog
2020-12-02 15:34:11 -03:00
Jaime Ita Passos
0ffb241c0a
Fix 3D floor culling with polyobject segs
2020-12-02 15:31:11 -03:00
Tatsuru
a67862665a
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
Nev3r
4d716cb170
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
c8ae28bbaf
Follow GZDoom's convention for stringargs.
2020-12-01 18:35:24 +01:00
Zachary McAlpin
7fde15d066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-30 23:48:49 -06:00
James R
d004515d6a
Fix double define
2020-11-30 19:04:23 -08:00
Zippy_Zolton
69248cc684
thanks zap
2020-11-30 16:39:24 -06:00
Tatsuru
9770368ee9
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
Zippy_Zolton
20d1811983
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9
overhaul
2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
GoldenTails
119d2e9e37
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
LJ Sonic
eef3028110
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
51d52f7327
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-29 13:59:10 -06:00
GoldenTails
b389700de3
Always call GameQuit when quitting via the Quit menu option on the title screen.
2020-11-29 08:32:04 -06:00
GoldenTails
59d2646593
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
ecb333511b
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
Nev3r
bcf6823cbf
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
James R
445d040795
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
SMS Alfredo
95dfb93a11
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
James R
6b4d422664
Don't add pk3 if there are holes
...
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
2020-11-28 20:00:01 -08:00
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
b9f6069cd0
Replace TC macros with an enum that automatically counts up
...
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Zachary McAlpin
0280721f08
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-26 10:39:41 -06:00
Zippy_Zolton
db6b0c6aa0
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
James R
4ab667c6a0
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
SMS Alfredo
5c71fe0710
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
SMS Alfredo
b2d6d4f83f
Expose player.skin and player.availabilities to Lua as Read-only
2020-11-25 12:35:36 -06:00
Zachary McAlpin
d095517999
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-24 20:42:08 -06:00
Zachary McAlpin
76822cef2b
Expose the selectheading option from mapheader_t in Lua
2020-11-24 20:41:11 -06:00
lachwright
87968c946b
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
GoldenTails
d806655769
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit ad9bf6085f
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
8d71559afe
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81
Merge branch 'plane-sorting-fix-part-3' into 'next'
...
Improved sprite sorting against 3d floors
See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
f39300ac74
Merge branch 'master' into no-dd-make
2020-11-22 15:29:37 -08:00
James R
6d9e036c7f
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
b059ed40c6
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
40e954779e
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
54da9552de
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
James R
30792e7820
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
92625483a4
Merge branch 'replay-height-fix' into 'next'
...
Made height/spinheight and height change values in replays more accurate
See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
bec85c033a
Merge branch 'replay-camera-update' into 'next'
...
Make the replay camera follow the player
See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
eb28532244
Merge branch 'remove-unused-music-types' into 'next'
...
Remove unused music type enums
See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
6d6eb79226
Merge branch 'uncap-palettes' into 'next'
...
Uncap palette lump palettes & allow flashpal palettes to display during pause
See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
b2a84a9376
Merge remote-tracking branch 'origin/master' into no-dd-make
2020-11-22 14:14:43 -08:00
Jaime Ita Passos
2e21168395
Free GPU textures when adding a file
2020-11-22 18:23:35 -03:00
Riku Salminen
b9fa50f7ef
No need to reset tokens twice
2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2
Now the fix actually does what the MR says... +lua banks
2020-11-22 23:19:24 +02:00
Jaime Ita Passos
0645c642d2
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e
Fix sprite textures in models
2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
071ec73389
Some fixes for spritestuff2
2020-11-22 03:47:15 -03:00
GoldenTails
e3c6d1cef3
Add NOECHOFILENAMES, if people don't want logspam.
2020-11-21 22:21:18 -06:00
James R
79bbb3fe46
Remove Direct Draw from the Makefiles
...
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
James R
5a8e653cd5
More concise
2020-11-21 13:43:32 -08:00
James R
377a9c10f0
Lua: disallow bitwise not on anything but number values
...
This fixes a crash.
2020-11-21 13:37:45 -08:00
GoldenTails
8cfa21fb20
Echo filenames when compiling without ECHO=1
2020-11-19 15:17:56 -06:00
GoldenTails
55f169f3c9
Move the GIF downscaling menu option up one to create some parity.
2020-11-19 13:45:04 -06:00
GoldenTails
12ac096a95
Add a menu option for aPNG downscaling.
2020-11-19 13:45:04 -06:00
GoldenTails
949c0c181d
Add aPNG downscaling, and its associated consvar.
2020-11-19 13:45:04 -06:00
Jaime Ita Passos
389763a550
Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations
2020-11-19 00:59:37 -03:00
Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
SMS Alfredo
9163e73092
Allow no spin characters to water skip while spinning
2020-11-18 12:35:40 -06:00
SMS Alfredo
7ad8aa1477
Allow the Forcespin sector type to be used with intangible fofs
...
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
01a03a4daa
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
2020-11-18 12:01:06 -06:00
SMS Alfredo
16fd754a39
Allow forcespin sectors to work on no spin characters
2020-11-18 11:49:17 -06:00
SMS Alfredo
ad9bf6085f
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
2020-11-18 11:28:31 -06:00
James R
85c5fa9527
Merge branch 'unfuck-icon-mac' into 'next'
...
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
SMS Alfredo
fb40a28365
Do deh thing
2020-11-17 11:47:33 -06:00
