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

72 commits

Author SHA1 Message Date
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