Commit graph

14206 commits

Author SHA1 Message Date
Jaime Ita Passos
450955cba2 Fix floor sprite projection 2021-08-26 13:22:32 -03:00
Shane Ellis
ccc71ddafc Merge branch 'addplayer' into 'next'
Multiplayer Bot Features (aka AddPlayer)

See merge request STJr/SRB2!1383
2021-08-25 21:38:37 +00:00
GoldenTails
72bf2a9897 Add angle field to linedef_t 2021-08-24 03:13:18 -05:00
SteelT
4a6acc2c8d Fix metal recordings not being saved in srb2home 2021-08-22 16:13:40 -04:00
LJ Sonic
9b7263855e Prevent input.setMouseGrab from interfering with window focus 2021-08-18 20:58:13 +02:00
sphere
4309b592f8 Merge branch 'shiny' into 'next'
Give Coins drop shadows

See merge request STJr/SRB2!1591
2021-08-17 13:09:53 +00:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
LJ Sonic
772695741c Rename KeyNumToString to KeyNumToName and vice-versa 2021-08-15 15:24:23 +02:00
James R
3b6d8eca83 Merge branch 'master' into next 2021-08-14 15:34:52 -07:00
James R
824b1ab28c Makefile: use full stem in dependency generation
Previously took only the filename, so the directory
component was stripped. This broke dependencies for
basically every file.
2021-08-14 15:29:21 -07:00
LJ Sonic
5bc0ce7a62 Give fields in event_t better names 2021-08-14 23:42:39 +02:00
LJ Sonic
c2907b89f7 Pass a keyevent_t userdatum to key hooks 2021-08-14 20:34:59 +02:00
LJ Sonic
5b949a6751 Expose keyevent_t to Lua 2021-08-14 20:33:42 +02:00
LJ Sonic
38e82e55fc Add a "repeated" field to event_t 2021-08-14 20:33:20 +02:00
LJ Sonic
8adf4b672a Put Lua input library in its own namespace 2021-08-13 22:34:36 +02:00
litten
15b7221c78 modified: debian-template/rules 2021-08-12 12:39:28 -05:00
LJ Sonic
6403a38c72 Fix again 2021-08-10 01:48:26 +02:00
LJ Sonic
a9b35a6f7a Fix incorrect error message during Lua archiving 2021-08-10 00:15:44 +02:00
LJ Sonic
d1e8b05749 Don't call map load trigger linedefs when joining or reloading gamestate 2021-08-08 19:43:42 +02:00
SMS Alfredo
2d218859ff Give coins a drop shadow 2021-08-06 23:25:19 -05:00
sphere
1d92456ad5 Merge branch 'gl-texfmt-p8-ap88-a8-ai8-fix' into 'next'
Fix #492

Closes #492

See merge request STJr/SRB2!1431
2021-08-02 13:10:32 +00:00
sphere
ab044a270b Merge branch 'nolua-alias' into 'next'
Fix console aliases bypassing CV_NOLUA

Closes #619

See merge request STJr/SRB2!1573
2021-08-02 13:09:12 +00:00
sphere
198127dd6f Merge branch 'demos-revert-netvars' into 'next'
Revert netvars to user value after demo finishes playback

See merge request STJr/SRB2!1578
2021-08-02 13:08:43 +00:00
Lach
6cf4f79bab Merge branch 'zmovement-remove-fix' into 'next'
Fix for #551

See merge request STJr/SRB2!1590
2021-08-02 02:01:45 +00:00
Monster Iestyn
df99cde40f mo not mobj! 2021-07-31 22:11:44 +01:00
Monster Iestyn
7dddc631d7 P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely) 2021-07-31 21:14:48 +01:00
Radicalicious
d50e3bff70 ACTUALLY fix the issue. 2021-07-29 15:55:19 +00:00
Radicalicious
58db5a6904 Fix P_PlayerInPain crash. 2021-07-28 15:42:44 +00:00
lachablock
434b119ccf Merge remote-tracking branch 'origin/next' into playercontroldirection 2021-07-28 11:55:12 +10:00
Nev3r
6d76d05d62 Merge branch 'working-server-incompatibility-checks' into 'next'
Actually tell you if the server is running an incompatible version

See merge request STJr/SRB2!1509
2021-07-16 16:55:41 -04:00
SteelT
71f905f95b Fix gme support being effectively disabled
I found this easier than trying to adjust the makefile, as it uses the same thing to automatically generate the various NO* compile options.
2021-07-16 15:26:09 -04:00
Monster Iestyn
3299a16f42 Merge branch 'lua-userdata-invalidate-fix' into 'next'
Lua userdata invalidate fix

See merge request STJr/SRB2!1584
2021-07-16 12:11:10 -04:00
Shane Ellis
1285ba9f35 Merge branch 'addplayer-2021-7-15' into 'addplayer'
Addplayer 2021 7 15

See merge request STJr/SRB2!1585
2021-07-15 18:39:38 -04:00
CobaltBW
bac4116130 Merge branch 'addplayer' of https://git.do.srb2.org/STJr/SRB2.git into addplayer-2021-7-15 2021-07-15 15:36:44 -07:00
CobaltBW
95359fef51 Amendment to G_RemovePlayer to preserve lua error handlers 2021-07-15 15:19:47 -07:00
CobaltBW
22f42efb61 Cleaned up leftover comments 2021-07-15 15:09:02 -07:00
CobaltBW
48514ee88d Fixed G_RemovePlayer crash in players.iterate
This was done by storing flag-for-removal status as a boolean inside the player struct.
Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 15:04:24 -07:00
CobaltBW
4486ff065a All remaining player->bot checks modified to rely on BOT_ constants 2021-07-15 13:03:26 -07:00
CobaltBW
1c3a898bbb Fixed locked characters being visible in multiplayer select screen 2021-07-15 12:53:13 -07:00
Nev3r
3a49b9519d Remove &, since args and stringargs are arrays 2021-07-13 17:55:06 +02:00
Nev3r
22dfa05c31 Forgot the stringargs. 2021-07-13 17:44:28 +02:00
Nev3r
aed86781fc Bugfix - Fix sporadically occurring incorrect userdata types in Lua, caused by previously loaded userdata which didn't get invalidated in previous sessions.
Invalidate userdata for line and mapthing args.
Invalidate userdata for slopes and their normal, origin and direction vectors.
2021-07-13 17:41:38 +02:00
Shane Ellis
33ae95bf13 G_RemovePlayer error handling 2021-07-12 23:38:52 -04:00
sphere
113cedd4b6 Merge branch 'polyobject-plane-stability' into 'next'
Use floating-point math for polyobject planes as well.

Closes #581

See merge request STJr/SRB2!1533
2021-07-12 12:47:35 -04:00
James R
58fa44e8dc CMP0115 2021-07-12 03:50:44 -07:00
SteelT
0faecf0959 version.h: Update comment about contacting an MS admin 2021-07-11 20:51:06 -04:00
Monster Iestyn
c337709d10 Update f_finale.c 2021-07-11 16:32:36 -04:00
lachablock
117e3e2670 Expose P_TryCameraMove and P_TeleportCameraMove, disallow write access to camera.x and camera.y, allow write access to camera.height and camera.radius 2021-07-11 16:23:50 +10:00
lachablock
366b1f65a1 Allow Lua write access to camera_t variables & expose the cameras globally 2021-07-10 18:22:07 +10:00
James R
e30d4f954b Revert netvars after demo finishes playback
(Demos do not call CL_Reset BTW.)
2021-07-08 14:37:03 -07:00