Commit graph

186 commits

Author SHA1 Message Date
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
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
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
fickleheart
0427c6d282 Add music position functions to Lua 2020-02-23 17:58:32 -06:00
fickleheart
578d1d4f39 Expose P_PlayJingle/Music() to Lua 2020-02-23 17:19:18 -06:00
fickleheart
d55ef8db71 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
fickleheart
c23e8d2cbd 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
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Steel Titanium
6d8de954e6 Restore this that got shifted. 2020-02-15 17:55:25 -05:00
Steel Titanium
46cd8fa760 New Lua functions: R_GetColorByName and R_GetNameByColor 2020-02-15 17:35:00 -05:00
James R
b77d597965 userdataType can check light userdata too! 2020-02-02 15:08:22 -08:00
Louis-Antoine
f07b432df4 Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Jaime Passos
1a48e6131f add R_IsPointInSubsector to lua baselib 2020-01-17 00:49:43 -03:00
Jaime Passos
62d79eef2a Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos
ff80c4ef4d Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
60cf1e1837 Bail out earlier. 2019-12-23 19:00:46 -03:00
Jaime Passos
aa0081f70b Bail out if there are no more free gametype slots. 2019-12-23 18:58:33 -03:00
Jaime Passos
1edc72a3b8 Custom gametype constant support for Lua. 2019-12-23 18:54:25 -03:00
Jaime Passos
6c2b62a795 fix warnings 2019-12-19 02:20:49 -03:00
Jaime Passos
ad317cd8a2 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00
Jaime Passos
920d99976c Lua! Lua! Lua!
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
e3dbbfe34a Rework G_SetCustomExitVars to allow skipstats 2 2019-12-13 16:36:33 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Louis-Antoine
d3b113c84a Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404 Let players move after completing the level
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
Jaime Passos
499c724f9f Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
toaster
56bc3aa702 * Add R_SkinUsable to Lua.
* Make R_SetPlayerSkin check for usability of skin before setting, and error otherwise.
2019-11-10 16:10:34 +00:00
Jaime Passos
8684507e8a finish lua spriteinfo :] 2019-11-07 23:42:14 -03:00
Jaime Passos
2897001d7f spriteinfo lua support 2019-11-07 03:11:16 -03:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
MascaraSnake
b38bd1a078 Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
toaster
8b045a8f15 Lua save-banks!
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
    * Access via `reserveLuabanks()` - returns a read-write userdata.
    * Assign userdata to local variable or global rawset to use later.

Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 18:25:27 +01:00
toaster
dec517f224 Merge branch 'ending' into 'master'
ENDINGS

See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
Monster Iestyn
dab52b522b Merge branch 'titlemaplua' into 'master'
Titlemap Lua

See merge request STJr/SRB2Internal!270
2019-08-03 13:14:46 -04:00
toaster
3b99335605 * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
* Move it into lua_script.h, so it's available to everything that needs it.
2019-07-30 17:57:57 +01:00
toaster
c659e3f26b Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
toaster
8ac6d43886 * Made the evaluation screen even more attractive.
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
toaster
0692a5a5c4 Further improvements on MI's request, just to be safe. 2019-07-28 22:53:27 +01:00
toaster
b8d3e27bba Made it possible to just call EV_CrumbleChain(rover) in Lua 2019-07-28 22:45:20 +01:00
toasterbabe
32ee846c4a * Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
toaster
168a7f4768 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
This reverts commit c17ec4a77e.
2019-07-03 00:58:02 +01:00
MascaraSnake
c17ec4a77e Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
toaster
dbec3c7e54 Metal Sonic fixes!
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00