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

235 commits

Author SHA1 Message Date
Nev3r 6dfe236602 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
James R 6fd9e25b11 Merge remote-tracking branch 'origin/next' into g_findmap-lua 2020-07-24 02:14:03 -07:00
lachwright cea3f64c88 Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R 34bd0d9fe7 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 ada06910dc Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails 4b3d6f04f8 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails df1fd0c456 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails 4710e4f07c Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails 6d3a2919a2 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00
GoldenTails 27c25bfa1e Expose P_SceneryXYMovement to Lua. 
Ironically this seems slightly more advanced than P_RingXYMovement...
 2020-07-12 18:02:50 -05:00
GoldenTails 6ac3d62321 Expose P_RingXYMovement to Lua. 
Ever wanted to move like a ring horizontally?
 2020-07-12 18:02:50 -05:00
GoldenTails fe67781d68 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 0f9e3554e2 various color fixes 2020-07-12 07:39:52 -04:00
GoldenTails 7015e656ce Expose P_RailThinker to Lua. 2020-07-12 00:36:22 -05:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
lachwright 527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
lachwright 8652bbc1a5 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 ff8759e507 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 067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
MascaraSnake 4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
SwitchKaze b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze 46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
James R 4eeae51cbb 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 435643b958 Fix P_GetZAt for Lua 2020-05-18 16:16:45 +02:00
Louis-Antoine d0abd6e86c 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 a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
Monster Iestyn 20e4d5ab9e lib_sStopSoundByID: fixed mixed declaration and code compiler warning 2020-05-16 16:14:47 +01:00
Jaime Passos 39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
ZipperQR d0376e284a S_StopSoundByID Lua support 2020-05-06 16:22:04 +03:00
Nev3r ca694c8c43 Merge branch 'udmf-next' into udmf-thingargs 2020-04-12 10:02:12 +02:00
Nev3r 4128f826b7 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 21de33bd08 Add mapthing arg support. 2020-04-11 12:54:34 +02:00
James R d4c08a8410 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 1580e14cbc 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 892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
fickleheart 05b2570ae7 Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart 520e3c5dc3 Are these casts unnecessary...?? 2020-03-18 22:40:11 -05:00
Nev3r 68f60f3c29 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn f4cb6e1f5e 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
Jaime Passos 4e7b47440f G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
fickleheart 352029fd76 Add music position functions to Lua 2020-02-23 17:58:32 -06:00
fickleheart c5f3868819 Expose P_PlayJingle/Music() to Lua 2020-02-23 17:19:18 -06:00
fickleheart 40488096c0 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
fickleheart 283bb52e7d Disable NOHUD/INLEVEL checks on Lua sound functions 
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
 2020-02-23 12:50:45 -06:00
SwitchKaze 58d435484c Fix userdataType typo 2020-02-23 12:17:52 -05:00
SwitchKaze 6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale 56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00