stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
15695 commits 171 branches 41 tags 312 MiB
Commit graph

119 commits

Author SHA1 Message Date
MascaraSnake
53f8a1bfb2 Merge branch 'udmf-polyobjects' into udmf-lighting 2021-09-26 07:01:23 +02:00
MascaraSnake
bfc13c2529 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 2021-09-26 06:50:34 +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
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
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
099cea0a19 Implement "set flats" linedef type 2021-06-27 11:56:06 +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
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
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
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
sphere
25affe6948 Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +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
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
48e8c9058a Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +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
f83d0fe3a1 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:42:16 +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
MascaraSnake
0a321b96d3 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
MascaraSnake
1604e4d439 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
toaster
920736ac8b Grouped ports from object_tweaks. 
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
 2019-10-19 15:57:01 +01:00
toaster
f2bbf53c0d Change boost panel thing numbers per MS's request. 2019-10-19 14:32:15 +01:00
toaster
ad09f2603d * New object types! 
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
 2019-10-18 18:33:45 +01:00
sphere
124716b8dd Correct some ZB config errors & remove grabbable chains. 2019-10-16 22:30:52 +02:00
sphere
b58b043a5e Add normally placeable maces to the ZB config. 2019-10-16 21:20:49 +02:00
MascaraSnake
857adc980f Changed Special 414's flags2text description to be less confusing 2019-10-14 19:59:07 +02:00
MascaraSnake
7eaa575dce Added ZB config 2019-10-14 08:32:04 +02:00