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
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
James R
14c5d2c916
Warn if Lua attempted access NOLUA consvar
...
And quote variable name.
2021-07-05 18:39:12 -07:00
James R
18cbc1e370
Fix aliases bypass COM_SAFE
2021-07-05 18:31:04 -07:00
LJ Sonic
0482eacb7c
Load add-ons in the order in which the -file and -folder arguments are specified
2021-07-03 19:58:59 +02:00
James R
e24fe29114
Merge remote-tracking branch 'origin/master' into next
2021-07-02 15:55:36 -07:00
James R
3d19d5386b
Merge branch 'appveyor-fix-2' into 'master'
...
Take advantage of new Makefile in appveyor.yml
See merge request STJr/SRB2!1561
2021-07-02 18:51:29 -04:00
Shane Ellis
afa8466b30
comment cleanup
2021-06-30 01:38:04 -04:00
Shane Ellis
94441d6eee
comment cleanup
2021-06-30 01:36:28 -04:00
Shane Ellis
ee765d1043
comment cleanup
2021-06-30 01:34:21 -04:00
Shane Ellis
dad361721f
comment cleanup
2021-06-30 01:32:24 -04:00
James R
db919accd2
Appveyor: suppress real time file names
2021-06-29 20:01:14 -07:00
James R
44b82dea58
Appveyor: remove redundant CFLAGS
...
Also changed -Wno-error=implicit-fallthrough to
-Wno-implicit-fallthrough. For some reason Appveyor's
version of GCC is triggering these warnings despite the
comments, so just shut it up.
2021-06-29 19:55:14 -07:00
James R
faee657572
Appveyor: update for new Makefile
2021-06-29 19:51:15 -07:00
James R
f79e0ee540
Appveyor: remove 64-bit target
2021-06-29 19:51:15 -07:00
James R
22ab611daa
Makefile: do not automatically set WINDOWSHELL
...
According to this answer--
https://stackoverflow.com/a/45952425
--Make will always prefer a unix shell, even on Windows,
if one can be found in Path. So we can't check PATH to
determine if it's a Windows shell... this is just too much
bother.
2021-06-29 16:23:27 -07:00
James R
abdf5c101c
Makefile: report SHELL
2021-06-29 16:22:46 -07:00
James R
17e31f21ff
Merge branch 'master' into next
2021-06-29 14:42:53 -07:00
James R
6c03f9b5b3
fuck
2021-06-29 14:42:40 -07:00
CobaltBW
4f04097066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer
2021-06-29 14:32:46 -07:00
CobaltBW
c3fa9bea0f
ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc
2021-06-29 14:07:49 -07:00
James R
215edeb395
Merge branch 'master' into next
2021-06-29 13:58:48 -07:00
James R
c1ecfa306f
Makefile: 'dep' not 'deps'
2021-06-29 13:58:38 -07:00
Tatsuru
b597508c55
Merge branch 'key-hooks-no-return' into 'next'
...
Use return value of KeyDown and KeyUp hooks
See merge request STJr/SRB2!1559
2021-06-29 11:42:26 -04:00
James R
7d01bd38d8
Fix return value of Lua key hooks not being used
2021-06-29 01:49:53 -07:00