Commit graph

12280 commits

Author SHA1 Message Date
MascaraSnake
c8bb18b389 Adapt linedef type 53-58 to UDMF 2021-06-26 10:23:12 +02:00
MascaraSnake
5b1a42af4c Refactor T_MoveFloor 2021-06-26 10:00:40 +02:00
MascaraSnake
de462f1213 Refactor T_MoveCeiling 2021-06-26 09:43:46 +02:00
MascaraSnake
d5490132b9 Remove crusher types from T_MoveCeiling (they're handled by T_CrushCeiling) 2021-06-26 09:30:17 +02:00
MascaraSnake
8f39e23105 Adapt linedef type 405 and 407 to UDMF 2021-06-26 08:43:35 +02:00
MascaraSnake
53976e4b52 Adapt linedef types 403-404 to UDMF 2021-06-26 08:31:59 +02:00
MascaraSnake
0eabbf0170 Instant ceiling movement: Only change texture if it's not -1 2021-06-25 22:06:04 +02:00
MascaraSnake
6abcba6876 Adapt linedef types 400-401 to UDMF + some EV_ cleanup 2021-06-25 18:34:56 +02:00
MascaraSnake
825b4b384a Remove unused elevateCurrent elevator type 2021-06-25 11:40:19 +02:00
MascaraSnake
770612bc9d Adapt moving platform linedef specials to UDMF 2021-06-25 11:33:16 +02:00
MascaraSnake
259700be3c Get rid of customspeed in EV_DoElevator and read speed from args[1] 2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95 -Pass tag as argument to EV_ functions
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
2021-06-25 10:12:16 +02:00
MascaraSnake
4bedca6ba7 Rename some of the generalized 3D floor args 2021-06-25 08:44:35 +02:00
MascaraSnake
ffece845e4 UDB config: Add prefix to generalized 3D floor 2021-06-23 23:02:25 +02:00
MascaraSnake
5df079c653 Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated 2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02: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
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
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
lachablock
476dcc861b Restore P_AproxDistance Lua parity 2021-06-03 14:36:29 +10: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