Jaime Passos
cf7b9ccff4
Update m_misc.c
2019-06-14 14:13:41 -03:00
MascaraSnake
fd39f4ce1e
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-13 21:52:08 +02:00
MascaraSnake
cadcc642c0
Set tracers via P_SetTarget and not directly
2019-06-13 21:51:31 +02:00
MascaraSnake
720d84f87f
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
MascaraSnake
af024f9f53
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-12 21:28:39 +02:00
MascaraSnake
1b491f2496
Forgot to hardcode the mobj.valid checks
2019-06-12 21:28:09 +02:00
MascaraSnake
01adbfc495
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
Steel Titanium
6c1518c1dc
Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks
2019-06-11 20:06:02 -04:00
Steel Titanium
8e5593c207
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
Nev3r
0c3f273745
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
toaster
81a07293e6
Fix Titlemap with mazmazz's fancy menu stuff
...
Handled by changing some defaults.
Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please
2019-06-10 15:43:47 -04:00
MascaraSnake
ff6c8063af
Fixed some angle business in the BASH code
2019-06-10 20:40:12 +02:00
MascaraSnake
67c3d87190
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
Nev3r
b0eef242e0
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
Nev3r
52618bf895
Fix 1 extra column rendering on portal-clipped vissprites.
2019-06-10 17:59:12 +02:00
MascaraSnake
db6b94e7a7
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
Nev3r
c5c4744652
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
MascaraSnake
dc113269e9
Fixed the bug
2019-06-10 16:19:58 +02:00
MascaraSnake
a2c61983e5
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 16:09:15 +02:00
MascaraSnake
4a91af1d59
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 14:10:37 +02:00
MascaraSnake
b8aac236f2
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
Nev3r
b7e2b5612c
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
Monster Iestyn
67392baae0
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Nev3r
d62268ffd0
Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out.
...
I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.
2019-06-09 20:04:07 +02:00
MascaraSnake
91ecf9c380
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
MascaraSnake
6f7b77f650
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
MascaraSnake
4910c213b2
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
MascaraSnake
3653d5b46e
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 10:51:33 +02:00
MascaraSnake
65d804e77d
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
MascaraSnake
65bb8c9494
Changed cacti widths
2019-06-08 14:45:01 +02:00
MascaraSnake
50a9a6c0bb
Fixed dust scaling, changed sound captions
2019-06-08 14:12:39 +02:00
MascaraSnake
80f09c35bb
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
Monster Iestyn
c21b9e632a
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
cd1c87ea71
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
593fcae69a
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
Steel Titanium
8d5207975d
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
9a6330ca4d
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
Monster Iestyn
474b70aa69
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Nev3r
f92b3cbfdd
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
Nev3r
b8d2e017b4
Refactored a bit of code regarding visplane bound trimming for portals; reset ffloor's f_clip/c_clip so that FOFs on portals don't interfere with previously acquired bounds.
2019-06-07 13:10:12 +02:00
Nev3r
da09a07e6e
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
Nev3r
ebe0586993
Add pad checks for visplanes; invalidate invalid columns from visplanes (visplane renderer and column renderers don't speak exactly the same language).
...
The visplane portal top boundary offset has been restored since all known bugs involving it have been fixed.
2019-06-06 11:26:13 +02:00
Nev3r
f0b79697e5
Fix sigsegv when there is no main skybox viewpoint.
2019-06-05 18:45:36 +02:00
Nev3r
819169f378
Vissprite clipping improvements.
...
Vissprites are now only clipped against their respective portal's geometry obtained from their BSP run.
Additionally, if a portal is provided, they're clipped to the portal's clip boundaries.
The work on this branch should conclude after a pair of remaining glitches are fixed.
2019-06-05 18:07:08 +02:00
Nev3r
906b366e1b
Masked elements are now fully grouped individually for each portal/view; fixed viewz-related glitches,.
...
The drawnodes are now fully grouped in separate lists, and then sorted individually. This fixes sorting problems caused by portals belonging to differently perceived scales (skyboxes for example).
Drawsegs and vissprite/drawnode sorting require the viewz, so the viewz is stored for each portal/view, and then restored when needed; without this, the rendering process erroneously sorts the elements, and draws some at wrong positions.
2019-06-05 12:10:59 +02:00
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
Monster Iestyn
eb3d0bdce8
Revert "Merge branch '144-scrolltweaks' into 'master'"
...
This reverts merge request !213
2019-06-04 17:34:59 +00:00
Steel Titanium
29dd330878
Some small tweaks
2019-06-03 17:34:51 -04:00
