stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
12881 commits 172 branches 41 tags 280 MiB
Commit graph

1012 commits

Author SHA1 Message Date
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
Vincent Robinson
f70491b2b5 Make linedef 96 apply to tags from 97-99, but not to itself 2021-10-04 14:23:56 -07: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
df7b22ac8a Minor cleanup in P_ConvertBinaryMap 2021-09-21 15:34:47 +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
41d18bc591 Binary-to-UDMF conversion: Set up mapthing tags before global taglists are built 2021-09-21 12:55:22 +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
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
e15c160773 Implement per-sector floor/ceiling lighting 2021-09-19 08:58:21 +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
MascaraSnake
9d3dc98939 Fix "render insides" condition being inverted for intangible FOFs 2021-09-17 09:57:53 +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
Tatsuru
033c661431 Merge branch 'folder' into 'next' 
Implement folder loading

See merge request STJr/SRB2!1568
 2021-09-10 17:10:26 +00:00
Tatsuru
ce98758bd6 Merge branch 'equationslopes' into 'next' 
Add generalized slopes in UDMF

See merge request STJr/SRB2!1530
 2021-09-09 22:12:18 +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
dcba011cf3 Adapt wind/current linedefs to UDMF 2021-07-01 20:35:13 +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
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
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
92982be76b Adapt the remaining plane movement linedef types to UDMF 2021-06-27 09:53:57 +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
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
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
6abcba6876 Adapt linedef types 400-401 to UDMF + some EV_ cleanup 2021-06-25 18:34:56 +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
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
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02:00
LJ Sonic
e3a5da3f6f Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2021-06-19 20:49:12 +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
52f9b47ce3 Ignore a linedef tag of 0 when using linedef action 96. 2021-06-10 17:49:33 +02:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Nev3r
9c68f8cbb0 Fix the equation constant fields not being filled properly. 2021-06-02 11:21:37 +02:00
Nev3r
aec1ab304a Let equation slopes be read from textmaps. 2021-06-02 11:00:57 +02:00
Nev3r
8cb62eeca5 Initialize slopes before the map loads. 2021-06-02 10:59:57 +02:00
sphere
d040b61edc Merge branch 'multitagging_plus' into 'next' 
Enhance the multitagging functionality added by !1485

See merge request STJr/SRB2!1524
 2021-06-01 17:25:29 -04:00
flarn2006
115254efc9 Fix compiler warning related to precedence 2021-06-01 17:10:29 -04:00
sphere
69b6c409b5 Merge branch 'flicky-mapload-crash-fix' into 'next' 
Flicky mapload crash fix (and other tmthing-related fixes)

Closes #81

See merge request STJr/SRB2!1522
 2021-06-01 14:58:01 -04:00
flarn2006
172454f108 Fix offset_tags array indices 2021-06-01 10:09:57 -04:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next' 
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
 2021-06-01 07:36:50 -04:00
sphere
4908712641 Merge branch 'go-away' into 'next' 
Make a few messages more helpful (resolves #485)

Closes #485

See merge request STJr/SRB2!1519
 2021-05-31 16:32:42 -04:00
flarn2006
0b51b391f1 Make 96's flags consistent with 97-99 by default 2021-05-30 12:16:15 -04:00
flarn2006
f8fe763df2 Fix linedef type 99 2021-05-29 12:28:06 -04:00
flarn2006
2d4411d077 Remove empty 'else' block (also leftover) 2021-05-29 12:23:35 -04:00
flarn2006
5090de5809 Remove leftover debug printfs 2021-05-29 12:09:30 -04:00
flarn2006
93de054786 Fix linedef type 96 (I had it all wrong) 2021-05-29 11:08:57 -04:00
flarn2006
eee894581a Make linedef 96 skip the control sector 2021-05-29 00:54:31 -04:00
flarn2006
7d71d534d4 Add missing "/ FRACUNIT" to texture offset code 2021-05-29 00:40:06 -04:00
flarn2006
8d8f62baef Add additional multitagging functionality 2021-05-28 23:59:39 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next' 
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
 2021-05-28 21:51:00 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next' 
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
 2021-05-28 21:30:16 -04:00
Monster Iestyn
45b1223f3e My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit 2021-05-28 18:56:32 +01:00
Monster Iestyn
07801a2a18 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook 2021-05-28 18:42:19 +01:00
katsy
b2ae7c79e7 make a few messages more helpful 2021-05-24 00:00:01 -05:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -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
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Vincent Robinson
f437d6afec Add linedef specials for multitagging in binary maps 2021-04-26 16:27:39 -07:00
Sally Coolatta
8278e621fb Removed skin->availability 
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.

This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.

Other changes made to accommodate this:
 - R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
 - I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.

Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
 2021-04-25 07:18:32 -04:00
Sally Coolatta
d8d3dee46f Add linedef executor for toggling stagefailed 
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
 2021-04-19 17:20:34 -04:00
Sally Coolatta
d59f25a6cd stagefailed is more useful 
- Can now apply to normal stages, simply defaults to "false" in normal stages.
- Post-level cutscenes are now always skipped when the stage was failed.
- Exposed the boolean as a Lua read+write global.

Desired for SUGOI, as it allows for visited flags not be updated, and level completion emblems to not be awarded. Which means a lot less crappy non-ideal workarounds.

Normal stage intermission currently does not reflect failure state at all. Maybe it could always skip, never award score bonuses, have different text... etc. Probably would leave that up to vanilla dev opinion.
 2021-04-18 12:59:49 -04:00
katsy
d1700bbf18 Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
katsy
55d63000f4 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
Jaime Ita Passos
dca158096d Experimental implementation 2021-03-22 23:56:55 -03:00
sphere
998d065698 Add more actions for slope copying & update the ZB config. 2021-02-17 16:06:02 +01:00
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations 
# Conflicts:
#	src/p_spec.c
 2021-02-15 09:20:40 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.
 2021-02-11 13:24:20 +01:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08:00
Jaime Ita Passos
3b36005ceb Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
Nev3r
4d716cb170 Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r
30ab512c3c Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/dehacked.c
 2020-12-01 18:56:42 +01:00
Nev3r
c8ae28bbaf Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
Jaime Ita Passos
2e21168395 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Jaime Ita Passos
0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R
d3199ac779 Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
 2020-11-13 13:23:14 +01:00
Nev3r
7dd83285b8 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 2020-11-12 14:30:24 +01:00
Nev3r
2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
95a61a226b rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Nev3r
fb9432ae57 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
bbd003976b Merge branch 'write-thingies' into 'next' 
The lump is not needed for P_WriteThings

See merge request STJr/SRB2!1231
 2020-11-08 20:35:51 -05:00
LJ Sonic
9b151ca45c Merge branch 'resend-gamestate' into 'next' 
Resend gamestate when resynching

See merge request STJr/SRB2!829
 2020-11-07 13:14:32 -05:00
James R
37931fc253 The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Monster Iestyn
5241b83f97 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Nev3r
3d2d44bfff Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2020-10-27 22:23:30 +01:00
Nev3r
c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Louis-Antoine
804ad44e89 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00