stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-25 20:20:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
13718 commits 173 branches 41 tags 295 MiB
Commit graph

13718 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
faee657572 Appveyor: update for new Makefile 2021-06-29 19:51:15 -07:00
James R
f79e0ee540 Appveyor: remove 64-bit target 2021-06-29 19:51:15 -07: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
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
MascaraSnake
06e06a1cb6 Replicate old hack in binary maps: Translucent FOFs set to full opacity cut cyan pixels 2021-06-27 18:45:56 +02:00
MascaraSnake
b0a762a45e Add missing null checks after P_AddFakeFloor calls 2021-06-27 17:49:00 +02:00
MascaraSnake
09bcc918c5 Fix alpha for rising and intangible FOFs 2021-06-27 17:14:34 +02:00
MascaraSnake
6f38e2fc8e Merge branch 'next' into udmf-fofs-mkii 2021-06-27 16:47:28 +02:00
MascaraSnake
ac5eb1518d Add floor/ceiling/both enum 2021-06-27 12:36:46 +02:00
MascaraSnake
2da5b54e73 Now that set flats linedef exists, simplify set heights linedef 2021-06-27 12:21:26 +02:00
MascaraSnake
099cea0a19 Implement "set flats" linedef type 2021-06-27 11:56:06 +02:00
MascaraSnake
13eb4cb359 Add plane mover linedef types to UDB config 2021-06-27 10:33:05 +02:00
MascaraSnake
4b0e311740 Fix typo 2021-06-27 09:54:48 +02:00
MascaraSnake
92982be76b Adapt the remaining plane movement linedef types to UDMF 2021-06-27 09:53:57 +02:00
flarn2006
a5cd764772 move MT_BOXSPARKLE in the list 2021-06-26 15:42:41 -04:00
flarn2006
22272732f0 Exclude MT_BOXSPARKLE from Mario blocks 2021-06-26 14:59:56 -04:00
MascaraSnake
588c56b224 Floor/ceiling movers: Stop abusing the texture variable to store the sourceline 2021-06-26 16:25:14 +02:00
MascaraSnake
202c56054e Remove unused ceiling_t variables 2021-06-26 16:15:38 +02:00
MascaraSnake
299b2dcff2 Fix a small oversight 2021-06-26 15:29:42 +02:00
MascaraSnake
446e78b6e2 Linedef type 403: Allow executor chaining and flat change at the same time 2021-06-26 15:28:28 +02:00
MascaraSnake
63eafff5fe Linedef type 403: Don't run the linedef executor twice 2021-06-26 14:53:14 +02:00
MascaraSnake
9fdd9060e4 Adapt crusher linedefs to UDMF 2021-06-26 12:53:14 +02:00
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
df965b1578 Fix thwomps going too fast by a factor of 8 2021-06-25 18:41:14 +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
LJ Sonic
4af3b860fd Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next 2021-06-25 00:30:30 +02: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
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