MascaraSnake
|
add371a1ce
|
Add UDMF thing types to UDB config
|
2021-12-14 19:48:05 +01:00 |
|
MascaraSnake
|
c1e22c4bb6
|
Add two more linedef/thing args because the maces need them
|
2021-12-14 06:43:06 +01:00 |
|
MascaraSnake
|
ac3dd146c7
|
Expose blendmodes to UDMF
|
2021-12-12 07:02:17 +01:00 |
|
MascaraSnake
|
f431b20911
|
Add new blendmode linedef types to config
|
2021-12-12 06:54:48 +01:00 |
|
MascaraSnake
|
dc4dd75810
|
Add NiGHTS mare trigger linedef type and deprecate the NiGHTS mare sector type
|
2021-12-09 20:57:44 +01:00 |
|
MascaraSnake
|
18e8ebf394
|
Add emerald check trigger linedef types and deprecate the emerald check sector type
|
2021-12-09 20:37:39 +01:00 |
|
MascaraSnake
|
22420f92d2
|
Some trigger lineder cleanup
|
2021-12-09 20:02:03 +01:00 |
|
MascaraSnake
|
c43d5c7183
|
Adapt linedef types 334-336 to UDMF
|
2021-12-09 19:53:14 +01:00 |
|
MascaraSnake
|
adaf599e87
|
Adapt linedef types 331-333 to UDMF
|
2021-12-09 19:33:02 +01:00 |
|
MascaraSnake
|
a7f5bcfea7
|
Adapt linedef type 305-307 to UDMF
|
2021-12-09 19:17:16 +01:00 |
|
MascaraSnake
|
670e32908e
|
Adapt linedef type 308 to UDMF
|
2021-12-09 18:56:50 +01:00 |
|
MascaraSnake
|
126cbdd189
|
Adapt linedef types 321-322 to UDMF
|
2021-12-09 18:15:27 +01:00 |
|
MascaraSnake
|
875ba7915c
|
Adapt linedef types 309-312 to UDMF
|
2021-12-09 08:49:50 +01:00 |
|
MascaraSnake
|
9d87e97275
|
Adapt linedef types 317-320 to UDMF
|
2021-12-09 08:08:04 +01:00 |
|
MascaraSnake
|
f86dff8cf2
|
Adapt linedef types 314-315 to UDMF
|
2021-12-09 07:56:15 +01:00 |
|
MascaraSnake
|
92e724faca
|
Adapt linedef types 303-304 to UDMF
|
2021-12-09 07:47:01 +01:00 |
|
MascaraSnake
|
f60873c19b
|
Adapt linedef types 300-302 to UDMF
|
2021-12-09 07:30:55 +01:00 |
|
MascaraSnake
|
87a6528f00
|
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
|
2021-12-03 19:26:46 +01:00 |
|
MascaraSnake
|
f5cda9f64c
|
Merge branch 'udmf-lighting' into udmf-linedef-executors
|
2021-12-03 19:23:24 +01:00 |
|
MascaraSnake
|
aee4996eba
|
Merge branch 'udmf-polyobjects' into udmf-lighting
|
2021-12-03 19:22:37 +01:00 |
|
MascaraSnake
|
99515bce24
|
Merge branch 'udmf-scrollers' into udmf-polyobjects
|
2021-12-03 19:21:44 +01:00 |
|
MascaraSnake
|
76962a3a3f
|
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
|
2021-12-03 19:20:39 +01:00 |
|
MascaraSnake
|
c4775ed37b
|
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
# extras/conf/SRB2-22.cfg
# src/p_ceilng.c
|
2021-12-03 19:10:29 +01:00 |
|
MascaraSnake
|
adce427299
|
Merge branch 'next' into udmf-fofs-mkii
# Conflicts:
# src/p_user.c
|
2021-12-03 18:58:02 +01:00 |
|
MascaraSnake
|
6dc49042de
|
Port katsy's bouncy FOF cleanup
|
2021-12-03 18:48:16 +01:00 |
|
spherallic
|
c1c7607cb0
|
Add toggle for linedef action 401 to not change the ceiling texture.
|
2021-12-02 01:52:45 +01:00 |
|
MascaraSnake
|
5f7babb53f
|
Adapt linedef type 313 to UDMF
|
2021-09-26 20:42:01 +02:00 |
|
MascaraSnake
|
c9f510d096
|
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
|
2021-09-26 07:12:32 +02:00 |
|
MascaraSnake
|
75ef804f64
|
Merge branch 'udmf-lighting' into udmf-linedef-executors
|
2021-09-26 07:01:56 +02:00 |
|
MascaraSnake
|
53f8a1bfb2
|
Merge branch 'udmf-polyobjects' into udmf-lighting
|
2021-09-26 07:01:23 +02:00 |
|
MascaraSnake
|
98f99e52f8
|
Merge branch 'udmf-scrollers' into udmf-polyobjects
|
2021-09-26 06:56:12 +02:00 |
|
MascaraSnake
|
db0e6b23d7
|
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
|
2021-09-26 06:53:20 +02:00 |
|
MascaraSnake
|
bfc13c2529
|
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
|
2021-09-26 06:50:34 +02:00 |
|
MascaraSnake
|
3cc66ba9cb
|
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
|
2021-09-23 11:44:17 +02:00 |
|
MascaraSnake
|
25bc48b8dd
|
Merge branch 'udmf-lighting' into udmf-linedef-executors
|
2021-09-23 11:31:01 +02:00 |
|
MascaraSnake
|
f22e0a41da
|
Merge branch 'udmf-polyobjects' into udmf-lighting
|
2021-09-23 11:22:23 +02:00 |
|
MascaraSnake
|
05b93b676e
|
Merge branch 'udmf-scrollers' into udmf-polyobjects
|
2021-09-23 11:02:23 +02:00 |
|
MascaraSnake
|
7f6933317d
|
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
|
2021-09-23 10:41:23 +02:00 |
|
MascaraSnake
|
280d23782c
|
Adapt linedef executor triggers that don't involve sector effects to UDMF
|
2021-09-23 10:21:53 +02:00 |
|
MascaraSnake
|
03c1c592ab
|
I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF)
|
2021-09-22 08:57:48 +02:00 |
|
MascaraSnake
|
8ef8279764
|
Adapt FOF-related linedef executors to UDMF
|
2021-09-22 07:32:39 +02:00 |
|
MascaraSnake
|
61e9adf30b
|
Adapt linedef type 412 to UDMF
|
2021-09-21 15:31:53 +02:00 |
|
MascaraSnake
|
132f3f21f1
|
Adapt linedef type 457 to UDMF
|
2021-09-21 15:10:50 +02:00 |
|
MascaraSnake
|
d8b5cb6c90
|
Adapt linedef type 422 to UDMF
|
2021-09-21 14:59:58 +02:00 |
|
MascaraSnake
|
19823fadbc
|
Mark bouncy FOF sector type as deprecated in ZB config
|
2021-09-21 11:55:15 +02:00 |
|
MascaraSnake
|
dbf6cd8b42
|
Add linedef type 76 to ZB config
|
2021-09-21 11:52:29 +02:00 |
|
MascaraSnake
|
f1ad91ab34
|
Add linedef type 467 to ZB config
|
2021-09-21 11:47:59 +02:00 |
|
MascaraSnake
|
2e120953ec
|
Fix typo in linedef type 400 conversion
|
2021-09-21 11:35:04 +02:00 |
|
MascaraSnake
|
d47069fbb6
|
Adapt linedef types 409 and 410 to UDMF
|
2021-09-21 11:30:34 +02:00 |
|
MascaraSnake
|
cabafeef1c
|
Adapt linedef type 464 to UDMF
|
2021-09-21 10:35:01 +02:00 |
|
MascaraSnake
|
890934264b
|
Adapt linedef type 414 to UDMF
|
2021-09-21 10:14:55 +02:00 |
|
MascaraSnake
|
69e0c636a0
|
Adapt linedef type 459 to UDMF
|
2021-09-21 09:05:40 +02:00 |
|
MascaraSnake
|
ea1d442f31
|
Adapt linedef type 434 to UDMF
|
2021-09-21 08:34:55 +02:00 |
|
MascaraSnake
|
17bd20a15e
|
Adapt linedef type 463 to UDMF
|
2021-09-21 07:44:55 +02:00 |
|
MascaraSnake
|
b898a773ab
|
Adapt linedef types 425 and 442 to UDMF
|
2021-09-21 07:36:54 +02:00 |
|
MascaraSnake
|
1bbf1b2887
|
Adapt linedef type 438 to UDMF
|
2021-09-20 14:50:18 +02:00 |
|
MascaraSnake
|
3a73c6167c
|
Adapt linedef type 439 to UDMF
|
2021-09-20 14:42:21 +02:00 |
|
MascaraSnake
|
877ec96eec
|
Adapt a whole bunch of linedef executors to UDMF
|
2021-09-20 14:25:07 +02:00 |
|
MascaraSnake
|
6010faf10c
|
Add linedef executors without parameters to UDMF config
|
2021-09-20 13:37:04 +02:00 |
|
MascaraSnake
|
00b04f6d9e
|
Adapt some player-related linedef executors to UDMF
|
2021-09-20 13:31:32 +02:00 |
|
MascaraSnake
|
4028d392b0
|
Adapt linedef types 423 and 424 to UDMF
|
2021-09-20 12:42:31 +02:00 |
|
MascaraSnake
|
d2eb4587c2
|
Adapt linedef type 415 to UDMF
|
2021-09-20 12:32:01 +02:00 |
|
MascaraSnake
|
1b339a9e00
|
Adapt linedef types 600-601 to UDMF
|
2021-09-20 08:36:55 +02:00 |
|
MascaraSnake
|
1784c7b0ef
|
Add linedef executor for modifying (as opposed to copying) a sector's light level
|
2021-09-20 07:54:10 +02:00 |
|
MascaraSnake
|
6871262909
|
Allow "fade light level" linedef executor to fade relative to current value
|
2021-09-19 23:12:30 +02:00 |
|
MascaraSnake
|
318c1b477d
|
Adapt lighting effects to UDMF
|
2021-09-19 17:07:08 +02:00 |
|
MascaraSnake
|
fe708db398
|
Adapt setup of some lighting linedef executors to UDMF
|
2021-09-19 14:23:04 +02:00 |
|
MascaraSnake
|
de82afe338
|
Merge branch 'udmf-scrollers' into udmf-polyobjects
|
2021-09-17 10:36:35 +02:00 |
|
MascaraSnake
|
e144f97d35
|
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
|
2021-09-17 10:35:41 +02:00 |
|
MascaraSnake
|
a5959c0248
|
Merge branch 'next' into udmf-plane-linedefs
# Conflicts:
# src/p_inter.c
|
2021-09-17 10:34:07 +02: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 |
|
MascaraSnake
|
7e88db938d
|
Adapt polyobject translucency fade linedef to UDMF
|
2021-07-04 19:28:14 +02:00 |
|
MascaraSnake
|
6d007f388a
|
Adapt set translucency linedef to UDMF
|
2021-07-04 15:37:42 +02:00 |
|
MascaraSnake
|
d2ad12c034
|
Adapt polyobject displacement linedefs to UDMF
|
2021-07-04 14:41:37 +02:00 |
|
MascaraSnake
|
429c6588af
|
Adapt polyobject waving flag linedef to UDMF
|
2021-07-04 14:10:11 +02:00 |
|
MascaraSnake
|
5c2ce62f00
|
Adapt polyobject visibility/tangibility linedefs to UDMF
|
2021-07-04 13:45:41 +02:00 |
|
MascaraSnake
|
2cbda0e5ac
|
Adapt polyobject waypoint movement linedef to UDMF
|
2021-07-04 13:20:10 +02:00 |
|
MascaraSnake
|
6e9afabd44
|
Adapt polyobject move and rotate linedef types to UDMF
|
2021-07-04 12:54:48 +02:00 |
|
MascaraSnake
|
3b1d64703d
|
Adapt polyobject door move linedef types to UDMF
|
2021-07-02 17:18:55 +02:00 |
|
MascaraSnake
|
805bafd936
|
Adapt "change plane scroller direction" linedef type to UDMF
|
2021-07-02 12:51:39 +02:00 |
|
MascaraSnake
|
6dfca597c5
|
UDB config: Merge scroller and pusher sections
|
2021-07-01 23:16:11 +02:00 |
|
MascaraSnake
|
3542e2205d
|
Add wind/current linedef to UDB config
|
2021-07-01 20:47:07 +02:00 |
|
MascaraSnake
|
052bfe130c
|
Make exclusive scrolling the default
|
2021-07-01 00:47:56 +02:00 |
|
MascaraSnake
|
977887f456
|
Adapt scroller linedefs to UDMF
|
2021-06-30 23:50:54 +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
|
770612bc9d
|
Adapt moving platform linedef specials to UDMF
|
2021-06-25 11:33: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 |
|
sphere
|
0e030466e1
|
Add flag to line slopes for copying their slopes to the other side.
|
2021-06-17 13:23:27 +02:00 |
|
sphere
|
df5c9933ec
|
Restore toggle for Robo-Hood to not jump away from nearby players.
|
2021-06-16 16:12:38 +02:00 |
|
flarn2006
|
0b51b391f1
|
Make 96's flags consistent with 97-99 by default
|
2021-05-30 12:16:15 -04:00 |
|
flarn2006
|
8d8f62baef
|
Add additional multitagging functionality
|
2021-05-28 23:59:39 -04:00 |
|
sphere
|
c25ecfc35f
|
Merge branch 'more-slope-copying' into 'next'
Add more actions for slope copying
See merge request STJr/SRB2!1406
|
2021-05-10 07:43:03 -04:00 |
|
Vincent Robinson
|
f437d6afec
|
Add linedef specials for multitagging in binary maps
|
2021-04-26 16:27:39 -07:00 |
|
sphere
|
dbc7f93f15
|
Fix incorrect prefixes in the config
|
2021-04-10 11:52:15 -04:00 |
|
sphere
|
0d628c351a
|
Update Zone Builder configuration.
|
2021-04-10 17:44:42 +02:00 |
|
sphere
|
d305952119
|
Update ZB config: at this rate, ZB will update before this gets merged.
|
2021-02-24 10:30:48 +01:00 |
|
sphere
|
998d065698
|
Add more actions for slope copying & update the ZB config.
|
2021-02-17 16:06:02 +01:00 |
|
GoldenTails
|
0d1973075d
|
Nice UDB config there, SRB2.
|
2020-12-24 03:22:08 -06:00 |
|
Nev3r
|
ac8590132b
|
Add a provisional GZDoom-esque 3D floor setup for the sake of immediate UDB usability.
|
2020-07-13 11:09:19 +02:00 |
|
MascaraSnake
|
88aad41310
|
Remove unnecessary options from quicksand FOF again
|
2020-06-12 18:22:16 +02:00 |
|
MascaraSnake
|
06b581dcdf
|
Trim down options for the bobbing FOF preset types
|
2020-06-12 17:48:43 +02:00 |
|
MascaraSnake
|
5f9af65aa0
|
Revamp alpha setup for the remaining FOFs
|
2020-06-12 16:45:18 +02:00 |
|
MascaraSnake
|
6521496d8a
|
Revamp alpha setup for bobbing FOFs
|
2020-06-12 10:53:27 +02:00 |
|
MascaraSnake
|
3317827151
|
Revamp alpha setup for bustable FOFs
|
2020-06-12 10:31:26 +02:00 |
|
MascaraSnake
|
f4e28f5cc4
|
Revamp alpha setup for quicksand FOFs
|
2020-06-12 10:23:16 +02:00 |
|
MascaraSnake
|
cc6820187c
|
Handle splat flag for laser FOFs
|
2020-06-12 10:17:52 +02:00 |
|
MascaraSnake
|
cadb03fd12
|
Revamp alpha setup for laser FOFs
|
2020-06-12 10:03:27 +02:00 |
|
MascaraSnake
|
d6a104f8a5
|
Revamp alpha setup for custom FOFs
|
2020-06-12 09:57:56 +02:00 |
|
MascaraSnake
|
ac549eddeb
|
Revamp alpha setup for crumbling FOFs
|
2020-06-12 09:28:41 +02:00 |
|
MascaraSnake
|
1ad8f75538
|
Revamp alpha setup for water FOFs
|
2020-06-12 09:00:06 +02:00 |
|
MascaraSnake
|
8dd3c78b05
|
Add FOF flag for splat flat rendering
|
2020-06-12 08:27:10 +02:00 |
|
MascaraSnake
|
9dbfa28dbc
|
Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
# extras/conf/udb/Includes/SRB222_linedefs.cfg
# src/p_setup.c
|
2020-06-09 09:50:02 +02:00 |
|
MascaraSnake
|
d07c376f6d
|
Adapt POF_SPLAT to UDMF setup
|
2020-06-09 09:44:49 +02:00 |
|
MascaraSnake
|
4a0206b38d
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
|
2020-06-09 09:38:01 +02:00 |
|
MascaraSnake
|
33ed36cf4b
|
Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)
|
2020-06-03 19:41:47 +02:00 |
|
MascaraSnake
|
11493e61d2
|
Merge branch 'executordelay' into 'udmf-next'
UDMF linedef executor delay
See merge request STJr/SRB2!918
|
2020-06-01 07:57:23 -04:00 |
|
sphere
|
d6ea89de6f
|
Rename the rest of the wall scrollers in the ZB config.
|
2020-05-23 16:41:38 +02:00 |
|
sphere
|
934b28989f
|
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
|
2020-05-19 23:39:35 +02:00 |
|
MascaraSnake
|
4cd5d76066
|
Remove linedef type 21 from ZB config (somehow I forgot to do that)
|
2020-05-17 14:18:27 +02:00 |
|
MascaraSnake
|
02c2aeb46a
|
Merge branch 'udmf-next' into udmf-fofs-mkii
|
2020-05-13 16:23:36 +02:00 |
|
MascaraSnake
|
d3ec12c842
|
Merge branch 'udmf-next' into executordelay
# Conflicts:
# src/p_spec.c
|
2020-05-13 09:55:25 +02:00 |
|
MascaraSnake
|
df3ca712d8
|
Move polyobject crush option to the first line args
|
2020-05-04 23:27:26 +02:00 |
|
MascaraSnake
|
8c36b9efa5
|
Adapt basic PolyObject setup to UDMF
|
2020-05-04 22:40:49 +02:00 |
|
MascaraSnake
|
6e7373a475
|
Merge branch 'next' into udmf-next
|
2020-05-04 20:32:56 +02:00 |
|
MascaraSnake
|
023c095d55
|
Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup
See merge request STJr/SRB2!919
|
2020-05-04 14:18:08 -04:00 |
|
MascaraSnake
|
41efc0786d
|
Add new PolyObject flag to ZB config
|
2020-05-04 19:55:25 +02:00 |
|
MascaraSnake
|
a881662ca9
|
Implement "set linedef executor delay" linedef type
|
2020-05-03 21:03:15 +02:00 |
|
MascaraSnake
|
f7bcc759b6
|
Merge branch 'next' into egg-capsule
# Conflicts:
# extras/conf/SRB2-22.cfg
|
2020-05-03 16:00:05 +02:00 |
|
MascaraSnake
|
1b66d1f936
|
Add object dye linedef executors to ZB config
|
2020-05-03 15:57:18 +02:00 |
|
MascaraSnake
|
dd50990e85
|
Add "trigger egg capsule" linedef executor
|
2020-05-03 15:22:13 +02:00 |
|
MascaraSnake
|
1aafc2f463
|
Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type
|
2020-05-03 12:44:30 +02:00 |
|
MascaraSnake
|
35e9e5b33c
|
Rearrange FOF flags and improve custom FOF backwards compatibility
|
2020-05-03 09:13:14 +02:00 |
|
MascaraSnake
|
96a464c881
|
Move FOF modifier linedef type to the 70s range, to avoid being considered FOFs themselves
|
2020-05-03 08:43:16 +02:00 |
|
MascaraSnake
|
f8f773d6e7
|
Remove "bustable" and "quicksand" flags from custom FOF in the UDB config, since you're not supposed to set them that way
|
2020-05-02 23:06:44 +02:00 |
|
MascaraSnake
|
0d4d7bfc38
|
Adapt custom FOF setup
|
2020-05-02 23:00:22 +02:00 |
|
MascaraSnake
|
25219b614e
|
Implement "Make FOF quicksand" linedef type
|
2020-05-02 22:07:42 +02:00 |
|
MascaraSnake
|
1693689305
|
Implement "make FOF bustable" linedef type
|
2020-05-02 21:50:49 +02:00 |
|
MascaraSnake
|
be92ed7091
|
UDB config fix
|
2020-05-02 20:24:17 +02:00 |
|
MascaraSnake
|
312a2def3d
|
Implement "add laser thinker to FOF" linedef type
|
2020-05-02 10:30:21 +02:00 |
|
MascaraSnake
|
3b0fc857c8
|
UDB config fix
|
2020-05-01 19:43:44 +02:00 |
|
MascaraSnake
|
7000c203a2
|
Implement "add thwomp thinker to FOF" linedef type
|
2020-05-01 19:41:52 +02:00 |
|
MascaraSnake
|
cada0d2928
|
Implement "add airbob thinker to FOF" linedef type
|
2020-05-01 19:29:19 +02:00 |
|
MascaraSnake
|
d7363ff87a
|
Implement linedef type that adds a raise thinker to an FOF
|
2020-05-01 19:07:29 +02:00 |
|
MascaraSnake
|
f2011cc99b
|
More config fixes
|
2020-05-01 14:59:08 +02:00 |
|
MascaraSnake
|
3a05d7b333
|
Fix ZB config typo
|
2020-05-01 14:55:20 +02:00 |
|
MascaraSnake
|
d9f761b619
|
Adapt setup of rising FOFs
|
2020-04-27 11:52:31 +02:00 |
|
MascaraSnake
|
7198cc46fd
|
Adapt setup of water bobbing FOF
|
2020-04-27 11:05:27 +02:00 |
|
MascaraSnake
|
607aeb3a52
|
Adapt setup of air bobbing FOFs
|
2020-04-27 10:29:29 +02:00 |
|
MascaraSnake
|
e00531ed9c
|
Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
# src/p_floor.c
# src/p_spec.c
# src/p_spec.h
|
2020-04-26 11:13:09 +02:00 |
|
MascaraSnake
|
3170f2b8c3
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
|
2020-04-24 21:15:53 +02:00 |
|
sphere
|
25affe6948
|
Make emerald hunt shards spawn at correct heights, and add Float option.
|
2020-04-22 18:58:40 +02:00 |
|
Nev3r
|
efb81fc526
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-20 09:05:21 +02:00 |
|
James R
|
cbe181c66d
|
Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.
See merge request STJr/SRB2!877
|
2020-04-18 20:16:07 -04:00 |
|
MascaraSnake
|
8e5effa07b
|
Merge branch 'udmf-argenums' into udmf-fofs-mkii
|
2020-04-18 17:23:02 +02:00 |
|
MascaraSnake
|
09506112d7
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02:00 |
|
MascaraSnake
|
2e9dc59ca7
|
Forgot some stuff regarding FOF type 170
|
2020-04-15 09:49:00 +02:00 |
|
Nev3r
|
d40713d08b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-14 22:20:54 +02:00 |
|
MascaraSnake
|
5389344a32
|
Implement FOF type 257
|
2020-04-14 11:56:11 +02:00 |
|
MascaraSnake
|
e3b86d0c74
|
Implement FOF types 252-256
|
2020-04-14 11:45:37 +02:00 |
|
Nev3r
|
98481dc10b
|
Remove the bridge thinker entry from the ZB configuration.
|
2020-04-14 10:31:26 +02:00 |
|
MascaraSnake
|
f8c51ccde3
|
Implement FOF types 220-222
|
2020-04-14 10:13:38 +02:00 |
|
MascaraSnake
|
9fc2b5b1b9
|
Implement FOF type 258
|
2020-04-14 09:51:48 +02:00 |
|
MascaraSnake
|
32a1131c68
|
Implement FOF type 251
|
2020-04-14 09:43:49 +02:00 |
|
MascaraSnake
|
916f831edb
|
Implement linedef type 250
|
2020-04-14 09:14:10 +02:00 |
|
MascaraSnake
|
fdb46e5d14
|
Implement FOF types 202 and 223
|
2020-04-14 09:06:02 +02:00 |
|
MascaraSnake
|
60e589e92a
|
Implement FOF types 200-201
|
2020-04-14 09:03:00 +02:00 |
|
MascaraSnake
|
7f889532ea
|
Adapt solid FOF setup in UDB config
|
2020-04-14 09:00:26 +02:00 |
|
sphere
|
01b28b66a6
|
Make linedef type 461 able to set object angle, using the line's angle.
|
2020-04-13 17:10:25 +02:00 |
|
MascaraSnake
|
ab133e50c9
|
Add wall spike arrow to UDB config as well
|
2020-03-22 12:56:59 +01:00 |
|
MascaraSnake
|
c931b4fa67
|
Merge branch 'next' into udmf-next
|
2020-03-22 12:56:21 +01:00 |
|
MascaraSnake
|
48e8c9058a
|
Add arrow to wall spike in ZB config
|
2020-03-22 12:55:34 +01:00 |
|
MascaraSnake
|
79bfe14678
|
Move UDB configs into a subfolder
|
2020-03-22 08:08:34 +01:00 |
|
MascaraSnake
|
c4b5c20d3d
|
Add UDB config
|
2020-03-22 08:04:28 +01:00 |
|
MascaraSnake
|
6911097b56
|
Minor ZB config fix
|
2020-03-22 07:50:57 +01:00 |
|
MascaraSnake
|
c806d8a5e8
|
Another ZB config fix
|
2020-03-21 20:17:28 +01:00 |
|
MascaraSnake
|
d2c83e1cda
|
Add Object Special text for Star Post
|
2020-03-21 15:16:07 +01:00 |
|
MascaraSnake
|
06f9246fd3
|
Updates and fixes for the ZB config
|
2020-03-21 12:06:52 +01:00 |
|
MascaraSnake
|
2107b89586
|
Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB
|
2020-03-21 09:40:37 +01:00 |
|
Alam Ed Arias
|
d588e3ca9c
|
Merge branch 'master' into next
|
2019-12-28 21:43:16 -05:00 |
|
Alam Ed Arias
|
2acb4f9840
|
Revert "Delete the original configuration file."
This reverts commit 2cf94ea6ae .
|
2019-12-28 21:43:10 -05:00 |
|
MascaraSnake
|
08895ef751
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:43:27 +01:00 |
|
MascaraSnake
|
f83d0fe3a1
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:42:16 +01:00 |
|
Nev3r
|
2cf94ea6ae
|
Delete the original configuration file.
|
2019-12-24 12:02:49 +01:00 |
|
Nev3r
|
75e18610bc
|
Refactor existing configuration into ZDoom-styled format.
|
2019-12-24 11:58:25 +01:00 |
|
MascaraSnake
|
2775d5f52f
|
SDURF to SURF turned out to be contentious.
|
2019-12-07 06:46:37 -05:00 |
|
MascaraSnake
|
d87251f853
|
Rename SDURF to SURF and CastleBot FaceStabber to Lance-a-Bot for maximum pun
|
2019-12-07 09:51:09 +01:00 |
|
toaster
|
7909d48391
|
(Temporary?) config name reversion to allow brakyeet merger
|
2019-11-30 05:07:33 -05:00 |
|
toaster
|
60006e20fb
|
Edit config to account for new behaviour (plus add gold mode for the Eggman Statue, which I forgot to add earlier).
|
2019-11-29 21:59:06 +00:00 |
|
FuriousFox
|
b231719eed
|
Missed a semicolon
|
2019-11-24 16:09:18 -05:00 |
|
FuriousFox
|
ba69a39802
|
Updated the list of which skies are associated with which maps, rearranged the list of character to match the character select in-game, and added myself to the file's credits.
(Re-did all of this because I think I messed up the branches and stuff last time.
|
2019-11-24 15:43:49 -05:00 |
|
FuriousFox
|
9b36cc32c9
|
Added Dragonbomber
|
2019-11-23 16:37:33 -05:00 |
|
FuriousFox
|
869764be7d
|
Added Blue Gargoyle and Green Flame
|
2019-11-23 15:04:59 -05:00 |
|
FuriousFox
|
bfae969ca6
|
Updated sprite for Minus
|
2019-11-23 14:21:48 -05:00 |
|
MascaraSnake
|
1f7e5aa150
|
Minor capitalization fix in ZB config
|
2019-11-13 21:07:06 +01:00 |
|
MascaraSnake
|
14477748be
|
Merge branch 'stopclock' into 'master'
Stop the clock!
See merge request STJr/SRB2Internal!450
|
2019-11-13 14:39:59 -05:00 |
|