Commit graph

5899 commits

Author SHA1 Message Date
Nev3r
a1f429030c Set a default frontscale for visplane portals.
I don't know whether this is necessary or not but I'm poking blindly trying to fix the sorting issues for now.
2019-06-04 21:04:35 +02:00
Nev3r
96cfecc41a Created drawnode lists for each view/portal.
Each shall eventually have its specific vissprites/drawsegs; currently only drawsegs are stored in their correct list, vissprites are stored in the first list as a placeholder.
The idea is to sort each list individually, and then render their masked elements, starting from the last drawnode list.
This retains a non-recursive function calling method while still rendering things in order.
2019-06-04 20:15:42 +02:00
Nev3r
84a52a0f80 Moving away more portal-related global vars to r_portal. 2019-06-03 13:33:12 +02:00
Nev3r
c35769e5de Moved validcount++ to where it used to be.
It seems to screw up the portal rendering in odd ways if it's in the wrong position. I apologize for not even knowing what it's meant to do nor how it works.
2019-06-03 13:04:27 +02:00
Nev3r
ae1e3630f8 Add visplane portal creation functionality and use it to replace the skybox rendering.
The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals.
The skybox portals are still incomplete and cause visual glitches when masked elements are involved.
2019-06-02 00:07:55 +02:00
Nev3r
7e1bb4a370 Code refactoring to turn portal struct into a more generalized shape.
Split portal-related code to its own source files.
Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.
2019-06-01 13:07:23 +02:00
Monster Iestyn
dc5d13da46 Merge branch 'steelt-acz-things-hardcode' into 'master'
Hardcode some ACZ things

See merge request STJr/SRB2Internal!220
2019-05-17 12:22:21 -04:00
Monster Iestyn
5e87ab4fa7 Merge branch 'public_flatsprite' 2019-05-16 16:00:24 +01:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Monster Iestyn
11cc332378 Merge branch 'archiveworld-sigsegv-fix' into 'next'
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.

See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
Alam Ed Arias
be13ab4830 Fix NONET build 2019-05-13 01:51:36 -04:00
Steel Titanium
2c4555493d Merge branch 'perpetual-modifier-updates' into 'master'
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Steel Titanium
f235f45431 Merge branch 'no-frameskip' into 'next'
Don't skip frames when connecting or paused

See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
Steel Titanium
0f616a7141 Properly fix crash due to duplicated lines. 2019-05-13 00:23:43 -04:00
Steel Titanium
9ec6d5e653 Revert "Check that lumps are okay"
This reverts commit 3f4121085b.
2019-05-13 00:20:39 -04:00
Steel Titanium
ed6bd64014 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
James R
3f4121085b Check that lumps are okay 2019-05-08 20:30:19 -04:00
Monster Iestyn
5756583612 Merge branch 'master' into next 2019-05-08 16:31:05 +01:00
Monster Iestyn
2b636ae614 Merge branch 'alias_recursion_hotfix_2' into 'master'
Alias recursion hotfix 2

See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
wolfy852
93c706bfb8 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
wolfs
10b47550a4 Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
Monster Iestyn
693b4e3dcf Merge branch 'public_flatsprite' into 'public_flatsprite'
Merge in next and don't billboard papersprites in GL

See merge request STJr/SRB2!488
2019-05-06 15:34:35 -04:00
Sryder
70ff9be419 No sprite billboarding on papersprites 2019-05-06 20:24:26 +01:00
Sryder
7792b48ea3 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
# Conflicts:
#	src/p_user.c
2019-05-06 20:20:57 +01:00
Monster Iestyn
a0e135f1b8 Merge branch 'master' into next 2019-05-06 19:38:53 +01:00
Nev3r
7a66fabf4f Merge branch 'banip-command' into 'next'
Ban IP command

See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
9a43511cf6 Merge branch 'console-wait-fix' into 'master'
Don't count down wait timer when executing a command line

See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
809975b1ff Merge branch 'opengl-sprite-billboarding' into 'master'
OpenGL Sprite Billboarding

See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
64fb7f90f0 Add a cvar for sprite billboarding, off by default. 2019-05-06 16:57:32 +01:00
Monster Iestyn
055aeddb6f Merge branch 'public_next' 2019-05-03 16:42:42 +01:00
Monster Iestyn
cbb20fc147 Merge branch 'master' into next 2019-05-03 16:40:13 +01:00
Monster Iestyn
5cd8ff01ba add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
57edf46531 Merge branch 'master' into next 2019-05-03 16:00:45 +01:00
wolfs
3d24bf11af Merge branch 'nonet-upnp' into 'master'
Don't enable UPnP support if NONET is defined.

See merge request STJr/SRB2!484
2019-05-03 06:40:22 -04:00
Digiku
b8082869b8 Merge branch 'menu-execs' into 'master'
New title screen features

See merge request STJr/SRB2Internal!204
2019-05-03 03:48:39 -04:00
mazmazz
d2236a32c3 Remove song_length tag search
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
7301140b10 Remove MP3 widechar tag searching
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
d944156744 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Sryder
913d5dd595 OpenGL sprite billboarding
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Nev3r
c0665acad3 Merge branch 'further-mace-advancements' into 'master'
Further Mace Advancements

See merge request STJr/SRB2Internal!147
2019-04-30 15:15:35 -04:00
Monster Iestyn
ed2247c52a Merge branch 'trans-FOF-plane-fullbright-flip' into 'master'
Translucent FOF plane fullbright flip

See merge request STJr/SRB2Internal!218
2019-04-18 15:16:52 -04:00
Monster Iestyn
8bf5c4ec57 Remove old code altogether at Nev3r's request 2019-04-17 16:46:32 +01:00
Monster Iestyn
f5231d614b Undefine toaster's old define to flip full-brightness default status for planes 2019-04-17 14:51:48 +01:00
Steel Titanium
877e149908 Don't enable UPnP support if NONET is defined. 2019-04-16 15:05:09 -04:00
James R
b28221bdb2 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
Monster Iestyn
e501d9c6af Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
Monster Iestyn
dc39209a61 Merge branch 'opengl-new-patch-features-support' into 'master'
OpenGL new patch features support (part 1: flipping)

See merge request STJr/SRB2Internal!211
2019-04-11 15:32:06 -04:00
Monster Iestyn
334bec1777 Merge branch 'master' into opengl-new-patch-features-support 2019-04-11 20:09:57 +01:00
Monster Iestyn
d92b142180 Merge branch 'polyobj-netgame-crash-fix' into 'master'
PolyObj netgame crash fix

See merge request STJr/SRB2Internal!217
2019-04-05 07:29:47 -04:00