Commit graph

245 commits

Author SHA1 Message Date
Jaime Passos
d348ff079b Only create floor sprite slopes when needed, instead of always allocating them.
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 13:07:02 -03:00
James R
c75429b5c1 Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next'
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.

See merge request STJr/SRB2!1173
2020-10-08 22:01:02 -04:00
James R
ac8def3139 Merge branch 'lua-sectorsounds' into 'next'
Support sectors as sound origins in Lua

See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
GoldenTails
da3a1b18f9 Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions. 2020-10-03 13:24:47 -05:00
Tatsuru
b3a84c469a Encapsulate userdata checks 2020-09-14 17:33:26 -03:00
Tatsuru
2669476e18 Use the sector's actual soundorg (how did it even work) 2020-09-13 13:54:43 -03:00
Tatsuru
087bdbad63 Check for sector_t userdata as well 2020-09-13 12:33:18 -03:00
Zachary McAlpin
70fc6854b1 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port 2020-07-30 15:37:41 -05:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next'
Merge udmf-next into next

See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
Zachary McAlpin
3e79966be9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port 2020-07-25 20:06:12 -05:00
James R
2613a29396 Merge remote-tracking branch 'origin/next' into g_findmap-lua 2020-07-24 02:14:03 -07:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
Zachary McAlpin
6877df94bc Ported Lat's PlayerCmd hook to vanilla SRB2 2020-07-17 00:08:38 -05:00
James R
f8b659e4bd Merge branch 'various-color-fixes' into 'next'
Various color fixes

See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
a913a8a652 Expose P_PlayerZMovement to Lua.
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2 Expose P_SceneryZMovement to Lua.
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae Expose P_RingZMovement to Lua.
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170 Expose P_ZMovement to Lua.
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
1fb799203c Expose P_SceneryXYMovement to Lua.
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
0bbd08f980 Expose P_RingXYMovement to Lua.
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
12bae0cb24 Expose P_XYMovement to Lua.
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
kaysrishaq
be8f10d039 various color fixes 2020-07-12 07:39:52 -04:00
GoldenTails
e63c296e01 Expose P_RailThinker to Lua. 2020-07-12 00:36:22 -05:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
lachwright
0a3b728e81 Knuckles changes:
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
MascaraSnake
3ce62d7780 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
2020-06-09 09:38:01 +02:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
James R
0e25e9a074 Merge branch 'more-lua-map-names' into 'next'
G_BuildMapTitle for Lua, G_BuildMapName outside of levels

See merge request STJr/SRB2!694
2020-05-19 23:13:35 -04:00
Louis-Antoine
4c37c18385 Fix P_GetZAt for Lua 2020-05-18 16:16:45 +02:00
Louis-Antoine
74fa35221d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
Monster Iestyn
6531fc6e85 lib_sStopSoundByID: fixed mixed declaration and code compiler warning 2020-05-16 16:14:47 +01:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
ZipperQR
dc0fbbb998 S_StopSoundByID Lua support 2020-05-06 16:22:04 +03:00
Nev3r
1dae8df2f5 Merge branch 'udmf-next' into udmf-thingargs 2020-04-12 10:02:12 +02:00
Nev3r
860c44d953 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r
dec80cb2a7 Add mapthing arg support. 2020-04-11 12:54:34 +02:00
James R
7ff3e7f18b Merge branch 'lightmemedata' into 'next'
Cvars returned by CV_FindVar did not work with userdataType

See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
MascaraSnake
9b76d3af6f Merge branch 'next' into udmf-next
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
2020-03-21 20:04:31 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
fickleheart
7bf9bc4b9e Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart
83b8c53afa Are these casts unnecessary...?? 2020-03-18 22:40:11 -05:00
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00