lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11733 commits 1 branch 29 tags 122 MiB
Commit graph

10389 commits

Author SHA1 Message Date
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
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