Commit graph

12338 commits

Author SHA1 Message Date
Tatsuru
bcd7468d25 Merge branch 'lua-camera' into 'next'
Allow Lua write access to camera_t variables & expose the cameras globally

See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next 2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016 Merge branch 'even-more-slope-copying' into 'next'
Add flag to line slopes for even more slope copying

See merge request STJr/SRB2!1550
2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9 Merge branch 'master' into next 2021-09-12 15:46:32 -04:00
SteelT
a822de5ffc Merge branch 'fix-gme-disabled' into 'master'
Fix gme support being effectively disabled

See merge request STJr/SRB2!1586
2021-09-11 15:05:34 +00:00
Tatsuru
8aee7fcbce Merge branch 'floorsprite-fix' into 'next'
Fix #649

Closes #649

See merge request STJr/SRB2!1604
2021-09-11 15:00:14 +00:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next'
Polish the Lua input library

See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
Tatsuru
033c661431 Merge branch 'folder' into 'next'
Implement folder loading

See merge request STJr/SRB2!1568
2021-09-10 17:10:26 +00:00
Tatsuru
2eed4a9265 Merge branch 'sunbehindcloud' into 'next'
Refactor weather switching (fixes #541)

Closes #541

See merge request STJr/SRB2!1498
2021-09-10 17:00:44 +00:00
katsy
50fe45efe6 Refactor weather switching (fixes #541) 2021-09-10 17:00:43 +00:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next'
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
Tatsuru
ce98758bd6 Merge branch 'equationslopes' into 'next'
Add generalized slopes in UDMF

See merge request STJr/SRB2!1530
2021-09-09 22:12:18 +00:00
SteelT
2578e01cfb Merge branch 'writable-colormaps' into 'next'
Make the colormap returned by v.getColormap() writable.

See merge request STJr/SRB2!959
2021-09-05 21:07:10 +00:00
James R
1af05afb0e Merge branch 'better-gcc-check' into 'master'
Makefile: Improve gcc detection

See merge request STJr/SRB2!1608
2021-09-04 00:43:16 +00:00
James R
c1458aa6c7 Merge branch 'master' into next 2021-09-03 17:15:53 -07:00
James R
8e0831a183 Fix unused variable warning under NOPNG 2021-09-03 17:15:36 -07:00
James R
cf30fd1bd7 Merge branch 's' into 'next'
Make next compile again

See merge request STJr/SRB2!1611
2021-08-31 23:47:26 +00:00
namishere
39bd9c6da8 Make next compile again 2021-08-30 23:18:25 -07:00
SteelT
4c20dd7350 Merge branch 'james-but-full' into 'next'
Add my full name in the credits

See merge request STJr/SRB2!1610
2021-08-31 06:09:42 +00:00
James R
f4f7af6f6d Add my full name 2021-08-30 18:40:36 -07:00
GoldenTails
1a8ec7975c Makefile: Improve gcc detection
Wasn't working for me until I fixed it.
Turns out gcc really doesn't like giving its name out.
Most of the time it reads argv[0].
2021-08-28 15:39:34 -05:00
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
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
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
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