LJ Sonic
28f4418132
Merge branch 'lua-inputs' into 'next'
...
Let Lua access key presses, mouse properties, and joystick properties
See merge request STJr/SRB2!1436
2021-06-19 10:40:23 -04:00
LJ Sonic
cfa48574be
Merge branch 'next' into 'lua-inputs'
...
# Conflicts:
# src/lua_script.c
2021-06-19 10:34:48 -04:00
sphere
357b64129c
Merge branch 'robo-hood-nojump' into 'next'
...
Restore toggle for Robo-Hood to not jump away from nearby players.
See merge request STJr/SRB2!1548
2021-06-18 10:00:42 -04:00
Radicalicious
63d217b689
Revert "Hopefully fix ghosts"
...
This reverts commit e46afda896
2021-06-18 05:06:52 +00:00
Radicalicious
e46afda896
Hopefully fix ghosts
2021-06-18 01:04:49 -04:00
sphere
3486e12088
Merge branch 'multitag-ignore0' into 'next'
...
Ignore a linedef tag of 0 when using linedef action 96.
See merge request STJr/SRB2!1543
2021-06-17 13:03:05 -04:00
sphere
0e030466e1
Add flag to line slopes for copying their slopes to the other side.
2021-06-17 13:23:27 +02:00
James R
b04c79d8a7
Say 'at'
2021-06-16 16:58:47 -07:00
James R
3436d1a83c
Add a proxy Makefile at top level
2021-06-16 16:26:18 -07:00
James R
c142b3241d
Makefile: alert full path of final executable
...
With added textual contrast.
2021-06-16 16:26:17 -07:00
James R
3a044e71cc
Disable EXE disassembly and compression by default
...
NOOBJDUMP=1 and NOUPX=1 have been removed. Make 'dump'
target to disassemble. UPX=upx to compress executable.
Setting UPX used to cause it to fail. That has been fixed.
2021-06-16 15:39:23 -07:00
James R
4e71ee7acb
Merge branch 'makefile-revision-final'
2021-06-16 14:47:03 -07:00
sphere
df5c9933ec
Restore toggle for Robo-Hood to not jump away from nearby players.
2021-06-16 16:12:38 +02:00
sphere
d90b6949d7
Merge branch 'i-havent-the-foggiest' into 'next'
...
Allow P_CheckSight to see through FF_FOG FOFs
See merge request STJr/SRB2!1546
2021-06-16 09:29:01 -04:00
sphere
d11a1bb016
Merge branch 'srbii' into 'next'
...
Replace "II" in credits with "2" for consistency
See merge request STJr/SRB2!1547
2021-06-15 05:42:59 -04:00
Radicalicious
781678389f
Replace "II" with "2" for consistency
2021-06-12 20:36:57 -04:00
James R
8be7c1a03d
Fix double micros conv.
...
blame e0a307da15
2021-06-11 18:31:38 -07:00
Radicalicious
460d46bbc9
Cut cv_hidetime's minimum value all the way down to 1
2021-06-11 10:52:31 -04:00
James R
46ca9613c6
Pop hook id fetched from table
2021-06-10 18:09:39 -07:00
James R
c9417f26e5
Fix pop original table in lua net archive
2021-06-10 17:47:03 -07:00
Monster Iestyn
4c9b83b6bd
Allow P_CheckSight to see through FF_FOG FOFs
2021-06-10 21:20:42 +01:00
Ors
2a89154667
Revert an accidental whitespace change
2021-06-10 14:23:51 -04:00
Riku Salminen
f1a96bd7ee
Add support for ghosts with netvars in 2.2.6 and before
2021-06-10 21:18:45 +03:00
Radicalicious
9210923b86
Cut cv_hidetime's minimum value to 5 seconds
2021-06-10 12:59:54 -04:00
sphere
52f9b47ce3
Ignore a linedef tag of 0 when using linedef action 96.
2021-06-10 17:49:33 +02:00
Radicalicious
165be34206
Fix player maxstep, oops
2021-06-09 12:59:06 -04:00
Riku Salminen
45e57fa791
Revert "Revert "Made height/spinheight and height change values in replays more accurate""
...
This reverts commit fbeabad797
2021-06-09 19:40:59 +03:00
Riku Salminen
fbeabad797
Revert "Made height/spinheight and height change values in replays more accurate"
...
This reverts commit 3daee0ebf8
2021-06-09 19:28:14 +03:00
sphere
786516fa5f
Merge branch 'kart-latency' into 'next'
...
Kart cmd->latency port
See merge request STJr/SRB2!1470
2021-06-09 10:53:09 -04:00
Radicalicious
976373dd37
Calculate maxstep for pushables
2021-06-08 23:45:50 -04:00
sphere
be8c97728c
Merge branch 'aproxdistance' into 'next'
...
Restore P_AproxDistance Lua parity
See merge request STJr/SRB2!1531
2021-06-08 07:47:38 -04:00
lachablock
4d1b3edb03
Split up x/y/z averages in A_Boss3ShockThink
2021-06-08 17:21:54 +10:00
James R
c325306ddf
Merge remote-tracking branch 'origin/master' into makefile-revision-final
2021-06-07 18:36:01 -07:00
James R
0f4eb4fab9
Merge conflicts 4d22b9f17
2021-06-07 18:13:56 -07:00
James R
4d22b9f17f
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2021-06-07 18:12:52 -07:00
lachablock
0c5018040c
Merge remote-tracking branch 'origin/master' into next
2021-06-06 21:25:08 +10:00
sphere
2bc707305b
Merge branch 'metalrecording' into 'next'
...
Expose `metalrecording` global to Lua.
See merge request STJr/SRB2!1536
2021-06-06 07:08:42 -04:00
sphere
c266a27073
Merge branch 'master' into 'master'
...
Fix console text bleeding
See merge request STJr/SRB2!1434
2021-06-06 07:01:30 -04:00
GoldenTails
409cba678d
metalrecording
2021-06-05 18:35:44 -05:00
Monster Iestyn
090e5384d5
Merge branch 'blendmode-rangecheck' into 'next'
...
Handle invalid blend modes
See merge request STJr/SRB2!1486
2021-06-05 09:02:31 -04:00
Radicalicious
7483a9d049
Switch num and flags so flags is optional
2021-06-03 10:55:42 -04:00
sphere
6ff212b79f
Use floating-point math for polyobject planes as well.
2021-06-03 16:01:09 +02:00
Radicalicious
cb5e433a49
Update lua_hudlib.c
2021-06-03 09:34:18 -04:00
lachablock
476dcc861b
Restore P_AproxDistance Lua parity
2021-06-03 14:36:29 +10:00
Shane Ellis
18c47afc76
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/lua_baselib.c
# src/r_skins.c
2021-06-02 11:47:11 -04:00
sphere
2df75610e6
Merge branch 'allow-lua-to-override-special-stages' into 'next'
...
Allows Lua to transport you to a different map in place of a Special Stage.
See merge request STJr/SRB2!1368
2021-06-02 11:16:15 -04:00
sphere
8cfe7cd971
Merge branch 'unix-rdynamic' into 'next'
...
Compile with -rdynamic for UNIXCOMMON platforms
See merge request STJr/SRB2!1481
2021-06-02 06:31:14 -04:00
sphere
4aa3bea6ca
Merge branch 'fix-console-splitting' into 'next'
...
Fix the console splitting up halfway through startup.
Closes #349
See merge request STJr/SRB2!1494
2021-06-02 06:31:01 -04:00
sphere
fb453491dd
Merge branch 'models-spr2endstate' into 'next'
...
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state
See merge request STJr/SRB2!1515
2021-06-02 06:28:51 -04:00
Nev3r
a4300220e9
whitespace
2021-06-02 11:36:52 +02:00
