Commit graph

12304 commits

Author SHA1 Message Date
MascaraSnake
8d4baace53 Add Lua backwards compatibility for FOF flags 2022-07-31 12:04:42 +02:00
sphere
c65851d17c Merge branch 'autobrake-fix' into 'next'
Make autobrake account for scale

See merge request STJr/SRB2!1782
2022-07-29 09:33:29 +00:00
sphere
f8d2297e07 Merge branch 'colon-parenthesis' into 'next'
Fix semibright/fulldark frame flags not working with 3D models

See merge request STJr/SRB2!1779
2022-07-29 09:33:20 +00:00
Eidolon
955259d5c1 Remove win32 backend-specific files 2022-07-17 19:34:19 -05:00
Eidolon
69c5da2720 Merge branch 'next' into uncappedrevengeance 2022-07-15 00:14:27 -05:00
Eidolon
0e5b5bf5d9 cmake: Set plist properties for macOS bundle
yay icon
2022-07-14 23:57:53 -05:00
Eidolon
66ab96363c cmake: Fix rpath issues in macOS bundle fixup 2022-07-14 23:32:34 -05:00
Eidolon
a3ffd04223 cmake: Adjust linkage for macOS
This properly links dylibs set during build instead of expecting
the libraries to be in the system path.
2022-07-14 18:37:17 -05:00
Eidolon
af8bc3af7e Merge branch 'udmf-plane-displacement-fix' into 'next'
UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68

Closes #868

See merge request STJr/SRB2!1790
2022-06-05 23:13:04 +00:00
MascaraSnake
c9536ff4dc Fix copypaste error in P_GetMobjGravity 2022-06-04 17:46:00 +02:00
MascaraSnake
9971592dc6 UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68 2022-06-04 11:14:31 +02:00
MascaraSnake
fc4b79c0de Fix custom FOF flag conversion in binary maps 2022-06-04 10:59:42 +02:00
Eidolon
6829e4ae62 Merge branch 'sp-secfset-update-triggertag' into 'next'
Update triggertag on sector tag fset

Closes #865

See merge request STJr/SRB2!1789
2022-05-31 21:15:56 +00:00
Sally Coolatta
8b175398f8 Use old behavior when dipping below 35 with interp 2022-05-30 17:25:43 -05:00
MascaraSnake
af7c0f4d6c Allow linedef types 409/410 to change the trigger tag 2022-05-29 12:24:14 +02:00
MascaraSnake
37da148996 Update triggertag on Tag_SectorFSet if in binary map and the sector has a trigger special 2022-05-29 11:56:30 +02:00
Eidolon
f94c25c05c Change UDMF wall scroll scale to SCROLL_SHIFT
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.

Fixes STJr/SRB2#862

Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
2022-05-29 02:02:20 -05:00
Zwip-Zwap Zapony
d10ca13eb9 Apply 1 suggestion(s) to 1 file(s) 2022-05-28 12:18:09 +00:00
MascaraSnake
e1a5f48c51 Fix even more size_t printfs 2022-05-28 14:08:19 +02:00
MascaraSnake
fd2a097c34 Fix more size_t mishaps 2022-05-28 10:29:35 +02:00
Eidolon
35a5c82c42 Update triggertag on sector tag fset
Fixes STJr/SRB2#865
2022-05-27 13:36:55 -05:00
Eidolon
1ef40c9037 Update interpolation during objectplace 2022-05-21 14:38:32 -05:00
Eidolon
8040c8fe05 Tweaks for kart v1 MR comments 2022-05-21 12:36:21 -05:00
Sally Coolatta
79f736b75f Use double instead of precise_t for FPS counter
Makes the displayed FPS more accurate to what it's actually displaying.

Also removed HUDTRANS from it -- stop it fading out during level transitions, it's annoying when I actually want to see the FPS during those bits.
2022-05-19 16:08:42 -05:00
Eidolon
169f33a101 Defensively recreate title drawlist
Avoids a crash when connecting to a server in the Intro
2022-05-18 21:07:16 -05:00
Eidolon
516a5e8350 Remove hudlib getDeltaTime 2022-05-18 18:29:37 -05:00
Eidolon
32b166669e Don't interpolate during net lag 2022-05-17 19:57:31 -05:00
Eidolon
7c00cea1fc Add per-split player view resets 2022-05-05 20:11:37 -05:00
Eidolon
d511857675 Reset view interp in preticker 2022-05-05 19:43:55 -05:00
Eidolon
73930c655b Run UpdateMobjInterpolators in preticker 2022-05-05 19:27:51 -05:00
Eidolon
1920dba082 Run UpdateLevelInterpolators in preticker
Fixes KartKrew/Kart-Public#10
2022-05-05 18:51:49 -05:00
Sally Coolatta
4d18329946 Revert to before screenUpdate boolean was added
Was done this way for the sake of an older version of uncapped's timing; now that the new timing is much better, I decided it should remain as close to pre-uncapped as it can be.
2022-05-05 15:07:27 -05:00
katsy
c2e1b1be54 Restore deleted zofs (fixes signpost sparkles etc) 2022-05-05 13:18:01 -05:00
Eidolon
e3fd3dfa65 Only play emerald hunt sounds on new tics 2022-05-04 20:40:45 -05:00
Sally Coolatta
40c2f66a5a Move screenshot code before timing 2022-05-04 20:02:36 -05:00
Eidolon
bd73256390 Fix Marathon Mode menu for uncapped 2022-05-03 18:18:08 -05:00
Eidolon
1c11ddd6ae Only check VERTICALFLIP for old_z calc 2022-05-03 15:23:00 -05:00
Eidolon
7ec0420ce6 Adjust spawned mobj z by gravity inversion 2022-05-03 15:07:35 -05:00
Eidolon
805941a98f Merge public next into uncappedrevengeance
This is to capture the UDMF merges and make the later code review
easier.
2022-05-03 14:45:14 -05:00
MascaraSnake
28bdd7ef00 Fix size_t compiler warnings in P_WriteTextmap 2022-05-01 19:27:10 +02:00
Eidolon
f0d7d8467f Refactor timing code even more
System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.
2022-05-01 00:32:46 -05:00
Eidolon
7d7564b7f9 Disable sprite offset interpolation (for now) 2022-04-30 21:56:42 -05:00
Eidolon
48d8c83540 Ensure view is not interpolated on first frame 2022-04-30 19:10:07 -05:00
Eidolon
c0865e4faa Ensure mobj interpolators reset on level load 2022-04-30 17:59:32 -05:00
Eidolon
e79654a33a Completely refactor timing system
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.

This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
2022-04-30 16:33:23 -05:00
Eidolon
dcbe929baa Make renderisnewtic is false between tics
I know what I'm doing! I swear
2022-04-30 13:53:56 -05:00
ashi
c3001ac42a Fix description of A_ParentTriesToSleep 2022-04-30 14:21:51 +00:00
Eidolon
a41d042812 Rename drawerlib deltaTime to getDeltaTime 2022-04-30 01:57:46 -05:00
Eidolon
82310e0ae2 Add Lua HUD drawlists
Buffers draw calls between tics to ensure hooks
run at the originally intended rate.
2022-04-30 01:55:10 -05:00
Eidolon
56261d3e1e Fix offset copies for SpawnMobjFromMobj
THANKS SAL
2022-04-29 17:19:09 -05:00
Eidolon
1259f1be40 Interpolate spritescale/offset x/y 2022-04-29 14:21:30 -05:00
Eidolon
8f43b5afd0 Fix Mario block item placement 2022-04-28 22:32:35 -05:00
Eidolon
42ebf163e6 Don't interpolate mobj state if frac = 1.0 2022-04-28 21:07:06 -05:00
Sally Coolatta
7c41564362 Fix multiplayer character select 2022-04-28 20:44:22 -05:00
Eidolon
5d4f7f2ad2 Copy interp state in P_SpawnMobjFromMobj 2022-04-28 20:39:37 -05:00
Eidolon
1aebf41e82 Interp shadow scales 2022-04-28 20:14:04 -05:00
Eidolon
687d98eb4a Fix interp scale crash for hires sprites 2022-04-28 20:07:07 -05:00
Eidolon
50b0c29db9 Disable angle interp on fresh mobjs 2022-04-28 18:46:02 -05:00
Eidolon
34eebcb4b8 Reset interp scale when Lua sets .scale 2022-04-28 18:36:10 -05:00
katsy
5a7a63c2cc Fix interp scaling crashing software 2022-04-28 17:21:45 -05:00
Sally Coolatta
d2282c98cc Precalculate refresh rate
Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well
2022-04-27 21:47:19 -05:00
Eidolon
51553e7f75 Interpolate mobj scale 2022-04-27 21:39:47 -05:00
Sally Coolatta
f6c1e49b27 Fix boss1 laser in interp 2022-04-27 21:07:55 -05:00
Sally Coolatta
71ee468bf3 Fix cutscenes in interp 2022-04-27 20:41:38 -05:00
Eidolon
813ed81a37 Reset old_z in MT_LOCKON think
Fixes interpolation artifacting due to spawn pos.
2022-04-27 19:52:11 -05:00
Sally Coolatta
f66cedf1fc Force interpolation when timescale != 1.0 2022-04-27 18:37:45 -05:00
Sally Coolatta
a76968c6d9 Enable timescale outside of DEVELOP builds
It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer!
2022-04-27 18:37:45 -05:00
Sally Coolatta
bb6d4d10b5 Add timescale cvar
Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping!
2022-04-27 18:37:45 -05:00
Sally Coolatta
f2a19b29d9 Put interpdebug stuff in perfstats instead 2022-04-27 18:37:45 -05:00
Sally Coolatta
c83d1be21f Add interpdebug 2022-04-27 18:37:45 -05:00
Eidolon
0503c853cc Reset Metal fume interp state on appear 2022-04-27 18:19:00 -05:00
Eidolon
c3923adc3f Make Lua TeleportMove call MoveOrigin 2022-04-27 17:08:40 -05:00
Sally Coolatta
eb6b1f375a Allow dedicated to use precise sleep timing again
Instead of only using one old sleep, just enforce framerate cap to match TICRATE.
2022-04-27 16:33:05 -05:00
Sally Coolatta
c3340959de Fix I_FrameCapSleep not respecting cpusleep
Jonathan Joestar bruh
2022-04-27 16:26:41 -05:00
Sally Coolatta
9b4e485686 Fix frame pacing when game lags behind
The frame timestamp should've been made at the start of the frame, not the end.
2022-04-27 16:06:03 -05:00
Eidolon
833777d773 Revert "Remove unnecessary precipmobj thinker hack"
This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e.
2022-04-26 20:56:36 -05:00
Eidolon
aec527cb4c Clamp cechotimer to 0
Fixes issues with cechos staying on-screen and glitching out
(NiGHTS items for example).
2022-04-26 20:56:35 -05:00
Eidolon
a4ea2c2708 Use old sleep in dedicated mode 2022-04-26 20:56:35 -05:00
Eidolon
c79df7d58e Interpolate afterimages further back 2022-04-26 20:56:35 -05:00
Eidolon
f418c6476f Add drawerlib deltaTime function 2022-04-26 20:56:35 -05:00
Eidolon
4095ef599b Delta time choose player menu animations 2022-04-26 20:56:35 -05:00
Monster Iestyn
d719e081dc Adjust 1up monitor icon z offsets
Fixes interpolation issues with 1up monitors.
2022-04-26 20:56:35 -05:00
Sally Coolatta
400c6e0891 Move intro ticking out of the drawer 2022-04-26 20:56:35 -05:00
Eidolon
9276637db0 Revert "Reset overlays interp states each TryRunTics"
This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92.
2022-04-26 20:56:35 -05:00
Sally Coolatta
fa12c51fcf Fix a bunch of ticking in hu_ drawing functions 2022-04-26 20:56:35 -05:00
Sally Coolatta
48b3ea31c4 Bring back shadows on polyobjects
Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy.
2022-04-26 20:56:35 -05:00
Eidolon
8597f3876c Move intermission emerald bounce to ticker 2022-04-26 20:56:35 -05:00
Sally Coolatta
f34a61156c Papersprite angle interpolation
Makes the ending signpost smooth
2022-04-26 20:56:35 -05:00
Eidolon
7dd7cccd79 Use interp tracer pos for GL linkdraw 2022-04-26 20:56:34 -05:00
Sally Coolatta
f330374c1f Interpolate model interpolation (lol) 2022-04-26 20:56:34 -05:00
Eidolon
6fe25f7dbb Reset overlays interp states each TryRunTics 2022-04-26 20:56:34 -05:00
Sally Coolatta
dbd5ddf95d Add interpolation to more moving plane types
Adds interpolation to the following:
- Crumbling platforms
- Mario blocks
- Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?)
2022-04-26 20:56:34 -05:00
Sally Coolatta
873af23f22 Waypoint polyobjects interpolate z & children 2022-04-26 20:56:34 -05:00
Eidolon
9f845622cd Revert "P_InitAngle, to fix angle interpolation on spawning objects"
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
2022-04-26 20:56:34 -05:00
Eidolon
5790168194 Convert P_TeleportMove use to origin funcs 2022-04-26 20:56:34 -05:00
Sally Coolatta
d476b41dfa P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2022-04-26 20:56:33 -05:00
Sally Coolatta
2f46725984 Fix flickering plane interpolation for OpenGL in the exact same way
Funny OpenGL renderer being at least 50% copy-pasted Software code :)
2022-04-26 20:56:33 -05:00
Sally Coolatta
b98207035d Fix plane interpolation light level flickering 2022-04-26 20:56:33 -05:00
Sally Coolatta
80cb9994d5 Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code 2022-04-26 20:56:33 -05:00
Sally Coolatta
f482218913 I_GetFrameTime to try and improve frame pace
(It doesn't feel that much better though.)
2022-04-26 20:56:33 -05:00
Sally Coolatta
3da9852d2a Dynamic slope interpolators 2022-04-26 20:56:33 -05:00
Eidolon
568677edc1 Move mobj interpolators to r_fps 2022-04-26 20:56:33 -05:00
Eidolon
a67432a415 Add mobj interpolator on load netgame 2022-04-26 20:56:33 -05:00
Eidolon
5e4a57b45c Reset mobj interp state on add 2022-04-26 20:56:33 -05:00
Sally Coolatta
b18e53417a Handle the sleep at the end of D_SRB2Loop instead of the start
Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long.
2022-04-26 20:56:33 -05:00
Sally Coolatta
685190fe40 Improve the framerate limiter's timing for extreme stable FPS 2022-04-26 20:56:32 -05:00
Eidolon
66cc234be6 Fix precip crash from missing vars 2022-04-26 20:56:32 -05:00
Sally Coolatta
53c71d35bc Adjust how FPS cap is checked to improve FPS stability 2022-04-26 20:56:32 -05:00
Sally Coolatta
6e5e74b25f Allow FPS cap values 2022-04-26 20:56:32 -05:00
Eidolon
0e1b01f206 Update mobj oldstates before all thinkers 2022-04-26 20:56:32 -05:00
Eidolon
84f62f91f4 Fix renderdeltatics with new timing data 2022-04-26 20:56:32 -05:00
Eidolon
a56a57b3d1 Misc changes after Kart cherry-picks 2022-04-26 20:56:32 -05:00
Sally Coolatta
c186d6402b Lots of FPS stuff
- Disabled VSync, due to the numerous problems it has.
- Instead, added an FPS cap.
- Frame interpolation is now tied to fpscap != 35.
- By default, the FPS cap is set to the monitor's refresh rate.
- Rewrote the FPS counter.

(This also consolidates several more commits ahead of this
fixing various issues. -eid)
2022-04-26 20:56:32 -05:00
Sally Coolatta
41997c4549 Keep rect in memory
Feel better about this than creating one all da time
2022-04-26 20:56:32 -05:00
Sally Coolatta
40b021d6e4 Calculate FPS stuff even if frame is skipped
I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging.
2022-04-26 20:56:32 -05:00
James R
1b49a96eed Interpolate from time of previous tic
Previously interpolated from last 35th of a second, which
may be offset from game time due to connection lag.

Consider this the proper fix to 54148a0dd0 too.
2022-04-26 20:56:31 -05:00
James R
e6dff8eedc Closer OpenGL underwater/heatwave effect to Software 2022-04-26 20:56:31 -05:00
James R
56c0c1f415 Do not speed up underwater/heatwave effect in OpenGL 2022-04-26 20:56:31 -05:00
Sally Coolatta
cd70b499bd Fully fix drop shadows
It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates.
2022-04-26 20:56:31 -05:00
Sally Coolatta
e4930535f3 P_InitAngle, to fix angle interpolation on spawning objects 2022-04-26 20:56:31 -05:00
Sally Coolatta
8fb939df79 Add functions to handle interpolation
Much less code duplication
2022-04-26 20:56:31 -05:00
Eidolon
ca8698d13e Interpolate HWR_DrawModel 2022-04-26 20:56:31 -05:00
Eidolon
ab7c2dfb3d Interpolate mobj angles and player drawangle 2022-04-26 20:56:31 -05:00
Eidolon
5fda1b297f Delete interpolators associated with thinkers 2022-04-26 20:56:31 -05:00
Eidolon
3e5cec7e72 Intialize interpolator list at a better time 2022-04-26 20:56:31 -05:00
Eidolon
2aa34f0273 Add Polyobj interpolator 2022-04-26 20:56:30 -05:00
Eidolon
330b34ee6b Add SideScroll interpolator 2022-04-26 20:56:30 -05:00
Eidolon
ba110852a7 Add SectorScroll interpolator 2022-04-26 20:56:30 -05:00
Eidolon
9c8d0a3b6f Add sector plane level interpolations 2022-04-26 20:56:30 -05:00
Eidolon
ac2510f284 Homogenize mobj interpolations 2022-04-26 20:56:27 -05:00
Eidolon
6dd27af26e Run anti-lag chasecam at tic frequency
Fixes jittery and unstable chasecam in high latency netgames
2022-04-26 20:31:39 -05:00
Eidolon
8908dcccde Only swap view interp state if a tick is run 2022-04-26 20:31:39 -05:00
Eidolon
f0279e69f2 Reset mobj interp state on TeleportMove 2022-04-26 20:31:39 -05:00
Eidolon
4c31902b98 Reset precip interpolation on snap to ceil 2022-04-26 20:31:39 -05:00
Eidolon
f2a881f385 Add reset interpolation state functions 2022-04-26 20:31:39 -05:00
Eidolon
4ee6027180 Remove unnecessary precipmobj thinker hack 2022-04-26 20:31:39 -05:00
Eidolon
d34ec2ef06 Reset view interpolation on level load 2022-04-26 20:31:38 -05:00
Eidolon
7c9e133eb4 Fix misc dropshadow issues 2022-04-26 20:31:38 -05:00
Eidolon
996f35b592 Always have precise_t defined 2022-04-26 20:31:38 -05:00
Eidolon
bc9251e13b Ensure + commands get executed before map start 2022-04-26 20:31:38 -05:00
Eidolon
88207e18f9 Ensure viewsector is accurate to viewx/viewy
This fixes a potential crash in OpenGL when changing between levels.
2022-04-26 20:31:38 -05:00
Eidolon
056abd0461 Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll 2022-04-26 20:31:38 -05:00
Eidolon
c330c05718 Add smooth rendering to save select screen 2022-04-26 20:31:38 -05:00
Eidolon
61efef2fa9 Add smooth level platter under interpolation, renderdeltatics
`renderdeltatics` can be used as a standard delta time in any place,
allowing for smooth menus. It will always be equal to `realtics`
when frame interpolation is turned off, producing consistent
framerate behavior everywhere it is used.
2022-04-26 20:31:38 -05:00
Eidolon
722b04518d Place Frame Interpolation in "Experimental" video options header
This seems like an appropriate way to describe the feature for now.
2022-04-26 20:31:38 -05:00
Eidolon
b625076c87 Implement interpolation at the renderer level
Instead of interpolating thinkers, we interpolate mobjs inside the
renderer. Further interpolation is TBI.
2022-04-26 20:31:37 -05:00
aiire
c4bb90fb0c do the thing 2022-04-21 16:55:57 +00:00
MascaraSnake
5fbe5189ce Merge branch 'udmf-sector-fields' into udmf-full 2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-04-20 21:00:44 +02:00
MascaraSnake
54640a8664 Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts:
#	extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
465327288c Fix int type error 2022-04-20 20:55:13 +02:00
MascaraSnake
39b7fb9ff8 Merge commit 'd624ee25' into udmf-thing-types
# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
9815d40c20 Adapt tutorial plant to UDMF 2022-04-20 20:06:08 +02:00
MascaraSnake
f76b104c4a Merge commit 'c7050671' into udmf-thing-types 2022-04-20 19:42:03 +02:00
MascaraSnake
36bf8b1a77 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a Merge branch 'udmf-lighting' into udmf-linedef-executors
# Conflicts:
#	src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-04-19 22:18:30 +02:00
MascaraSnake
f672b1b940 Merge branch 'udmf-scrollers' into udmf-polyobjects
# Conflicts:
#	src/p_spec.c
2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-04-19 22:06:32 +02:00
MascaraSnake
36692483df Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
#	src/p_inter.c
2022-04-19 22:04:04 +02:00
MascaraSnake
0b4bbacec0 Merge branch 'next' into udmf-fofs-mkii 2022-04-19 21:59:31 +02:00
spherallic
5bdfb7ffc1 Fix semibright/fulldark frame flags for models 2022-04-09 16:42:54 +02:00
Jaime Ita Passos
3581d06012 Fix frame blend flags not working with 3D models 2022-04-08 16:01:41 -03:00
GoldenTails
9bfc82a14b Prevent comptime.* from failing compilation 2022-04-04 20:02:30 -05:00
SteelT
0da3064b10 Only set default skin/color when possible 2022-03-22 13:17:05 -04:00
SteelT
61b0c24cad Fix "unknown command" not being printed on dedicated 2022-03-22 13:09:29 -04:00
Sally Coolatta
8c62a0d640 Fix papersprites being rotated incorrectly in Software when viewing them on the flipped side 2022-03-22 05:53:21 -04:00
sphere
55854410ac Merge branch 'line-angle' into 'next'
Add angle field to linedef_t

See merge request STJr/SRB2!1602
2022-03-22 09:09:40 +00:00
sphere
563ae7f7ac Merge branch 'hangster-fix' into 'next'
Prevent Hangsters from sliding across the ceiling

Closes #787

See merge request STJr/SRB2!1766
2022-03-22 08:58:46 +00:00
sphere
2b9af0ff24 Merge branch 'unsteal-ideya-spheres' into 'next'
Fix Ideya Capture sometimes stealing extra spheres

See merge request STJr/SRB2!1768
2022-03-21 22:53:06 +00:00
sphere
a0aebb2ed0 Merge branch 'fast-r-load-textures' into 'next'
Do not reload every texture when adding a wad

See merge request STJr/SRB2!1725
2022-03-21 22:41:04 +00:00
sphere
7ec7b2699f Merge branch 'floorsprite-and-shadow-fake-planes-fix' into 'next'
Drop shadow fake floor/ceiling fix

See merge request STJr/SRB2!1638
2022-03-21 22:40:25 +00:00
Lactozilla
4f9ac9edb8 Drop shadow fake floor/ceiling fix 2022-03-21 22:40:24 +00:00
sphere
e997254136 Merge branch 'minus-fixes' into 'next'
Fix Minus & debris' reverse gravity behavior

See merge request STJr/SRB2!1764
2022-03-21 21:59:32 +00:00
sphere
20b73dedfe Merge branch 'multimare-grades' into 'next'
Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu

Closes #71

See merge request STJr/SRB2!1762
2022-03-21 21:58:54 +00:00
sphere
1cd46c2208 Merge branch 'shadowscream' into 'next'
Remove drop shadow from badnik explosions, give drop shadows to Metal and flickies

Closes #218

See merge request STJr/SRB2!1761
2022-03-21 21:58:32 +00:00
sphere
7b6e4eb5fc Merge branch 'fullbright-ivsp' into 'next'
Make S_IVSP and  S_THUNDERCOIN_SPARK fullbright

See merge request STJr/SRB2!1755
2022-03-21 21:58:14 +00:00
sphere
e063084960 Merge branch 'myformerself' into 'next'
Make P_SpawnGhostMobj ghosts properly copy spritestuff2 (!1257) variables

See merge request STJr/SRB2!1741
2022-03-21 21:57:17 +00:00
sphere
c0a21ccbf3 Merge branch 'levelplatternames' into 'next'
Level platter name improvements

See merge request STJr/SRB2!1730
2022-03-21 21:57:03 +00:00
Zwip-Zwap Zapony
7fdebdcdb9 Suggested optimization 2022-03-20 13:18:22 +01:00
Zwip-Zwap Zapony
bca90893d2 Fix Ideya Capture sometimes stealing extra spheres
Also clean up redundant "startingspheres" variable
2022-03-20 09:52:47 +01:00
MascaraSnake
a78e4e553c Merge branch 'next' into udmf-fofs-mkii 2022-03-18 07:29:02 +01:00
spherallic
9769ad48e0 Prevent Hangsters from sliding across the ceiling. 2022-03-15 13:12:56 +01:00
spherallic
9ef2e7fc11 Change "ding" sound's singularity. 2022-03-13 22:05:17 +01:00
spherallic
113a3bdbb9 Replace magic numbers in sound info by actual SF_ flags 2022-03-13 18:58:34 +01:00
sphere
fd8deac385 Merge branch 'larg' into 'master'
Fix typo in linux-only compilation flag

See merge request STJr/SRB2!1759
2022-03-13 12:37:58 +00:00
spherallic
bd2d763bd0 Fix Minus & debris behavior in reverse gravity. 2022-03-13 12:34:17 +01:00
spherallic
c782e81700 Give MT_METALSONIC_RACE a drop shadow & removed unused vars. 2022-03-12 17:44:37 +01:00
SteelT
3eaae066ef Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu
Fixes #71
2022-03-08 21:06:01 -05:00
spherallic
6ef7221e38 A few drop shadow-related additions:
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for 
badnik explosions
- Gave flickies drop shadows
2022-03-09 00:49:24 +01:00
spherallic
50330c746b Merge branch 'next' into fast-r-load-textures 2022-03-08 22:11:16 +01:00
katsy
b161cb4588 e 2022-03-08 01:06:01 +00:00
katsy
86336d6bed remove MODID check from hooklib to fix compile issue 2022-03-07 18:33:15 -06:00
spherallic
82fb731cab :dramahog: 2022-03-06 22:52:43 +01:00
spherallic
098fcaa4b0 2.2.10 2022-03-06 20:22:22 +01:00
sphere
7e26377264 Merge branch 'state-changes' into 'next'
Update Nightopians & other state changes

See merge request STJr/SRB2!1744
2022-03-06 15:45:59 +00:00
sphere
ab711128c7 Merge branch 'tutorial-scenery' into 'next'
Tutorial scenery

See merge request STJr/SRB2!1722
2022-03-06 15:45:53 +00:00
sphere
8e6174ab2d Merge branch 'emblemhealth' into 'next'
Fix #805

Closes #805

See merge request STJr/SRB2!1757
2022-03-06 15:44:50 +00:00
sphere
00117476e1 Merge branch 'mobj-spawn-null-fix' into 'next'
Spawn MT_RAY when attempting to spawn MT_NULL

Closes #801 and #800

See merge request STJr/SRB2!1751
2022-03-06 11:52:44 +00:00
sphere
f7eafeb665 Merge branch '2022' into 'next'
2022

See merge request STJr/SRB2!1754
2022-03-06 11:52:31 +00:00
spherallic
77d4f873b0 Add upper bound to emblemlocations[] access. 2022-03-06 12:20:41 +01:00
aiire
6040f97dd5 added FF_FULLBRIGHT to S_THUNDERCOIN_SPARK 2022-03-04 23:25:25 +00:00
sphere
1abe2689f3 Merge branch 'fix-nonet-2210' into 'next'
Fix warning when compiling with NONET=1

See merge request STJr/SRB2!1753
2022-03-04 09:49:36 +00:00
sphere
980bcb4775 Merge branch 'fix-nohw-perfstats-next' into 'next'
Fix perfstats failing to compile with NOHW=1

See merge request STJr/SRB2!1728
2022-03-04 09:49:15 +00:00
aiire
8c1991d674 added FF_FULLBRIGHT to S_IVSP 2022-03-04 02:57:45 +00:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
3b75ef7e76 Fix warning when compiling with NONET=1 2022-03-03 12:08:15 +01:00
SteelT
893ea10a67 Turn the console warning into a devmode print because turns out it happens more often than I thought 2022-03-02 12:46:24 -05:00
SteelT
34f8464cbf Spawn MT_RAY when attempting to spawn MT_NULL
Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning
2022-03-02 12:35:03 -05:00
sphere
a57a0985ee Merge branch 'mt_ray' into 'next'
Move MT_RAY to the very end of the mobj list

See merge request STJr/SRB2!1747
2022-02-28 15:13:09 +00:00
sphere
0ad2ac68f7 Merge branch 'demo-frameflags' into 'next'
Convert old frame flags in Metal recordings to their 2.2.10 equivalents

Closes #775

See merge request STJr/SRB2!1742
2022-02-28 15:12:28 +00:00
spherallic
d624ee2541 Revert "minor spike optimisations"
This reverts commit b2d693a547.
2022-02-28 14:30:01 +01:00
spherallic
a6c52f5bad Move MT_RAY to the very end of the mobj list. 2022-02-22 15:49:16 +01:00
sphere
d6f3522333 Merge branch 'fix-vflag-blendmodes' into 'next'
Fix blendmode V_ flags not working at full opacity in Software

See merge request STJr/SRB2!1717
2022-02-21 19:58:24 +00:00
spherallic
fcc28d0714 Update seaweed state to utilize new features & sprites. 2022-02-21 16:00:21 +01:00
spherallic
946100939a Update editor configurations & increase Nightopians' hitbox height. 2022-02-19 22:19:39 +01:00
sphere
d532546e46 Merge branch 'mt-null-spawning' into 'next'
Remove MT_NULL hacks

Closes #721

See merge request STJr/SRB2!1729
2022-02-19 20:24:34 +00:00
sphere
249a3dfa25 Merge branch 'eggman-hitboxes' into 'next'
Increase Eggman's hitboxes

See merge request STJr/SRB2!1706
2022-02-19 20:24:20 +00:00
sphere
c79c6531e6 Merge branch 'server-bots' into 'next'
Improve bots (resolves #710)

Closes #710

See merge request STJr/SRB2!1679
2022-02-19 20:24:12 +00:00
sphere
7218060a7a :lachyes: 2022-02-19 01:49:19 +00:00
sphere
14cb5415c9 Merge branch 'fix-portals' into 'next'
Fix portals

See merge request STJr/SRB2!1724
2022-02-17 12:26:27 +00:00
spherallic
2266e31038 Merge branch 'next' into state-changes 2022-02-17 12:35:34 +01:00
spherallic
a4778075b2 Convert old frame flags in Metal recordings to their 2.2.10 equivalents. 2022-02-14 14:57:00 +01:00
SMS Alfredo
2033b77b46 Actually do the thing 2022-02-11 00:33:49 -06:00
spherallic
bb84ae1793 Decrease hitbox sizes to prevent collision with thin air. 2022-02-10 13:10:56 +01:00
spherallic
9fee550fb0 Actually check bot names in lib_gAddPlayer. 2022-02-08 14:58:09 +01:00
LJ Sonic
fdee3a2b7f Merge branch 'ms_update_command' into 'next'
Allow people to update their Master Server listing on command.

See merge request STJr/SRB2!1518
2022-02-06 18:53:49 +00:00
LJ Sonic
c00d1e5499 Merge branch 'no-dedi-sighandle-window' into 'next'
Disable SDL error message on dedicated servers

See merge request STJr/SRB2!1735
2022-02-06 17:44:48 +00:00
LJ Sonic
81b0eb1c7c Merge branch 'crosshairs' into 'next'
Fix crosshairs not displaying

See merge request STJr/SRB2!1716
2022-02-06 17:30:15 +00:00
LJ Sonic
9c5427555b Merge branch 'fix-exitgame-ztarget-crash' into 'next'
Fix lock-on crash (Resolves #746)

Closes #746

See merge request STJr/SRB2!1704
2022-02-06 17:24:01 +00:00
LJ Sonic
6c7d4b8ef5 Merge branch 'sw-splat-skybox-crash' into 'next'
Fix software splats breaking and crashing in skyboxes

See merge request STJr/SRB2!1711
2022-02-06 17:22:58 +00:00
LJ Sonic
2d53842061 Merge branch 'sw-splat-ceilingclip' into 'next'
Fix software splats not being clipped by ceiling walls

See merge request STJr/SRB2!1712
2022-02-06 17:22:49 +00:00
LJ Sonic
c69edce2fc Merge branch 'sw-dropshadow-patch' into 'next'
Hack that fixes software drop shadow crashes (Fixes #159)

Closes #159

See merge request STJr/SRB2!1700
2022-02-06 17:22:08 +00:00
LJ Sonic
2e60de25ea Merge branch 'sw-splat-npo2-slope-opt' into 'next'
Add missing optimization to software npo2 sloped floor sprites

See merge request STJr/SRB2!1713
2022-02-06 17:20:03 +00:00
LJ Sonic
b396683429 Merge branch 'fix-chat' into 'next'
Fix issues with chat messages

Closes #583

See merge request STJr/SRB2!1698
2022-02-06 17:15:04 +00:00
LJ Sonic
f4a9d1507d Merge branch 'fix-checksum-disconnect' into 'next'
Do not attempt to disconnect when a packet checksum is invalid

See merge request STJr/SRB2!1699
2022-02-06 17:14:44 +00:00
LJ Sonic
1a1cb8942c Merge branch 'znodes-offset-fix' into 'next'
UDMF: Fix offset calculation for segs that represent linedef backsides

See merge request STJr/SRB2!1701
2022-02-06 17:12:58 +00:00
LJ Sonic
9d993a585f Merge branch 'ignore-bad-map-lumps' into 'next'
Only load map lumps that are WADs or have no extension

See merge request STJr/SRB2!1715
2022-02-06 17:12:07 +00:00
GoldenTails
c49dd5f535 Make dedicated servers not pop up that annoying SDL error window
So they don't mess with shell scripts that expect SRB2 to exit when it crashes (like most other programs)
2022-02-05 18:19:00 -06:00
spherallic
878b4dc5b6 Don't read or set MT_NULL's properties in A_SkullAttack 2022-02-04 20:09:37 +01:00
SteelT
98aafc6056 Don't force bit depth to 8-bit when setting default video mode 2022-02-03 18:44:46 -05:00
spherallic
52f3e00497 Whitelist CHARFG, CHARFG, and level select graphics. 2022-02-03 14:38:45 +01:00
spherallic
61661dc900 Whitelist SPECTILE, NGRTIMER, and emblem/emerald hunt radar graphics. 2022-02-03 11:34:05 +01:00
spherallic
18361f5ed7 Whitelist record attack, NiGHTS mode and SRB2BACK graphics. 2022-02-02 23:40:10 +01:00
spherallic
e64775c867 Check V_ThinStringWidth instead of strlen for level platter names. 2022-02-02 23:16:12 +01:00
spherallic
6e105a23f6 Update Nightopian states for the new sprites & fix another bug 2022-02-02 14:43:22 +01:00
spherallic
e301327dee Avoid using old explosion states for Jetty-Syn/Skim mines. 2022-02-02 12:15:14 +01:00
James R
a8c658b545 Never spawn MT_NULL 2022-02-01 04:04:53 -08:00
James R
6325185091 Add P_SetPower; remove mobj hack from line 434 2022-02-01 03:52:31 -08:00
James R
9dfa153e74 Use P_CheckMove 2022-02-01 03:52:28 -08:00
James R
518de0ce10 Add P_CheckMove
Checks if P_TryMove would succeed without actually moving.
2022-02-01 03:37:03 -08:00
James R
f6f002e70b A_LobShot: remove ???
MT_NULL spawning, not cool bro.
2022-02-01 02:43:00 -08:00
James R
0a0c17da7c PARANOIA: I_Error if mobj hook is called with MT_NULL 2022-02-01 02:27:27 -08:00
sphere
ff57a983d7 Merge branch 'facing-forwards' into 'next'
Don't modify drawangle when taking damage in strafe mode

See merge request STJr/SRB2!1689
2022-01-30 13:32:30 +00:00
sphere
bcd900211b Merge branch 'nightopian-fix' into 'next'
Fix Nightopians

See merge request STJr/SRB2!1703
2022-01-30 13:28:18 +00:00
Hannu Hanhi
611054b6cd Fix perfstats failing to compile with NOHW=1 2022-01-29 02:24:52 +02:00
James R
37add34b9c Update texturecache user when reallocating 2022-01-27 00:28:36 -08:00
James R
2aec4501eb Hash name lookup for textures and lumps 2022-01-27 00:03:37 -08:00
James R
2ebec53561 P_AddWadFile: only load textures in current file 2022-01-27 00:03:34 -08:00
James R
571e475394 Read only header bytes when creating textures list
R_LoadTextures was reading in the entirety of every
texture lump, now it only reads the 8 byte PNG header.
This saved more than 1 second for me (1.68 s -> 0.24 s).

PNG still need to be read in entirely to check their
dimensions; I didn't bother looking into optimizing it
since we don't have many PNG textures right now.
2022-01-26 23:53:36 -08:00
James R
432f691852 Free unused texture lumps in R_LoadTextures
PU_CACHE never gets freed automatically and Z_Unlock does
NOTHING.
2022-01-26 23:53:36 -08:00
Hannu Hanhi
89843d0eca did not mean to remove this line 2022-01-25 05:01:23 +02:00
Hannu Hanhi
ba04b045e6 Fix portals
- Resetting portalcullsector fixes the major visual glitches

- Using 32 bits for nummasks and i fixes crashes when rendering lots of portals
2022-01-25 04:53:40 +02:00
spherallic
cdef5a679b disable develop 2022-01-23 20:39:17 +01:00
spherallic
be7f628e2c Add new plant object for the revamped tutorial. 2022-01-23 20:13:26 +01:00
spherallic
6d19a55de9 oops 2022-01-23 19:19:26 +01:00
spherallic
15755ef992 Remove unneeded R_GetTranslucencyTable calls, add V_HUDTRANS* comments 2022-01-19 13:17:57 +01:00
spherallic
9a07c1ca8c Fix HUD/graphic blendmodes not working at full opacity in Software. 2022-01-19 10:09:57 +01:00
lachablock
1a5995968c Revert server-sidedness of bots 2022-01-19 00:48:25 +11:00
spherallic
bf2809b213 Fix crosshairs not displaying and refactor their code. 2022-01-15 17:12:33 +01:00
MascaraSnake
a342703b50 Merge branch 'udmf-sector-fields' into udmf-full
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
2022-01-14 21:16:23 +01:00
MascaraSnake
13b8d1cf7e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a Merge branch 'udmf-thing-types' into udmf-more-linedef-types
# Conflicts:
#	src/p_setup.c
2022-01-14 21:06:45 +01:00
MascaraSnake
0833f0bd4f Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts:
#	src/p_setup.c
#	src/p_spec.h
2022-01-14 21:01:39 +01:00
MascaraSnake
0d9860c368 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-14 20:42:59 +01:00
MascaraSnake
4b8f5bd7f3 Merge branch 'udmf-lighting' into udmf-linedef-executors
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/doomdata.h
#	src/r_defs.h
2022-01-14 20:30:29 +01:00
MascaraSnake
79cf2f53e8 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-14 20:24:51 +01:00
MascaraSnake
7d2a188c31 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-14 20:24:13 +01:00
MascaraSnake
940d076190 Merge branch 'udmf-plane-linedefs' into udmf-scrollers
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
2022-01-14 20:21:48 +01:00
MascaraSnake
5d343f9c13 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
2022-01-14 20:17:18 +01:00
Hannu Hanhi
49d03913d7 Add missing optimization to npo2 sloped floor sprites 2022-01-14 20:45:28 +02:00
MascaraSnake
323cfaace9 Add blendmode support to FOFs 2022-01-14 19:40:45 +01:00
Hannu Hanhi
d0966f123f Fix software splats not being clipped by ceiling walls 2022-01-14 20:11:49 +02:00
Hannu Hanhi
f72f45d93a Fix software splats breaking and crashing in skyboxes 2022-01-14 19:53:03 +02:00
MascaraSnake
6bb6dc88ca Merge branch 'next' into udmf-fofs-mkii
# Conflicts:
#	src/hardware/hw_main.c
#	src/lua_maplib.c
#	src/p_spec.c
#	src/p_user.c
2022-01-14 07:24:05 +01:00
MascaraSnake
37bb9d9c11 Fix oversight with rising FOFs 2022-01-13 23:11:10 +01:00
MascaraSnake
7c0687bc33 P_WriteTextmap: Copy colormap only to first tagged sector and do the rest via the linedef 2022-01-13 23:02:38 +01:00
MascaraSnake
1fdfb6ba6e P_WriteTextmap: Add warning for linedef type 61 2022-01-13 22:14:41 +01:00
MascaraSnake
b8524fc741 P_WriteTextmap: Convert linedef executors that rely on mapthings 2022-01-13 21:59:00 +01:00
MascaraSnake
2d4aabe48e P_WriteTextmap: Remove superfluous whitespaces in moreids 2022-01-13 18:57:41 +01:00
MascaraSnake
1dcee17fa4 P_WriteTextmap: Convert linedef type 76 2022-01-13 18:54:18 +01:00
spherallic
8007aa82ca Merge branch 'next' into tutorial-scenery 2022-01-13 16:03:57 +01:00
katsy
fe3a201df5 fix oldringexplode not scaling or flipping 2022-01-13 02:52:10 -06:00
lachablock
4af820e82c Restore a cast I didn't realize used to be there 2022-01-13 09:56:47 +11:00
lachablock
70a1dd6db0 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-13 09:52:38 +11:00
LJ Sonic
b7dbb7782e Only load map lumps that are WADs or have no extension 2022-01-12 23:06:26 +01:00
MascaraSnake
25fe26badc P_WriteTextmap: Add more warnings for unconvertable stuff 2022-01-12 21:36:19 +01:00
sphere
f8532d4ad1 Merge branch 'blentran-update' into 'next'
Blentran - updated

See merge request STJr/SRB2!1656
2022-01-11 21:53:49 +00:00
sphere
53f9d4b2e0 Merge branch 'new-default-controls' into 'next'
Several changes to default control settings

See merge request STJr/SRB2!1682
2022-01-11 21:19:05 +00:00
sphere
0ca74432f9 Merge branch 'ogl-better-gpu-error' into 'next'
Improve OpenGL GDI Generic error message

See merge request STJr/SRB2!1673
2022-01-11 21:16:32 +00:00
sphere
ea3b867c7e Merge branch 'rotationcrash' into 'next'
Fix 2.2.10 pre1 rollangle crash (resolves #747)

Closes #747

See merge request STJr/SRB2!1707
2022-01-11 21:16:14 +00:00
sphere
af925c1742 Merge branch 'taglists-refactor' into 'next'
Speed up taglist creation

See merge request STJr/SRB2!1702
2022-01-11 21:15:06 +00:00
MascaraSnake
666833e64b P_WriteTextmap: Add warnings for deprecated sector specials and reserved tags 2022-01-11 20:24:07 +01:00
lachablock
8ed18a12a4 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-11 20:04:22 +11:00
katsy
2e4c5d1446 alternate fix to #555 which doesn't crash the game 2022-01-10 19:32:21 -06:00
MascaraSnake
0b9876d61b P_WriteTextmap: Clear out colormap linedef special after copying the colormap 2022-01-10 22:10:19 +01:00
spherallic
af5173c90f Increase Eggman's hitboxes to actually match the current sprites. 2022-01-10 21:38:30 +01:00
MascaraSnake
3b4fad16db P_WriteTextmap: Convert global colormaps 2022-01-10 21:23:55 +01:00
MascaraSnake
576ded6537 Fix incorrectly applied FOF blendmodes 2022-01-10 20:59:57 +01:00
LJ Sonic
a6808de96c Fix message sending code using hardcoded buffer size 2022-01-10 20:12:27 +01:00
LJ Sonic
de9d6ecbe6 Fix long chat messages causing net command failures 2022-01-10 20:05:58 +01:00
LJ Sonic
aee7803621 Add SKIPSTRINGL macro 2022-01-10 20:03:36 +01:00
LJ Sonic
05f1a9edc1 Revert "Fix long chat messages causing net command failures"
This reverts commit 1377824799.
2022-01-10 19:57:15 +01:00
LJ Sonic
7ea81eacc5 Fix say command and its variants using hardcoded buffer size 2022-01-10 19:31:41 +01:00
LJ Sonic
3083290af8 Add READSTRINGL and WRITESTRINGL macros 2022-01-10 18:57:18 +01:00
LJ Sonic
a668546088 Make byte stream manipulation code easier to read 2022-01-10 18:56:42 +01:00
GoldenTails
e0afc2d2b6 Add a player->mo check before attempting to account for ztargetting. 2022-01-09 17:09:57 -06:00
MascaraSnake
868b2577ad Merge branch 'udmf-sector-fields' into udmf-full
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_setup.c
#	src/p_spec.c
2022-01-09 13:58:27 +01:00
MascaraSnake
020b738aa9 Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-09 13:52:59 +01:00
MascaraSnake
e7a281d994 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-01-09 13:52:26 +01:00
MascaraSnake
e19ba99f57 Merge branch 'udmf-executor-triggers' into udmf-thing-types 2022-01-09 13:51:50 +01:00
MascaraSnake
95bf8ea4bb Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-09 13:51:21 +01:00
MascaraSnake
fba986ff1c Merge branch 'udmf-lighting' into udmf-linedef-executors 2022-01-09 13:50:47 +01:00
MascaraSnake
0b8204491d Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-09 13:50:14 +01:00
MascaraSnake
904b434c65 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-09 13:49:46 +01:00
MascaraSnake
0c6e2c70c7 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-01-09 13:49:14 +01:00
MascaraSnake
5e7547b822 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 2022-01-09 13:48:40 +01:00
MascaraSnake
3104504848 Merge branch 'blentran-update' into udmf-full 2022-01-09 13:47:59 +01:00
MascaraSnake
95e909400f Fix blendmode regression in OpenGL caused by faulty fog wall support 2022-01-09 13:45:56 +01:00
MascaraSnake
0a2294118e Merge branch 'udmf-scrollers' into udmf-full 2022-01-09 12:53:35 +01:00
MascaraSnake
ce29d05be8 Fix typo in wall scroller conversion 2022-01-09 12:53:12 +01:00
MascaraSnake
b3ca6845c1 P_WriteTextmap: Don't bother with equation slopes because binary maps can't have them anyway 2022-01-09 12:38:49 +01:00
MascaraSnake
7276c6bef5 P_WriteTextmap: Correctly write linedef executor delays 2022-01-09 12:37:46 +01:00
MascaraSnake
1fbfc9bea9 P_WriteTextmap: Convert custom gravity and custom exit 2022-01-09 11:44:53 +01:00
MascaraSnake
5f6014223d Don't convert global colormaps 2022-01-09 10:41:50 +01:00
MascaraSnake
c1f03e7720 P_WriteTextmap: Convert colormaps 2022-01-09 10:22:25 +01:00
MascaraSnake
a46619684f Disable NiGHTS objectplace, which serves no purpose anymore without writethings 2022-01-09 09:30:15 +01:00
MascaraSnake
8615e86a0b P_WriteTextmap: Don't try to write invalid textures 2022-01-09 09:27:39 +01:00
spherallic
8651123463 Fix errors with the hardcoded Nightopians from Dream Hill. 2022-01-08 19:47:00 +01:00
MascaraSnake
90cd009b23 Remove writethings because it no longer works properly with the binary-to-UDMF conversion 2022-01-08 16:58:55 +01:00
MascaraSnake
1269fe6c0e Implement faster textmap parser 2022-01-08 13:17:15 +01:00
MascaraSnake
b7f9626fda Merge branch 'taglists-refactor' into udmf-full 2022-01-07 18:45:52 +01:00
MascaraSnake
3248556fa9 Speed up taglist creation 2022-01-07 18:42:56 +01:00
MascaraSnake
5149699def Update VS project files 2022-01-07 18:00:56 +01:00
MascaraSnake
b05bcc4657 P_WriteTextmap: Correct flat offsets 2022-01-07 15:44:56 +01:00
MascaraSnake
c912222df6 Merge branch 'znodes-offset-fix' into udmf-full 2022-01-07 14:44:42 +01:00
MascaraSnake
56b00fac54 P_WriteTextmap: Rearrange properties and remove some defaults 2022-01-07 13:39:25 +01:00
MascaraSnake
95ce2aca98 P_WriteTextmap: Update friction to float 2022-01-07 12:59:29 +01:00
MascaraSnake
b6a5ff98f0 Merge branch 'udmf-sector-fields' into udmf-full 2022-01-07 12:46:47 +01:00
MascaraSnake
8b5f6cca37 Add command line parameter for saving the current map in TEXTMAP format 2022-01-07 12:45:40 +01:00
MascaraSnake
1de5b77710 Fix typo 2022-01-07 10:25:32 +01:00
MascaraSnake
659410dde1 Use Slope Skew flag instead of Upper Unpegged for FOF skewing 2022-01-05 23:47:05 +01:00
MascaraSnake
e406a52446 Remove weird special behavior for two-sided upper textures in software 2022-01-05 22:33:14 +01:00
MascaraSnake
fcb69b9c2f Rename more linedef flags 2022-01-05 19:43:40 +01:00
MascaraSnake
2bef8da42f Remove access to unused effect6 flag in UDMF 2022-01-05 18:42:53 +01:00
MascaraSnake
5f97047b96 Rename linedef flags 2022-01-05 18:40:02 +01:00
MascaraSnake
55559a5f98 Split P_ConvertBinaryMap into multiple functions 2022-01-05 18:15:04 +01:00
MascaraSnake
06b7d7ceb8 Make only ML_EFFECT3 affect midtexture pegging in UDMF 2022-01-05 18:05:47 +01:00
MascaraSnake
549569e75b Fix offset calculation for segs that represent linedef backsides 2022-01-05 10:08:49 +01:00
spherallic
a08c7eac1f wip: staterange actions 2022-01-05 09:55:46 +01:00
MascaraSnake
d25bc75a92 Remove redundant UDMF check in P_LoadSidedefs 2022-01-05 09:22:13 +01:00
MascaraSnake
a8e32cfe12 Fix incorrect turnaround behavior for bounceFloor and bounceCeiling 2022-01-05 00:26:10 +01:00
Hannu Hanhi
a8fe12ae98 Hack that fixes software drop shadow crashes by bypassing incorrectly set variables 2022-01-04 22:30:50 +02:00
MascaraSnake
577ae68d6d Make sector friction a floating-point field 2022-01-04 21:25:34 +01:00
MascaraSnake
88fae019a2 Fix typos in binary-to-UDMF conversion 2022-01-04 19:59:51 +01:00
MascaraSnake
9d67420e5c Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag 2022-01-04 19:57:14 +01:00
MascaraSnake
7609f300ba Fix typo in laser FOF conversion 2022-01-04 19:45:36 +01:00
MascaraSnake
ca1d844278 Merge branch 'blentran-update' into udmf-full 2022-01-04 19:36:20 +01:00
MascaraSnake
afde568856 Add blendmode support to FOFs 2022-01-04 19:33:17 +01:00
spherallic
c7281d1801 Fix cyan pixel cutting in Software 2022-01-04 14:26:04 +01:00
MascaraSnake
8c17bb57e6 Turn the fog wall linedef type into a blendmode 2022-01-04 14:26:03 +01:00
MascaraSnake
3b08a15860 Expose blendmodes to UDMF 2022-01-04 14:26:03 +01:00
sphere
f455bf347b blentran part 3: Wall & plane blendmodes. 2022-01-04 14:26:03 +01:00
sphere
470b069179 blentran part 2: Sprite & patch blendmodes. 2022-01-04 14:26:03 +01:00
sphere
f9d2fd9ce5 blentran part 1: Flag changes & semibright support. 2022-01-04 14:26:03 +01:00
LJ Sonic
1377824799 Fix long chat messages causing net command failures 2022-01-03 22:37:19 +01:00
LJ Sonic
0241016f6a Do not attempt to disconnect when a packet checksum is invalid 2022-01-03 12:13:55 +01:00
LJ Sonic
159be00109 Support delete key in chatbox 2022-01-03 00:37:11 +01:00
LJ Sonic
af629fefe9 Fix long chat messages crashing the game 2022-01-03 00:08:23 +01:00
LJ Sonic
3c8a29f1ff Add SKIPSTRINGN macro 2022-01-03 00:06:43 +01:00
LJ Sonic
055d57c56c Fix single-letter messages not being sent 2022-01-03 00:06:20 +01:00
MascaraSnake
913731b4bc Merge branch 'blentran-update' into udmf-full
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
#	src/p_spec.c
2022-01-02 23:19:47 +01:00
LJ Sonic
b933316f23 Cleanup chat event handling 2022-01-02 23:19:34 +01:00
LJ Sonic
e761e36c55 Cleanup and fix chat deleting and pasting 2022-01-02 23:06:34 +01:00
spherallic
1a21ca14f0 Fix cyan pixel cutting in Software 2022-01-02 20:44:24 +01:00
LJ Sonic
2bbbd57c6e Turn HU_queueChatChar into HU_sendChatMessage 2022-01-02 18:35:11 +01:00
LJ Sonic
b8975b6a71 Group related chat stuff together 2022-01-02 17:50:01 +01:00
LJ Sonic
3638d5d556 Cleanup chat code a little 2022-01-02 17:08:10 +01:00
LJ Sonic
f8afdeb35f Cleanup chatbox sanitizing code 2022-01-02 15:48:31 +01:00
LJ Sonic
34ad64ba59 Cleanup chatbox reset code 2022-01-02 15:41:54 +01:00
LJ Sonic
d9bc478822 Cleanup blank chatbox checking code 2022-01-02 15:39:16 +01:00
spherallic
719ceb0586 Add collision check for flipped water drops 2022-01-01 19:34:27 +01:00
MascaraSnake
8e4cbf8b76 Disable ML_EFFECT5 on linedef executor triggers for UDMF maps (what a pointless feature) 2021-12-31 15:33:47 +01:00
MascaraSnake
2886a277d8 Turn the fog wall linedef type into a blendmode 2021-12-31 15:00:27 +01:00
MascaraSnake
e4d7b3df6c Minor cleanup in P_SpawnSpecials 2021-12-31 14:17:17 +01:00
MascaraSnake
0d2d7a2803 Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
# Conflicts:
#	src/p_spec.c
2021-12-31 14:14:23 +01:00
MascaraSnake
5873ecfa02 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-31 14:12:13 +01:00
MascaraSnake
98157daa1c Merge branch 'udmf-executor-triggers' into udmf-thing-types 2021-12-31 14:11:50 +01:00
MascaraSnake
63978b76df Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2021-12-31 14:11:18 +01:00
MascaraSnake
b35da98a3c Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-12-31 14:10:50 +01:00
MascaraSnake
ee728126df Fix oversight with linedef type 604 2021-12-31 14:09:38 +01:00
MascaraSnake
9b780f417e Fix a conversion oversight with linedef type 8 2021-12-31 14:06:06 +01:00
MascaraSnake
eef7763d68 Set SSF_WINDCURRENT and SSF_CONVEYOR automatically if there's a pusher/conveyor 2021-12-31 13:58:41 +01:00
MascaraSnake
2b4d32b372 Turn solid lava into a damagetype 2021-12-31 12:15:01 +01:00
MascaraSnake
e011962156 Make the sector special field inaccessible in UDMF 2021-12-31 11:44:05 +01:00
MascaraSnake
208395214a Implement sector fields for linedef executor triggering 2021-12-31 11:39:34 +01:00
MascaraSnake
b3be8d1f44 Implement sector damagetype field 2021-12-31 08:53:00 +01:00
MascaraSnake
417809f78e Fix typo in P_MobjTouchingSectorSpecial 2021-12-31 00:05:47 +01:00
MascaraSnake
feaa4f1273 Replace most sector specials with sector special flags 2021-12-31 00:03:24 +01:00
MascaraSnake
e1393954c7 Make deprecated sector types inaccessible in UDMF 2021-12-30 21:27:09 +01:00
MascaraSnake
570a6ab395 Turn "intangible to camera" sector special into a sector flag 2021-12-30 20:37:57 +01:00
MascaraSnake
7b830fbddf Add "change sector's gravity" linedef executor in UDMF to replace linedef type 1 2021-12-30 19:28:01 +01:00
MascaraSnake
b3863c57be Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF 2021-12-30 18:50:02 +01:00
MascaraSnake
86e2fefcac Add sector gravity field for UDMF 2021-12-30 18:19:42 +01:00
spherallic
d9410e3e6a fix compile warnings (this really puts the mess in message) 2021-12-30 16:29:37 +01:00
MascaraSnake
e3d41e0bda Adapt linedef type 540 to UDMF 2021-12-30 15:32:28 +01:00
MascaraSnake
f30b97ba93 Adapt heat wave effect to UDMF 2021-12-30 14:48:40 +01:00
MascaraSnake
b74d06b4e7 Netsync sector flags 2021-12-30 14:33:24 +01:00
MascaraSnake
2a1f96aa3c Adapt linedef type 8 to UDMF 2021-12-30 14:26:51 +01:00
MascaraSnake
2fd6eafbcf Expose sector flags to Lua and UDMF 2021-12-30 14:16:00 +01:00
MascaraSnake
34229030f2 Make implementation of slope copying with linedef type 700 not hacky 2021-12-30 08:10:20 +01:00
MascaraSnake
696d4945a7 Adapt linedef type 14 to UDMF 2021-12-30 07:54:16 +01:00
MascaraSnake
73ba288e5d P_ProcessLinedefsAfterSidedefs: Skip text copying in UDMF 2021-12-29 23:45:43 +01:00
MascaraSnake
9af28321a5 Fix unadapted flag for linedef type 426 2021-12-29 23:12:46 +01:00
MascaraSnake
69797377c4 Adapt some parameter linedef types to UDMF 2021-12-29 23:03:37 +01:00
MascaraSnake
0b3180cdfa Adapt linedef type 64 to UDMF 2021-12-29 21:03:47 +01:00
spherallic
17251895ea Increase default camera height for both playstyles 2021-12-29 19:29:41 +01:00
spherallic
4d1fb04327 Update playstyle names on the input display 2021-12-29 19:29:41 +01:00
spherallic
0a38fef147 Several changes to default control settings:
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
2021-12-29 19:29:36 +01:00
MascaraSnake
29ee8484eb Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-29 15:53:46 +01:00
MascaraSnake
338f1357a6 Particle generator: Use args[6] instead of angle for tagging 2021-12-29 15:53:20 +01:00
MascaraSnake
228efa5ffc Add "relative" setting to linedef type 799 and adapt it to UDMF 2021-12-29 15:29:59 +01:00
MascaraSnake
1e1ea22e51 Separate thinker structs for dynamic line and vertex slopes 2021-12-29 13:53:38 +01:00
sphere
e8c83f48be Merge branch 'fix-binary-mtag' into 'next'
Make linedef 96 apply to tags from 97-99, but not to itself

See merge request STJr/SRB2!1633
2021-12-29 10:07:35 +00:00
MascaraSnake
49c1645b5f Adapt linedef type 63 to UDMF 2021-12-29 11:03:00 +01:00
sphere
4e972f7d24 Merge branch 'deathpit_explosions' into 'next'
Fix enemy/boss/minecart explosions in death pits (Closes #67)

Closes #67

See merge request STJr/SRB2!1688
2021-12-29 10:00:25 +00:00
sphere
2e8b7688e8 Merge branch 'resolve-329' into 'next'
Allow changing the master server address while hosting a netgame

Closes #329

See merge request STJr/SRB2!1687
2021-12-29 10:00:08 +00:00
sphere
c12ad1d63c Merge branch 'invert' into 'next'
Give the inverted flashpal a constant

See merge request STJr/SRB2!1685
2021-12-29 10:00:04 +00:00
sphere
68547a503b Merge branch 'botsforexit' into 'next'
Don't count bots in playersforexit

See merge request STJr/SRB2!1684
2021-12-29 09:59:54 +00:00
katsy
effcb948ad Don't count bots in playersforexit 2021-12-29 09:59:54 +00:00
MascaraSnake
63548fe235 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-29 10:59:43 +01:00
sphere
e152a32c10 Merge branch 'HUD_fixes' into 'next'
Some hud fixes (by Confusion)

See merge request STJr/SRB2!1670
2021-12-29 09:59:40 +00:00
MascaraSnake
3bac97ee65 Clean up P_SpawnSpecials a bit 2021-12-29 10:59:26 +01:00
MascaraSnake
234e8f5f8f Disable camera scanner effect in UDMF 2021-12-29 10:55:39 +01:00
MascaraSnake
c76d0e3326 Implement linedef executor for changing linedef args 2021-12-29 10:42:20 +01:00
MascaraSnake
e7869039db Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-29 09:40:47 +01:00
MascaraSnake
95248dc80f Merge branch 'next' into udmf-thing-types
# Conflicts:
#	src/p_mobj.c
2021-12-29 09:35:25 +01:00
MascaraSnake
1aa9ba1447 Delete removed mobj types from deh_tables.c 2021-12-29 08:31:47 +01:00
MascaraSnake
cbf32c6615 Adapt some miscellaneous linedef types to UDMF 2021-12-29 08:12:28 +01:00
MascaraSnake
e76d332678 Disable the old hacky way of doing egg capsules in UDMF maps 2021-12-28 23:51:08 +01:00
MascaraSnake
2a868ca60d Adapt Glaregoyles to UDMF 2021-12-28 23:06:48 +01:00
MascaraSnake
a091b7d16d Adapt bosses to UDMF and remove now-unused mapthing flags 2021-12-28 22:52:24 +01:00
MascaraSnake
e71a952d70 Adapt monitors to UDMF 2021-12-28 17:54:26 +01:00
MascaraSnake
79c3197de2 Adapt various thing types for UDMF 2021-12-28 16:38:52 +01:00
MascaraSnake
53931727bd Adapt pushables to UDMF 2021-12-28 14:28:36 +01:00
MascaraSnake
42f823600c Adapt NiGHTS items to UDMF 2021-12-28 14:04:30 +01:00
MascaraSnake
b4a206c063 Adapt remaining enemies to UDMF 2021-12-28 13:14:48 +01:00
MascaraSnake
5d1284bc81 Fix unitialized array in P_ConvertBinaryMap 2021-12-28 11:42:53 +01:00
MascaraSnake
1cff7a161a Adapt ambient sound effects to UDMF 2021-12-28 09:58:45 +01:00
MascaraSnake
5248271619 Adapt blast linedef executor to UDMF 2021-12-28 08:33:57 +01:00
MascaraSnake
e140bd8252 Adapt balloon colors to UDMF 2021-12-28 08:26:04 +01:00
MascaraSnake
8b69c62111 Adapt more scenery items to UDMF 2021-12-28 08:19:56 +01:00
MascaraSnake
b1d0870511 (Mostly) adapt fan to UDMF 2021-12-28 07:47:10 +01:00
MascaraSnake
90eb7c71a3 Adapt skybox view point to UDMF 2021-12-28 07:29:41 +01:00
MascaraSnake
43a15387d2 Adapt diagonal springs to UDMF 2021-12-27 21:28:42 +01:00
MascaraSnake
fd3fa9a924 Adapt flame-related objects to UDMF 2021-12-27 18:52:46 +01:00
MascaraSnake
720df51b6e Adapt most flame jet settings to UDMF 2021-12-27 17:58:18 +01:00
MascaraSnake
3bab07d036 Adapt flickies to UDMF 2021-12-27 17:36:51 +01:00
MascaraSnake
8db84ffef9 Adapt boss waypoint to UDMF 2021-12-27 15:39:14 +01:00
MascaraSnake
06bbee50bf Adapt boss IDs and trigger tags to UDMF 2021-12-27 15:07:37 +01:00
lachablock
392e782893 Don't modify drawangle when taking damage in strafe mode 2021-12-27 23:35:01 +11:00
sphere
31eb2a7e77 Merge branch 'nobotbonus' into 'next'
Don't award end-of-level bonuses to Tailsbot

See merge request STJr/SRB2!1676
2021-12-27 11:49:13 +00:00
spherallic
1040141560 Fix enemy/boss/minecart explosions in death pits 2021-12-27 12:41:04 +01:00
MascaraSnake
a14eacd63a Bowser isn't a boss, so don't call A_BossDeath just to do that one thing it needs to do 2021-12-27 08:55:59 +01:00
MascaraSnake
c550de5dfa Adapt spikes to UDMF 2021-12-27 07:32:57 +01:00
MascaraSnake
36217c6468 Finish adapting slope vertices to UDMF 2021-12-26 21:33:20 +01:00
spherallic
b830fee2e3 Allow changing the master server address while hosting a netgame. 2021-12-26 21:30:36 +01:00
spherallic
bb514d227c Don't count music.dta as a main wad when using listwad 2021-12-26 21:12:39 +01:00
MascaraSnake
8535b595d6 Adapt some more player spawning stuff to UDMF 2021-12-26 21:11:24 +01:00
MascaraSnake
ea6fe56df6 Refactor A_BossDeath 2021-12-26 20:31:02 +01:00
MascaraSnake
3661fd5079 Adapt boss fly point to UDMF 2021-12-26 20:09:38 +01:00
sphere
6cb6cc5afb Merge branch 'fixlazytails' into 'next'
Set a default botleader if we don't have one (resolves #717)

Closes #717

See merge request STJr/SRB2!1683
2021-12-26 12:41:49 +00:00
katsy
243a797efe Set a default botleader if we don't have one (resolves #717) 2021-12-26 12:41:49 +00:00
MascaraSnake
baa99150d0 Adapt Fang waypoint to UDMF 2021-12-25 09:58:00 +01:00
katsy
9b10473e0d add invert flashpal constant 2021-12-24 19:36:26 -06:00
sphere
2615528f45 Merge branch 'pterabyte-mash' into 'next'
CR_PTERABYTE tweaks (Closes #304)

Closes #304

See merge request STJr/SRB2!1380
2021-12-24 13:29:13 +00:00
lachablock
2975b22aed Merge remote-tracking branch 'origin/next' into server-bots 2021-12-22 19:46:33 +11:00
lachablock
1eb1ad2677 Fix compile warning 2021-12-22 19:46:16 +11:00
MascaraSnake
fe8c1d1331 Adapt Pyre Fly to UDMF 2021-12-21 22:00:42 +01:00
MascaraSnake
5eb2448a40 Adapt Pterabytes to UDMF 2021-12-21 21:57:35 +01:00
MascaraSnake
a5ac10733a Adapt Hive Elemental to UDMF 2021-12-21 21:51:37 +01:00
MascaraSnake
52c319167f (Mostly) adapt the Ideya Drone to UDMF 2021-12-21 21:41:00 +01:00
MascaraSnake
5918ecc2fe Refactor star post check 2021-12-21 18:32:24 +01:00
MascaraSnake
693fa7ba81 Adapt star posts to UDMF 2021-12-21 18:27:19 +01:00
MascaraSnake
af30847a1f Adapt zoom tube waypoint to UDMF 2021-12-21 18:24:58 +01:00
MascaraSnake
81bf0dceb2 Turn makesoftwarecorona into a function 2021-12-21 18:12:38 +01:00
MascaraSnake
4b58b45b5f Adapt emblem tags to UDMF 2021-12-21 17:58:37 +01:00
MascaraSnake
cbebdc219d Adapt pop-up turret to UDMF 2021-12-21 17:45:43 +01:00
MascaraSnake
7eee8b10a9 Add A_LinedefExecuteFromArg to deh_tables.c 2021-12-21 17:31:29 +01:00