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
12823 commits 172 branches 41 tags 280 MiB
Commit graph

985 commits

Author SHA1 Message Date
Nev3r
9f06903d72 What the fuck was I thinking? 
Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.
 2020-07-11 11:01:05 +02:00
Nev3r
ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Nev3r
710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos
7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r
fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos
4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
LJ Sonic
17616967d3 Merge branch 'levelflat_name' into 'next' 
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
 2020-07-04 08:46:04 -04:00
SteelT
186335c2ac Merge branch 'na-char-replays' into 'next' 
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
 2020-07-03 14:51:05 -04:00
Nev3r
ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
Steel Titanium
3f3ff0688b Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00
James R
335fc0b327 Use levelflat->name instead of flatname 2020-06-27 14:30:41 -07:00
toaster
f258131e55 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save 
# Conflicts:
#	src/g_game.c
 2020-06-25 10:48:36 +01:00
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
toaster
4502604007 Special saves! 
All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.

Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...

One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
 2020-06-22 19:00:47 +01:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04: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
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
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
MascaraSnake
371a1851e3 Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location 2020-05-16 10:24:06 +02:00
Jaime Passos
1a79f6246d Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
toaster
d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) 
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
 2020-05-14 23:10:00 +01: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
d708789c3a Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03: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
f26648e6f2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
MascaraSnake
9eb81539a6 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-03 19:31:36 +02:00
MascaraSnake
7fec1211fd Bugfix in XGL3 ZNODES parsing 2020-05-03 19:28:52 +02:00
MascaraSnake
700b340827 Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759 Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +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
6949b70dbf Remove temporary FOF setup code 2020-05-02 23:33:07 +02:00
MascaraSnake
0d4d7bfc38 Adapt custom FOF setup 2020-05-02 23:00:22 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
538c81676b Recognize ML_EFFECT1 and ML_EFFECT2 on crumbling FOFs 2020-05-02 10:40:35 +02:00
MascaraSnake
863ac48c9b Fix rising FOF speed 2020-04-27 11:56:29 +02:00
MascaraSnake
c702e697b6 Fix bobbing FOF speed 2020-04-27 11:55:05 +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
f6b67d8253 Some additions/fixes for air bobbing FOFs 2020-04-27 10:58:38 +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
Nev3r
9ebb4071ee Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +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
Monster Iestyn
d1d006a1a7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
Monster Iestyn
4ef8093e92 Merge branch 'emeraldspawnfix' into 'next' 
Fix emerald hunt not working properly, part 2

See merge request STJr/SRB2!887
 2020-04-23 15:41:27 -04:00
sphere
f85bfc87f5 Move variable declarations outside of for loops. 2020-04-22 23:17:18 +02:00
sphere
e26788d014 Fix variable-length array definition, just in case. 2020-04-22 23:10:43 +02:00
sphere
01a1297631 Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle. 2020-04-22 22:46:12 +02:00
sphere
b254cb186b Fix a mistake with P_SpawnEmeraldHunt and make it more concise. 2020-04-22 20:38:58 +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
ab7690346d Merge branch 'udmf-thingargs' into udmf-multitag 
# Conflicts:
#	src/doomdata.h
#	src/lua_mobjlib.c
#	src/p_setup.c
 2020-04-22 10:54:27 +02:00
Nev3r
de3ad9bc43 Merge branch 'udmf-next' into udmf-multitag 
# Conflicts:
#	src/doomdata.h
#	src/p_setup.c
 2020-04-22 09:11:17 +02:00
Nev3r
1afb0eb79f Initialize pitch and roll on textmap mapthings too. 2020-04-22 09:00:29 +02:00
Nev3r
188ad67c58 Merge branch 'udmf-next' into udmf-thingargs 
# Conflicts:
#	src/p_setup.c
 2020-04-22 08:58:40 +02:00
Nev3r
3d9d9d74f6 Merge branch 'udmf-pitch-and-roll' into 'udmf-next' 
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
 2020-04-21 12:27:26 -04:00
Louis-Antoine
f6e2c7063f Rename lumpinfo_t.name2 to lumpinfo_t.fullname 2020-04-20 23:40:41 +02:00
Nev3r
5c605a8a39 Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
7cf08e1a08 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
MascaraSnake
1d3aa7129a Add enums for textmap FOF values 2020-04-18 18:02:43 +02: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
f0c63ce76a Merge branch 'udmf-next' into udmf-argenums 2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07 Add enums to encapsulate the textmap slope settings 2020-04-18 16:55:56 +02:00
Nev3r
ffc161e2aa Merge branch 'udmf-next' into udmf-multitag 
# Conflicts:
#	src/p_spec.c
 2020-04-18 14:04:15 +02:00
Nev3r
2b2a18fdf1 Merge branch 'udmf-colormaps' into 'udmf-next' 
UDMF colormaps

See merge request STJr/SRB2!855
 2020-04-18 07:42:24 -04:00
Nev3r
aa0d76f8fa Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38 Delete old taglists. 2020-04-18 00:05:55 +02:00
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
ae07b7c96c Netsynch the sector local taglists. 2020-04-17 22:29:26 +02:00
Nev3r
b5eaad42fc Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
209b8e7678 Map loading should consider tag 0 as a valid tag and add its respective entries just like the rest of tags. 2020-04-17 11:21:40 +02:00
Nev3r
dd46b1ab44 P_ConvertBinaryMap() line conversion now uses the first tag from taglists. 2020-04-17 11:16:01 +02:00
Nev3r
b9decb2837 Polyobject spawning now use the taglist. 2020-04-17 10:30:38 +02:00
Nev3r
4fc07473fd Skybox spawning now uses the taglists. 2020-04-17 10:05:50 +02:00
Nev3r
81be6b4067 Thing-based slope vertexes use taglists now. 2020-04-17 10:04:11 +02:00
MascaraSnake
2e9dc59ca7 Forgot some stuff regarding FOF type 170 2020-04-15 09:49:00 +02:00
MascaraSnake
f815597219 Implement FOF types 170-180 2020-04-15 09:44:33 +02:00
Nev3r
35f539e398 Merge branch 'udmf-next' into udmf-multitag 2020-04-14 22:21:32 +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
MascaraSnake
15defaebeb Render insides on FOF type 222 2020-04-14 10:14:56 +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
61d903cb5b Revise setup of solid FOFs 2020-04-14 01:34:11 +02:00
Nev3r
74bd23c275 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
a7e99ab5cf Added static multitag read and storage on mapload. 2020-04-12 11:56:36 +02:00
Nev3r
ca694c8c43 Merge branch 'udmf-next' into udmf-thingargs 2020-04-12 10:02:12 +02:00
Nev3r
4128f826b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
Nev3r
21de33bd08 Add mapthing arg support. 2020-04-11 12:54:34 +02:00
James R
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
MascaraSnake
77936f6c12 Merge branch 'udmf-colormaps' into udmf-fofs-mkii 2020-03-22 08:06:03 +01:00
MascaraSnake
2133bc89e6 Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:05:05 +01:00
MascaraSnake
1580e14cbc Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
MascaraSnake
6e8760524c Implement water FOF types 2020-03-20 16:15:39 +01:00
MascaraSnake
1e306dc7b4 Implement linedef type 100-146 2020-03-20 16:08:48 +01:00
MascaraSnake
a9866f84ad Implemented FOF types 100-105 2020-03-20 16:03:48 +01:00
MascaraSnake
0ecf8616ba Add sector flag that protects the colormap from being changed 2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b Adapt setup of colormap linedefs 2020-03-20 11:19:30 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Monster Iestyn
31b1188a3e Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
MascaraSnake
c2443b8e8c Merge branch 'udmf-formatcheck' into udmf-colormaps 2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa Add boolean variable that indicates if current map is in UDMF format 2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4 Merge branch 'udmf-next' into udmf-colormaps 2020-03-15 09:58:39 +01:00
MascaraSnake
e545e5f9ba Add UDMF colormap fields 2020-03-15 09:55:57 +01:00
Nev3r
68f60f3c29 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
Jaime Passos
26e367eb9b Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
Louis-Antoine
29d8389461 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 2020-02-29 13:43:47 +01:00
Jaime Passos
d3ed5ad44f Race is Competition without the lives 2020-02-28 23:47:38 -03:00
Jaime Passos
94738bfd2d Don't get chosen as the tagger if you're a spectator 2020-02-23 19:28:16 -03:00
SteelT
a1cf58cf7f Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
James R
fb0bedf02c Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
3022e38d15 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
Jaime Passos
2893803c68 Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
James R
8054f341a1 Merge branch 'startup-file-not-found' into 'master' 
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
 2020-02-18 21:50:11 -05:00
MascaraSnake
cae99654be Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
Sally Cochenour
07d71778dc FIX COLOR BUG 2020-02-17 01:19:28 -03:00
MascaraSnake
24de2968a3 Some fixes for the linedef alpha field 2020-02-10 20:26:29 +01:00
James R
57492347ed Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
Louis-Antoine
d02c4c0cc7 Add "resendgamestate" command 2020-01-31 15:57:04 +01:00
Jaime Passos
cf7b4d826a Remove redundancy 2020-01-26 23:46:07 -03:00
Monster Iestyn
ef53672deb Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
MascaraSnake
cedfc02f19 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01:00
MascaraSnake
d947558576 Use tag instead of angle for skyboxes 2020-01-25 10:26:38 +01:00
MascaraSnake
5656d77c82 Use tag instead of angle for polyobject spawn points and anchors 2020-01-25 10:15:20 +01:00
MascaraSnake
37375972e2 Use tag field to setup vertex slopes 2020-01-25 10:01:01 +01:00
MascaraSnake
261f049f6c Add mapthing tag field (not used yet) 2020-01-25 09:52:13 +01:00
MascaraSnake
60cde39042 Rename some UDMF fields whose names have different meanings in other UDMF implementations 2020-01-24 23:02:42 +01:00
MascaraSnake
97c58957ee Merge branch 'next' into udmf-next 2020-01-24 22:38:26 +01:00
Louis-Antoine
b0b22b53d6 Ignore disconnected players in tag gametypes 
Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
 2020-01-23 19:58:13 +01:00
Louis-Antoine
f209721ded Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
412ba38a81 Refactor player spawning code a little 2020-01-22 03:19:15 +01:00
James R
2373a0aa83 Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
James R
d90c0b8fbd Don't check "Too many flats in level" with P_AddLevelFlatRuntime 
Also moved the debug down in case anyone uses that.
 2020-01-21 15:35:07 -08:00
James R
9cd101c68d Revert "Fix Ploadflat closing the game with "Too many flats in level" error message" 
This reverts commit ea129f701c.
 2020-01-21 15:35:07 -08:00
Jaime Passos
f4a976f3be Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-20 16:53:41 -03:00
James R
f93ddc3f37 Merge branch 'keywords-back-again' into 'next' 
Level header keywords

See merge request STJr/SRB2!656
 2020-01-16 20:05:24 -05:00
Alam Ed Arias
a2b1b6289c use a byte, not a ptr2int with memset 2020-01-12 18:59:35 -05:00
Tatsuru
5d33ca42cf Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
MascaraSnake
b163316cbf Merge branch 'udmf-next' into stringargs 2020-01-11 16:17:53 +01:00
MascaraSnake
4745264a42 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_slopes.c
 2020-01-11 16:16:57 +01:00
MascaraSnake
bac379a7a3 Merge branch 'udmf-next' into stringargs 2020-01-11 16:03:38 +01:00
MascaraSnake
661c44b260 Merge branch 'udmf-vslopes' into 'next' 
Add textmap vertex slope support

See merge request STJr/SRB2!633
 2020-01-11 10:02:51 -05:00
MascaraSnake
63adb235e7 Merge branch 'linedef-args' into 'udmf-next' 
Add UDMF linedef arguments and make slope specials use them

See merge request STJr/SRB2!643
 2020-01-11 10:00:07 -05:00
MascaraSnake
f0d663ea90 Adapt setup of linedef type 443 (Call Lua function) to UDMF 2020-01-11 15:38:50 +01:00
MascaraSnake
2046f524c7 Fix incorrect cast 2020-01-10 23:32:31 +01:00
MascaraSnake
ba7a1c0375 Some minor cleanup 2020-01-10 19:56:29 +01:00
Jaime Passos
c1acdfe52e Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-10 04:11:26 -03:00
MascaraSnake
682e683a71 Merge branch 'fakeplanes-colormap' into 'next' 
Don't create colormap data out of sidedef text for fake planes linedef

See merge request STJr/SRB2!648
 2020-01-09 15:04:33 -05:00
James R
735289502c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
James R
74364b84f9 Revert "Oh right, the keywords..." 
This reverts commit a00dfcf420.
 2020-01-08 14:26:47 -08:00
MascaraSnake
c49232c1f1 Merge branch 'fakeplanes-colormap' into stringargs 2020-01-08 20:10:43 +01:00
MascaraSnake
faac4ea545 Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore) 2020-01-08 09:28:37 +01:00
MascaraSnake
2d7b43c244 Implement linedef string arguments 2020-01-08 08:42:35 +01:00
fickleheart
c133e645f7 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
Jaime Passos
5a2ad5c2f3 Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-07 16:10:25 -03:00
Jaime Passos
1358507785 Fix OpenGL 2020-01-07 14:07:14 -03:00
Jaime Passos
5b5f371b0c R_GetTextureFlat -> R_GetLevelFlat 2020-01-07 13:27:59 -03:00
Jaime Passos
f85476c723 Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Jaime Passos
edb0bbcd6d Cleanup, NOW 2020-01-06 20:16:48 -03:00
Jaime Passos
a1af6b9134 Picture formats test 2020-01-06 18:22:23 -03:00
MascaraSnake
fff0b3e66c Adapt setup of copy slope linedef to UDMF 2020-01-06 17:39:39 +01:00
MascaraSnake
ddb1a19490 Adapt setup of vertex-based slopes to UDMF 2020-01-06 15:34:28 +01:00
MascaraSnake
031e3d93b2 Merge branch 'next' into linedef-args 2020-01-06 14:46:47 +01:00
MascaraSnake
1cbf7aba0d Merge branch 'move-map-copying' into 'next' 
Reorder map loading

See merge request STJr/SRB2!635
 2020-01-06 04:24:39 -05:00
MascaraSnake
98c4221a24 Adapt setup of line-based slopes to UDMF 2020-01-05 14:31:56 +01:00
Alam Ed Arias
641ac72b3f Copy and Paste error 2020-01-04 18:34:16 -05:00
MascaraSnake
41a74bede1 Merge branch 'move-map-copying' into linedef-args 2020-01-04 23:32:29 +01:00
MascaraSnake
062bd7eef8 Merge branch 'next' into linedef-args 2020-01-04 23:10:39 +01:00
Nev3r
72f23a1075 Add missing initialization on vertex heights for binary maps. 2020-01-04 23:01:01 +01:00
Nev3r
a161bfa619 Merge branch 'remove-vertex-z-mk2' into udmf-vslopes 
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
#	src/r_defs.h
 2020-01-04 22:59:42 +01:00
Nev3r
9999be2d6e Remove vertex_t's z variable. 2020-01-04 18:29:02 +01:00
fickleheart
f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
MascaraSnake
1e42dc7ee5 Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else 2020-01-04 11:08:05 +01:00
Nev3r
faf127ff88 Add vertex slope spawning function. 
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
 2020-01-04 10:39:45 +01:00
Nev3r
0b21a34ddd Add vertex height vars into the vertex struct, and their textmap parsing. 2020-01-04 10:24:42 +01:00
MascaraSnake
26bb0b3c67 Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it 2020-01-03 21:50:27 +01:00
MascaraSnake
7b5f2f09c0 Merge branch 'textmap-parser' into 'next' 
Textmap parser

See merge request STJr/SRB2!604
 2020-01-03 04:14:38 -05:00
MascaraSnake
cd243c06f0 Merge branch 'textmap-parser' into linedef-args 2020-01-02 22:54:51 +01:00
MascaraSnake
dc0c17dbb8 P_LoadExtendedSubsectorsAndSegs: Print size_t with %s 2020-01-02 22:28:32 +01:00
MascaraSnake
68da1856da Implement linedef args (unused and untested so far) 2020-01-02 12:23:14 +01:00
MascaraSnake
5ba179ad7c Fix two bugs in extended segs loading, and add some error checking while I'm at it 2020-01-02 09:51:07 +01:00
MascaraSnake
02acf6222b P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code 2020-01-02 00:32:29 +01:00
MascaraSnake
2da9c3cf81 P_LoadTextmap: Bail out if certain mandatory fields are not set 2020-01-01 23:52:30 +01:00
MascaraSnake
4f26a8e73a Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it 2020-01-01 16:01:07 +01:00
MascaraSnake
9cda82d896 Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter 2020-01-01 15:52:59 +01:00
MascaraSnake
6724b11c36 Whoops 2020-01-01 15:11:39 +01:00
MascaraSnake
a41c640559 Move shared parts of sidedef initialization into P_InitializeSidedef 2020-01-01 15:10:41 +01:00
MascaraSnake
fe198b8a32 Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not 2020-01-01 14:27:01 +01:00
MascaraSnake
b59532bcca Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly 2020-01-01 14:13:24 +01:00
MascaraSnake
24d68ba07e P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set 2020-01-01 13:40:17 +01:00
Jaime Passos
b41cd59e51 Revert "Merge branch 'software-clownery' into 'master'" 
This reverts merge request !578
 2019-12-31 23:40:17 +00:00
fickleheart
b22de48c03 Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
Jaime Passos
cd1cc9a222 Fix desynch 2019-12-31 14:00:25 -03:00
Jaime Passos
7b54846a02 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
Jaime Passos
181a366d4a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
James R
fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
MascaraSnake
013f1f70d9 -Set defaults for vertex and mapthing fields in textmap 
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
 2019-12-30 21:23:00 +01:00
fickleheart
e0f35d207f Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
085c39128f Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
MascaraSnake
05a97530c1 Add support for flat offset and rotation fields in UDMF 2019-12-30 17:28:10 +01:00
MascaraSnake
72bb673209 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos
7676f11112 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Nev3r
99aace19f5 Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser 2019-12-30 14:48:10 +01:00
Nev3r
4a5498473c Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false. 
TextmapCount() also now returns false if brackets are left open inside a textmap.
 2019-12-30 14:47:48 +01:00
Nev3r
f9d6e26558 Replace INT16_MAX with LUMPERROR in lump check. 2019-12-30 14:45:39 +01:00
Nev3r
7ae2143c91 Add a disclaimer when loading textmaps/UDMF. 2019-12-30 14:42:41 +01:00
MascaraSnake
ea87af0076 Refactor TextmapParse 2019-12-30 14:33:41 +01:00
Nev3r
c6c00aa7d5 Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens. 2019-12-30 13:46:37 +01:00
MascaraSnake
4aee4e3684 Refactor TextmapCount 2019-12-30 13:27:05 +01:00
Nev3r
e43df2993f Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile. 2019-12-30 12:33:24 +01:00
Nev3r
f9aabe753e Refactor TextmapFixFlatOffsets(). 2019-12-30 12:31:55 +01:00
Nev3r
f49b8de5fd Adapt P_MakeMapMD5() for textmaps. 2019-12-30 12:07:54 +01:00
Nev3r
ed114f655b Fixed missing M_GetToken(NULL); 2019-12-30 12:07:02 +01:00
Nev3r
aaef412823 Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
James R
97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
MascaraSnake
136c656cc0 Properly pass nodes data along to functions that need it without breaking the original data pointer 2019-12-29 22:11:15 +01:00
MascaraSnake
81422c4e6d Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly" 
This reverts commit cfc6428569.
 2019-12-29 21:57:47 +01:00
MascaraSnake
cfc6428569 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake
e88556efe1 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake
dd02fe0d78 P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake
882e8ef7b8 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake
36f86077da Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake
c287b86fab Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00
MascaraSnake
3839e95d63 Move reading of extra vertices into separate function 2019-12-29 18:07:44 +01:00
MascaraSnake
45ca959f97 -Move reading of actual extended nodes into separate function, cutting down on code duplication in the process 
-Fix a typo in the segs reading
 2019-12-29 17:52:49 +01:00
MascaraSnake
9d009edfc8 Move copying of the nodes signature out of the else case 2019-12-29 15:59:15 +01:00
MascaraSnake
0aed60f4de Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.) 2019-12-29 15:50:53 +01:00
MascaraSnake
8032054a47 Separate loading of extended nodes into its own file 2019-12-29 15:15:32 +01:00
Nev3r
389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
MascaraSnake
abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
MascaraSnake
cfadbb0f36 -Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup 
-Fix a broken condition during setup of texture fields for the change music linedef
 2019-12-29 09:39:50 +01:00
Jaime Passos
e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
James R
90e56bcdf9 Merge branch 'levelload-refactor' into 'next' 
Hack P_SetupLevel into little pie- actually just clean it up a bit

See merge request STJr/SRB2!587
 2019-12-28 19:37:06 -05:00
MascaraSnake
bd7765227e Rename P_GroupLines to the more apt P_LinkMapData 2019-12-28 17:40:08 +01:00
MascaraSnake
7e5b87ce42 Fix debug prints 2019-12-28 17:37:32 +01:00
MascaraSnake
d38ee51d49 Separate setting of sector field defaults into P_InitializeSector 2019-12-28 17:29:58 +01:00
MascaraSnake
54fe91b1cc Refactor P_SetupLines into P_InitializeLinedef 2019-12-28 17:21:31 +01:00
MascaraSnake
1ca25224c2 Fix P_SetupLines printing the wrong line number 2019-12-28 17:05:04 +01:00
MascaraSnake
85de3614cb Standardize P_LoadVertices and P_LoadSidedefs 2019-12-28 16:58:48 +01:00
MascaraSnake
86d1fb73f4 Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs 2019-12-28 16:49:56 +01:00
MascaraSnake
21b7507aee Reorganize and partially rename map loading functions 2019-12-28 16:40:35 +01:00
MascaraSnake
b1854b5c96 Remove stray #endif 2019-12-28 14:50:00 +01:00
MascaraSnake
5590343043 Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them. 2019-12-28 14:13:26 +01:00
MascaraSnake
3971067cf3 Remove some old #if 0'd code 2019-12-28 14:03:48 +01:00
MascaraSnake
303e6cee4a Merge branch 'next' into mapload-refactor 2019-12-28 13:59:24 +01:00
MascaraSnake
ceca99e3c5 Fix accidental removal of sector_t's spawn_lightlevel initialization 2019-12-28 13:58:23 +01:00
MascaraSnake
e9376a8353 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
MascaraSnake
c059146937 Move more P_LoadLevel parts into subfunctions 2019-12-28 11:37:56 +01:00
MascaraSnake
319ed09c00 Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions 2019-12-28 11:30:39 +01:00
Jaime Passos
3b341245f1 Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos
f8eed7171a add G_CompetitionGametype(void) 2019-12-27 12:28:00 -03:00
Jaime Passos
9613bdeca6 use GTR_DEATHMATCHSTARTS 2019-12-27 12:14:33 -03:00
Jaime Passos
56e94182d5 P_SetupCamera funny 2019-12-27 02:07:13 -03:00
Alam Ed Arias
61a0197339 Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Jaime Passos
649455c2d0 R_CalculateSegDistance stuff... 2019-12-26 01:58:38 -03:00
Nev3r
a932b54b26 Merge branch 'mapdataload_refactor' into 'next' 
Mapdataload refactor

See merge request STJr/SRB2!568
 2019-12-25 06:21:49 -05:00
Nev3r
c4a017ddf0 Move flat caching code to the map data load function. 2019-12-25 12:05:40 +01:00
Jaime Passos
7e5ec552ee Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-25 06:09:00 -03:00
MascaraSnake
f11caefed7 Merge branch 'spawnhoopsandrings_refactor' into 'next' 
Hack P_SpawnHoopsAndRings into little pieces

See merge request STJr/SRB2!572
 2019-12-25 03:00:07 -05:00
Jaime Passos
3622829504 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
James R
0780e48f86 Merge branch 'titlecard2' into 'next' 
More customisable title card

See merge request STJr/SRB2!552
 2019-12-24 14:47:55 -05:00
MascaraSnake
a57f903933 Move bonus time handling into new function P_SetBonusTime() 2019-12-24 12:52:43 +01:00
MascaraSnake
dd01fce1a8 Separate P_SpawnHoopsAndRings into different functions: 
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
 2019-12-24 10:50:49 +01:00
Jaime Passos
89b4a558a8 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
Jaime Passos
630c06b7b0 Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Nev3r
9a9f72f598 Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure. 2019-12-23 16:37:44 +01:00
Nev3r
d6a86c37b2 P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData(). 2019-12-23 16:36:26 +01:00
Nev3r
bb54597552 Remove redundant netarchive-related sector vars as they're not used anymore. 
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
 2019-12-23 12:42:38 +01:00
Nev3r
eadf953957 Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps. 
Fix print type issue.
 2019-12-23 12:30:32 +01:00
MascaraSnake
579362fd3b P_LoadMapData(): Throw an error if resources are not found. 2019-12-22 23:22:15 +01:00
MascaraSnake
a4fde93fbb Merge branch 'next' into virtres 
# Conflicts:
#	src/p_setup.c
 2019-12-22 23:02:47 +01:00
Jaime Passos
0accadf02f Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00