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
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
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
09506112d7
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +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
Nev3r
98481dc10b
Remove the bridge thinker entry from the ZB configuration.
2020-04-14 10:31: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
toaster
cc499515da
Update ZB config for Glaregoyle and Buggle object names, and Glaregoyle sprite name.
2019-11-12 15:57:23 -05:00
toaster
d8ad0b4eaa
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
MascaraSnake
336c5cc61d
Fixed a typo in the ZB config
2019-10-26 22:56:01 +02:00
toaster
f2596ab0bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
...
# Conflicts:
# extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
MascaraSnake
53ac815334
...and also rename the palm tree leaves accordingly
2019-10-25 20:48:51 +02:00
MascaraSnake
863101824a
Removed palm tree trunks from the ZB config. They no longer exist as mapthings.
2019-10-25 20:17:50 +02:00
MascaraSnake
0ef50557c2
Merge branch 'spinbust' into 'master'
...
Make spinbust behavior consistent with other bustable blocks
Closes #254
See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
toaster
386ac78600
Merge branch 'mace-place' into 'master'
...
Make maces normally placeable in maps.
See merge request STJr/SRB2Internal!390
2019-10-22 13:29:06 -04:00
