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
James R
7834be445d
Merge branch 'fixmul' into next
2020-12-10 11:53:03 -08:00
James R
a967fa2190
Merge branch 'fixmul' into next
2020-12-10 11:51:18 -08: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
dbd8903a53
Use ref for pushing error handler
2020-12-10 08:50:23 -08:00
James R
3f7c2ae0b0
Avoid using multiple tables to fetch hook
...
String hooks still use a table to fetch the id, but the id indexes a C array.
Also I fixed a missing call in the MusicChange hook.
2020-12-10 05:42:53 -08:00
James R
e0a307da15
Merge branch 'next' into hooklib-refactor
2020-12-10 03:09:24 -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
8d382e49fb
Big Large Lua Hooklib Refactor
...
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
and name array.
2020-12-10 00:36:41 -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
a7fa2b2e49
Replace p_mobj.c
2020-12-06 00:09:40 -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
