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
James R
90763d42e1
Shuffle LUA_HookKey
2021-06-29 01:49:45 -07:00
James R
753522fbb6
Merge remote-tracking branch 'origin/master' into next
2021-06-24 14:14:17 -07:00
James R
1721b5b060
Merge branch 'makefile-patches-1' into 'master'
...
Some issues with the Makefile
See merge request STJr/SRB2!1553
2021-06-24 16:30:11 -04:00
James R
ed85e994a4
Remove misplaced parentheses
2021-06-22 15:49:59 -07:00
James R
c3ad5de912
Makefile: let variables be defined on Make line
...
If a variable is defined as in 'make CC=gcc-10', then that
definition overrides anything other definition in the
Makefile.
2021-06-22 15:47:48 -07:00
James R
5f4d7e3c5b
Makefile: fail if old build directories exist
...
After a checkout from before revision, old directories
such as bin/Linux64 only remain if untracked files exist
within. This may be confusing to the user. They may even
use an outdated executable if it is one of those untracked
files.
2021-06-22 15:14:42 -07:00
LJ Sonic
c319f46462
Merge branch 'hooklib-refactor' into 'next'
...
Hooklib refactor
See merge request STJr/SRB2!1307
2021-06-22 09:52:12 -04:00
James R
d5146945a6
Makefile: don't automatically set WINDOWSHELL unless PATH matches Windows norms
...
This is for MSYS2, which requires unix shell commands.
2021-06-21 16:10:13 -07:00
James R
2d7a8c3c57
Makefile: use shell commands to read in Sourcefile
...
File function is not supported < Make 4.2.
2021-06-21 14:51:42 -07:00
James R
fa7a674113
Merge remote-tracking branch 'origin/master' into next
2021-06-19 19:39:15 -07:00
James R
c1aca51fc3
Fix basic warnings
2021-06-19 18:32:56 -07:00
Shane Ellis
09f445f227
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/g_game.c
2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
2021-06-19 20:49:12 +02:00
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
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
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
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
sphere
52f9b47ce3
Ignore a linedef tag of 0 when using linedef action 96.
2021-06-10 17:49:33 +02: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
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
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
sphere
6ff212b79f
Use floating-point math for polyobject planes as well.
2021-06-03 16:01:09 +02:00
lachablock
476dcc861b
Restore P_AproxDistance Lua parity
2021-06-03 14:36:29 +10:00
