stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-03 06:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
12673 commits 180 branches 42 tags 328 MiB
Commit graph

11252 commits

Author SHA1 Message Date
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
lachablock
7ed8178372 Oops typo 2021-12-12 19:18:13 +11:00
lachablock
2794727201 Improve bot handling: 
- bot ticcmds are generated and sent by the server only
- fix issue where server would not send all ticcmds to clients if bots were in the game
- fix bots still responding to P1's inputs while P1's controls are locked
- fix bot player's directional controls being rotated when controlled by P2
 2021-12-12 18:52:27 +11:00
spherallic
6f5b34f7c1 Don't award end-of-level bonuses to bots. 2021-12-09 12:45:18 +01:00
John FrostFox
c420de6f11 Include pmomz for mobjs in net savestates and load if it exists 2021-12-09 11:42:06 +03:00
Hannu Hanhi
f3c5addab7 Improve OpenGL GDI Generic error message 2021-12-07 22:35:04 +02:00
katsy
97e2fe18c6 fix spike sandwich teleportation issue 2021-12-06 18:00:30 -06:00
LJ Sonic
6504557393 Merge branch 'asin' into 'next' 
arcsine Lua wrapper

See merge request STJr/SRB2!1554
 2021-12-06 00:01:45 +00:00
LJ Sonic
066a9d1534 Merge branch 'fix-musicchange-hook' into 'next' 
Fix MusicChange hook crashing when called

See merge request STJr/SRB2!1671
 2021-12-05 17:02:20 +00:00
LJ Sonic
f271f88c7f Fix MusicChange hook crashing when called 
BRUH MOMENT BRUH MOMENT
PREPARE THE HALL OF SHAME
 2021-12-05 17:59:33 +01:00
spherallic
fdc825721f some hud fixes, by Confusion 2021-12-05 12:47:20 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
55fc7cbd67 Fix "all players" check in T_EachTimeThinker 2021-12-05 07:20:55 +01:00
Radicalicious
86edb1e4ca Fix player disappearing when drowning in painstate 2021-12-03 23:20:07 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next' 
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
 2021-12-03 18:02:06 +00:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next' 
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
 2021-12-03 12:18:39 +00:00
SteelT
bb514a0627 Merge branch 'metal-recording-srb2home' into 'next' 
Fix metal recordings not being saved in srb2home

See merge request STJr/SRB2!1601
 2021-12-03 00:32:06 +00:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next' 
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
 2021-12-02 23:57:42 +00:00
LJ Sonic
b959d0f4ab Merge branch 'fix-console-keyup' into 'next' 
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
 2021-12-02 23:57:38 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next' 
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
 2021-12-02 23:57:26 +00:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next' 
Raise addon limit

See merge request STJr/SRB2!1465
 2021-12-02 22:50:46 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
599abc2a78 Merge branch 'lua-timestamp' into 'next' 
Timestamp function for Lua

See merge request STJr/SRB2!1647
 2021-12-02 22:41:08 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00
LJ Sonic
14403737ef Raise the file upload speed drastically 2021-12-02 23:15:55 +01:00
LJ Sonic
425d1f1b53 Make all key identifiers lowercase 2021-12-02 21:03:16 +01:00
LJ Sonic
443c51714a Fix KeyUp hook being called when the console is open 2021-12-02 21:02:54 +01:00
sphere
33c43744b4 Merge branch 'what' into 'next' 
Clean up bouncy fof code + fix bugs (closes #291)

Closes #291

See merge request STJr/SRB2!1461
 2021-12-02 17:29:43 +00:00
sphere
dad13f2dde Merge branch 'myfixes' into 'next' 
Fix visplanes getting allocated twice (backport from srb2kart)

See merge request STJr/SRB2!1636
 2021-12-02 11:25:18 +00:00
sphere
3597475a9d Merge branch 'drawtiltedsplat-npo2-typo' into 'next' 
Remove that line again

See merge request STJr/SRB2!1645
 2021-12-02 11:12:24 +00:00
sphere
a8f754283b Merge branch 'lethallavaland' into 'next' 
fix MFE_TOUCHWATER (and MFE_TOUCHLAVA) not applying while standing on sloped water or lava (resolves #365, #201)

Closes #201 and #365

See merge request STJr/SRB2!1654
 2021-12-02 10:22:14 +00:00
sphere
ec23753b69 Merge branch '401-fix' into 'next' 
Add toggle for linedef action 401 to not change the ceiling texture.

Closes #567

See merge request STJr/SRB2!1663
 2021-12-02 10:11:21 +00:00
sphere
cef9a1ad18 Merge branch 'damagetype-fixes' into 'next' 
A few damage type fixes

Closes #392

See merge request STJr/SRB2!1660
 2021-12-02 10:10:19 +00:00
sphere
b3e2b1671e Merge branch 'menu-edits-2210' into 'next' 
Small menu edits

Closes #614 and #87

See merge request STJr/SRB2!1658
 2021-12-02 10:10:08 +00:00
spherallic
c1c7607cb0 Add toggle for linedef action 401 to not change the ceiling texture. 2021-12-02 01:52:45 +01:00
sphere
16251734ce Merge branch 'hehballs' into 'next' 
Fix Large Spike Balls not dealing spike damage

See merge request STJr/SRB2!1661
 2021-12-01 10:06:01 +00:00
SMS Alfredo
aca0ba0f4b wow 2021-11-30 22:46:51 -06:00
SMS Alfredo
a5e1167ad2 balls 2021-11-30 20:51:15 -06:00
spherallic
9bdfafc9dd Add DMG_FIRE to Pyrefly fire and lavafall objects. 2021-11-29 19:25:30 +01:00
spherallic
49e6e7a80f Fix retracting spikes dealing typeless damage instead of spike damage. 2021-11-27 16:19:04 +01:00
spherallic
1afb0c556a Make Brak's electric barrier damage Elemental and Flame Shields. 2021-11-27 14:23:02 +01:00
spherallic
6a6b292c73 Fix Flame Shield interactions in old-style special stages. 2021-11-27 14:22:21 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next' 
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
 2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
sphere
59660c56c2 Merge branch 'name-unnamed-userdata' into 'next' 
Give userdata that needed names some names.

See merge request STJr/SRB2!1639
 2021-11-26 14:07:39 +00:00
sphere
b83de902a5 Merge branch 'less-console-text-draw' into 'next' 
Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357
 2021-11-26 13:57:55 +00:00
sphere
dd2a1c8394 Merge branch 'master' into 'next' 
merge master into next again

See merge request STJr/SRB2!1659
 2021-11-26 13:57:28 +00:00
sphere
f97261ae85 Merge branch 'let-mixed-declarations' into 'master' 
Remove mixed code and declarations warning

See merge request STJr/SRB2!1618
 2021-11-26 13:55:43 +00:00
sphere
e0071c1c36 Merge branch '11-array-bounds' into 'master' 
Fix GCC 11 array-bounds warning in P_SetupStateAnimation

See merge request STJr/SRB2!1614
 2021-11-26 13:55:40 +00:00
spherallic
4480af69c7 Only show Ultimate mode warning in unmodified vanilla gameplay. 2021-11-26 14:18:08 +01:00
sphere
08e63fc822 Show values on (float) sliders in the options menu. 2021-11-26 14:18:00 +01:00
sphere
d9fde5c395 Add emblem counter to the Extras checklist. 2021-11-26 14:17:49 +01:00
sphere
a48c8826a1 Add modifiedgame warning to save select menu. 2021-11-26 14:17:36 +01:00
sphere
00c50aea78 Merge branch 'master' into 'next' 
merge master into next

Closes #671

See merge request STJr/SRB2!1657
 2021-11-25 09:25:52 +00:00
sphere
b868716672 Merge branch 'tails' into 'next' 
Remove misplaced CopyTiccmd from 2phuman (resolves #674)

Closes #674

See merge request STJr/SRB2!1627
 2021-11-25 09:19:53 +00:00
sphere
f191525fbb Merge branch 'interfree' into 'next' 
Don't cache the default background patches if we have an interscreen (resolves #546)

Closes #546

See merge request STJr/SRB2!1619
 2021-11-25 09:19:46 +00:00
sphere
e01c91d58a Merge branch 'fix-nonet-compiling' into 'next' 
Fix NONET compiling

See merge request STJr/SRB2!1651
 2021-11-25 09:19:30 +00:00
sphere
b955c9c4d5 Merge branch 'boxsparkle_mario' into 'next' 
Exclude MT_BOXSPARKLE from Mario blocks

See merge request STJr/SRB2!1556
 2021-11-24 13:43:20 +00:00
sphere
8a5cf4aea6 Merge branch 'ringslinger-penalty-split' into 'next' 
Fix Ringslinger weapon ring penalty missplitment

Closes #684

See merge request STJr/SRB2!1655
 2021-11-24 13:27:07 +00:00
sphere
88e022b6e1 Merge branch '555-2-2-9-rotated-patches-are-cropped-have-incorrect-dimensions' into 'next' 
Fix #555

Closes #555

See merge request STJr/SRB2!1648
 2021-11-24 12:22:11 +00:00
Hannu Hanhi
8136f5522b Fix uninitialized history pointers in thinkframe_hooks array 2021-11-10 01:55:31 +02:00
sphere
d776b1a23e Merge branch 'revert-2578e01c' into 'next' 
Revert "Merge branch 'writable-colormaps' into 'next'" (closes #675)

Closes #675

See merge request STJr/SRB2!1649
 2021-11-09 16:06:59 +00:00
Zwip-Zwap Zapony
cade6f3cf6 Fix Ringslinger weapon ring penalty missplitment 2021-11-09 16:59:49 +01:00
Hannu Hanhi
56c5a887c8 Call the Lua timestamp function getTimeMicros 2021-11-08 20:28:35 +02:00
Jaime Ita Passos
1d7061b892 Fix NONET compiling 2021-11-08 01:34:03 -03:00
Jaime Ita Passos
32a68f35c9 Change my name 2021-11-08 01:11:51 -03:00
LZA
34b05efdf1 Revert "Merge branch 'writable-colormaps' into 'next'" 
This reverts merge request !959
 2021-11-08 03:40:53 +00:00
Jaime Ita Passos
a14c008dee Fix #555 2021-11-08 00:38:24 -03:00
Hannu Hanhi
270c7701b4 Timestamp function for Lua 2021-11-08 01:17:30 +02:00
sphere
9a5bb59801 https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152 2021-11-07 12:51:21 +01:00
Jaime Ita Passos
0ecfc38c46 Remove misplaced line from R_DrawTiltedSplat_NPO2_8 2021-11-06 01:49:29 -03:00
katsy
da33cb674e fix water fof height calculation on slopes 2021-11-05 16:51:44 -05:00
SteelT
c55e973364 MSYS2: Don't compile with dynamic base 
Resolves #671
 2021-11-03 17:16:46 -04:00
sphere
06dfd360ee Merge branch 'drawntooverlay' into 'next' 
Make Overlay objects account for player->drawangle

See merge request STJr/SRB2!1599
 2021-10-29 10:40:25 +00:00
SMS Alfredo
865c0a081d Make Overlay objects account for player->drawangle 2021-10-29 10:40:25 +00:00
Hannu Hanhi
77ecfb9cdc Perfstats averaging and refactor 2021-10-29 02:18:02 +03:00
sphere
2d8230cb27 Merge branch 'sunnywithcloudsandshowers' into 'next' 
Fix broken rain to rain weather switching

See merge request STJr/SRB2!1626
 2021-10-27 17:52:29 +00:00
katsy
e10eddd11d Fix broken rain to rain weather switching 2021-10-27 17:52:29 +00:00
sphere
edaa955bcc Merge branch 'dave-credits' into 'next' 
Fix #672

Closes #672

See merge request STJr/SRB2!1623
 2021-10-27 17:51:29 +00:00
GoldenTails
8110473643 Give userdata that needed names some names. 2021-10-22 18:31:37 -05:00
FlykeSpice
a8c6a65260 Fix visplanes getting allocated twice 
I guess that is legacy remnant stuff
 2021-10-11 00:20:11 -04:00
Vincent Robinson
f70491b2b5 Make linedef 96 apply to tags from 97-99, but not to itself 2021-10-04 14:23:56 -07:00
SteelT
0f4074f22d Remove unused I_GetMouseGrab function 2021-09-23 13:46:26 -04:00
katsy
ed5942a0b6 fix tailsbot controls 2021-09-22 23:18:54 -05:00
katsy
791b981fd8 null gamestate during pre-intermission to prevent unwanted interaction 2021-09-22 16:22:47 -05:00
James R
d88eb7cc14 Missed the 'i' 2021-09-21 02:17:44 -07:00
James R
143a515445 Correct Big Wave Dave/InstantSonic credits 2021-09-21 02:15:11 -07:00
katsy
3d2f9e6150 don't create the default patches if we have an interscreen 2021-09-13 17:20:20 -05:00
James R
0ac36b7ce1 Remove mixed code and declarations warning 2021-09-12 19:07:40 -07:00
James R
923e6f31aa Fix faulty comparison 
Logical comparisons evaluate to a boolean value...
 2021-09-12 19:03:39 -07:00
James R
fec5f2778e Fix compiler warnings 2021-09-12 19:03:39 -07:00
James R
c33d8b3b5d Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor 2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d Revert "Merge branch 'draw-act-num' into 'next'" 
This reverts merge request !1532
 2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df Merge branch 'draw-act-num' into 'next' 
Expose act number drawing functions to Lua

See merge request STJr/SRB2!1532
 2021-09-12 22:15:43 +00:00
Tatsuru
252a48c2dc Merge branch 'shorter-hidetime' into 'next' 
Cut cv_hidetime's minimum value to 1 (resolves #586)

Closes #586

See merge request STJr/SRB2!1544
 2021-09-12 22:13:26 +00:00
Tatsuru
1875c0dc79 Merge branch 'where-the-fuck-is-my-mobj-at' into 'next' 
Add player mobj check to P_PlayerInPain (resolves #640)

Closes #640

See merge request STJr/SRB2!1587
 2021-09-12 22:06:54 +00:00
Tatsuru
bb0a0bd4ab Merge branch 'oneline' into 'next' 
Add a missing scale assignment to A_Boss3ShockThink

See merge request STJr/SRB2!1588
 2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78 Add a missing scale assignment to A_Boss3ShockThink 2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90 Merge branch 'shocksplit' into 'next' 
Split up x/y/z averages in A_Boss3ShockThink (resolves #589)

Closes #589

See merge request STJr/SRB2!1538
 2021-09-12 21:49:28 +00:00
Tatsuru
cd5ba1271a Merge branch 'youvebeenblocked' into 'next' 
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332)

Closes #332

See merge request STJr/SRB2!1491
 2021-09-12 21:38:40 +00:00
Tatsuru
66f054f150 Merge branch 'mapload-trigger-fix' into 'next' 
Don't call map load trigger linedefs when joining or reloading gamestate

See merge request STJr/SRB2!1592
 2021-09-12 21:08:52 +00:00
Tatsuru
df249a4a4d Merge branch 'folder-fixes' into 'next' 
Fix minor issues with folder addons

See merge request STJr/SRB2!1617
 2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e Fix minor issues with folder addons 2021-09-12 21:08:06 +00:00
Tatsuru
96a378ef1e Merge branch 'replay-overwrite-fix' into 'next' 
Replay overwrite fix

See merge request STJr/SRB2!1523
 2021-09-12 20:33:15 +00:00
Tatsuru
94799e2196 Merge branch 'fix-antique-ghost-netvars' into 'next' 
Fix antique ghost netvars

See merge request STJr/SRB2!1545
 2021-09-12 20:33:01 +00:00
Tatsuru
59e1706f5c Merge branch 'png-trans-fix' into 'next' 
Fix issue with png_get_tRNS

See merge request STJr/SRB2!1606
 2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6 Merge branch 'develop-fix' into 'next' 
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility

Closes #663

See merge request STJr/SRB2!1607
 2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c Merge branch 'playercontroldirection' into 'next' 
Remove camera dependency from P_GetPlayerControlDirection

Closes #183

See merge request STJr/SRB2!1512
 2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5 Merge branch 'fix-archiving-error-msg' into 'next' 
Fix incorrect error message during Lua archiving

See merge request STJr/SRB2!1593
 2021-09-12 20:27:17 +00:00
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
cbc5cc3b2a Fix GCC 11 array-bounds warning in P_SetupStateAnimation 
Removing inline here silences the warning somehow, it
could be a GCC bug?
 2021-09-03 17:18:00 -07: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
namishere
39bd9c6da8 Make next compile again 2021-08-30 23:18:25 -07: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
Shane Ellis
b73c24a0c5 Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility 2021-08-28 17:14:36 +00:00
Jaime Ita Passos
3ff8d9d3b1 Fix issue with png_get_tRNS 
This fixes an oversight where the return value of png_get_tRNS was
being ignored.
 2021-08-26 13:37:52 -03: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
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
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
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
SMS Alfredo
cb619fad5d Rebase on !1307 2021-07-07 19:57:28 -05:00
James R
b4fa98d2fb Refactor hudlib hooks to hooklib 
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.

HUD hooks may also be added using addHook.

    addHook('HUD', fn[, type])

hud.add still exists, but the intention is to remove it
eventually.
 2021-07-07 00:23:51 -07:00
James R
ae57b6ca86 MORE MACROS 
I just can't stop myself!
 2021-07-07 00:21:08 -07:00
James R
331329306c Refactor hook ref allocation 2021-07-06 20:27:00 -07:00
James R
a75d4a1c36 Automatically count hook values 2021-07-06 18:42:08 -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
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
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
James R
7d01bd38d8 Fix return value of Lua key hooks not being used 2021-06-29 01:49:53 -07:00