Eidolon
1f97ee3f5c
Merge branch 'ogl-splitwall-midtexture-fixes' into 'next'
...
Fix HWR_SplitWall and sloped midtextures (resolves #188 and #195 )
Closes #195 and #188
See merge request STJr/SRB2!1781
2022-11-15 09:55:59 +00:00
Lactozilla
4558cc1c1f
Fix HWR_SplitWall and sloped midtextures
...
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
2022-11-15 09:55:59 +00:00
Eidolon
fb038a8387
Merge branch 'sdl-2.0.20' into 'next'
...
Update Windows SDL files to version 2.0.20
See merge request STJr/SRB2!1775
2022-11-14 02:25:58 +00:00
Lactozilla
0a5494676e
Update Windows SDL files to version 2.0.20
2022-11-14 02:25:58 +00:00
Eidolon
c582d73e4c
Merge branch 'slowball' into 'next'
...
Make CA_SLOWFALL Account for Scale
See merge request STJr/SRB2!1806
2022-11-14 02:23:39 +00:00
Eidolon
e0477a86b9
Merge branch 'multi-linkdraw' into 'next'
...
Improve multiple MF2_LINKDRAW objects in Software
See merge request STJr/SRB2!1843
2022-11-13 23:47:52 +00:00
Eidolon
c5527f9470
Merge branch 'pterabyte-tweaks' into 'next'
...
Fix Pterabyte spawns (+ behavior tweaks)
See merge request STJr/SRB2!1839
2022-11-13 23:40:56 +00:00
Eidolon
eac8a54a55
Merge branch 'uncap-water-ripples' into 'next'
...
Uncapped Water Ripples
See merge request STJr/SRB2!1868
2022-11-13 23:29:10 +00:00
Eidolon
b93ae5a144
Merge branch 'fix-addfolder' into 'next'
...
Fixed folder mods
Closes #889
See merge request STJr/SRB2!1820
2022-11-13 23:21:19 +00:00
Eidolon
90489de517
Merge branch 'slope-fog-fix' into 'next'
...
Fix slope planes not being able to render fog (fixes #664 )
Closes #664
See merge request STJr/SRB2!1637
2022-11-13 20:17:07 +00:00
Zwip-Zwap Zapony
59399e9fcf
Uncap water ripples
2022-11-13 16:15:15 +01:00
Eidolon
6709100997
Merge branch 'emblem-drawing-hud' into 'next'
...
Various changes to emblem drawing (menu changes only)
See merge request STJr/SRB2!1810
2022-11-12 23:37:22 +00:00
Eidolon
9a88c9ea47
Merge branch 'gravityflipping' into 'next'
...
Gravity flip bugfixes & additions
Closes #378 , #661 , and #430
See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Eidolon
d6640391e4
Merge branch 'very-lethal-lava-land' into 'next'
...
Only interpolate shadowcasters if they exist
Closes #899
See merge request STJr/SRB2!1864
2022-11-12 23:23:26 +00:00
Eidolon
3ff6c210db
Merge branch 'fix-removed-mobj-interp-crash' into 'next'
...
Remove mobj interpolator only after thinker
See merge request STJr/SRB2!1863
2022-11-12 23:23:06 +00:00
Eidolon
d4ab1adc89
Merge branch 'mem-fixes' into 'next'
...
Fix use-after-frees around mobjs
Closes #909
See merge request STJr/SRB2!1866
2022-11-12 23:22:09 +00:00
X.organic
b03ef98753
Fix use-after-frees around mobjs
...
# Conflicts:
# src/k_kart.c
# src/p_enemy.c
# src/p_mobj.c
# src/p_saveg.c
# src/p_tick.c
2022-11-12 17:04:25 -06:00
Eidolon
371ae2fe12
Merge branch 'double-sleep-fix' into 'next'
...
Don't sleep w/ fpscap 0 and vsync enabled
See merge request STJr/SRB2!1865
2022-11-12 22:56:17 +00:00
Eidolon
b2fa9e4bd7
Don't sleep w/ fpscap 0 and vsync enabled
2022-11-12 17:18:04 -05:00
Sally Coolatta
fa10530d37
Handle sorting against water FOFs properly
2022-11-12 17:00:45 -05:00
Sally Coolatta
ee9ebe6c54
Improve LINKDRAW with multiple objects
...
Multiple objects with MF2_LINKDRAW will get sorted between each other, instead of purely done with dispoffset.
2022-11-12 17:00:45 -05:00
Eidolon
e32b8a41e5
Only interpolate shadowcasters if they exist
2022-11-12 15:14:04 -06:00
Eidolon
88667400ee
Merge branch 'fix-splat-interp' into 'next'
...
Fix splat interp and sprite angle
See merge request STJr/SRB2!1858
2022-11-12 21:05:44 +00:00
Eidolon
edb813e481
Merge branch 'soundtest-sfx-crash' into 'next'
...
Ensure st_time does not exceed 2.0
Closes #901
See merge request STJr/SRB2!1862
2022-11-12 21:05:25 +00:00
Eidolon
3bdfa3b9f4
Remove mobj interpolator only after thinker
2022-11-12 14:59:31 -06:00
Eidolon
147b3c925e
Ensure st_time does not exceed 2.0
2022-11-12 11:45:10 -06:00
Eidolon
e59684b1a2
Merge branch 'bustablesoundz' into 'next'
...
Start bustable FOF sounds at the correct height
Closes #846
See merge request STJr/SRB2!1818
2022-11-11 23:15:26 -06:00
Eidolon
2aa9a92e7e
Merge branch 'nodoublecrumble' into 'next'
...
Prevent floating crumbling platforms from being triggered twice
Closes #797 and #594
See merge request STJr/SRB2!1817
2022-11-11 23:13:16 -06:00
Eidolon
24ab858684
Merge branch 'fix-negative-lives-crash' into 'next'
...
Fix a crash when scrolling away from a save file with a negative lives count.
See merge request STJr/SRB2!1822
2022-11-11 23:11:44 -06:00
Eidolon
c489b8e2fe
Merge branch 'udmf-splat-cut' into 'next'
...
Cut inner walls of splat FOFs
Closes #891
See merge request STJr/SRB2!1829
2022-11-11 23:03:08 -06:00
Eidolon
f3830b2934
Merge branch 'pandoras-letter' into 'next'
...
Fix hidden 100% completion reward actually being obtained at 50% completion
See merge request STJr/SRB2!1842
2022-11-11 23:00:24 -06:00
Eidolon
2cdf1243d7
Merge branch 'fix-addon-menu-arrow' into 'next'
...
Fix addon menu down arrow weirdness + allow looping from top to bottom and vise versa
Closes #829
See merge request STJr/SRB2!1848
2022-11-11 22:57:55 -06:00
ashifolfi
60ab28c1ab
improved down arrow check + t->b/b->t looping
2022-11-11 22:57:17 -06:00
ashifolfi
4c08daa01f
remove down arrow at bottom of addon list
2022-11-11 22:57:17 -06:00
ashifolfi
e12db019d6
fix addon menu down arrow always being visible
2022-11-11 22:57:17 -06:00
Alam Ed Arias
19bed32e5d
Merge branch 'next' into 'next'
...
Merge master into next
See merge request STJr/SRB2!1861
2022-11-12 03:14:33 +00:00
Alam Ed Arias
f5e1d9722f
Merge branch 'master' into next
2022-11-11 22:03:58 -05:00
Alam Ed Arias
9b4d6a2109
Fix Typo
2022-11-11 21:46:28 -05:00
Alam Ed Arias
e1fd0dfca3
Cleanup whitespace changes from SRB2_release_2.1.23
2022-11-11 21:19:29 -05:00
Alam Ed Arias
4e1976839b
Cleanup whitespace changes from SRB2_release_2.1.25
2022-11-11 21:19:28 -05:00
Alam Ed Arias
ebf70a6f0c
cleanup whitespace in CircleCI build config
2022-11-11 21:19:27 -05:00
Alam Ed Arias
46186d7632
Cleanup whitespace changes from SRB2_release_2.2.2
2022-11-11 21:19:26 -05:00
Alam Ed Arias
0c006dccdf
Cleanup whitespace changes from SRB2_release_2.2.6
2022-11-11 21:19:26 -05:00
Alam Ed Arias
7e0fa2d34c
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-11 21:19:25 -05:00
Alam Ed Arias
6445ef3b70
Update .gitignore
...
Ignore CMake's build folders
2022-11-11 21:19:14 -05:00
Alam Arias
1b5dd687d2
Cleanup whitespace changes from master branch
2022-11-11 20:31:41 -05:00
Alam Arias
ae112a3728
Update hu_stuff.c
...
Fix NONET build
2022-11-11 20:21:30 -05:00
James R
04855a85dc
Use angle between viewz and mobj z to determine splat sprite angle
2022-11-11 17:35:31 -06:00
James R
877d5450d5
Use interpolated mobj x/y/z/angle for splats
...
# Conflicts:
# src/hardware/hw_main.c
# src/r_things.c
2022-11-11 17:35:27 -06:00
Eidolon
7f913b5ace
Merge branch 'registervar-sanity' into 'next'
...
Plug up some holes with lib_cvRegisterVar
Closes #441
See merge request STJr/SRB2!1823
2022-11-10 15:21:29 +00:00
