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
|
c008dc4d1f
|
Merge branch 'master' into 'master'
Fix Typo
See merge request STJr/SRB2!1860
|
2022-11-12 02:49:43 +00:00 |
|
Alam Ed Arias
|
9b4d6a2109
|
Fix Typo
|
2022-11-11 21:46:28 -05:00 |
|
Alam Ed Arias
|
bd2bfe462c
|
Merge branch 'master' into 'master'
Cleanup whitespaces and ignore build folders
See merge request STJr/SRB2!1859
|
2022-11-12 02:35:53 +00: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 |
|
Eidolon
|
e8a6026c56
|
Merge branch 'circleci' into 'master'
CircleCi: update buildbot config
See merge request STJr/SRB2!1836
|
2022-11-10 15:12:45 +00:00 |
|
Alam Ed Arias
|
647f8c81e4
|
CircleCi: update buildbot config
|
2022-11-10 15:12:45 +00:00 |
|
Eidolon
|
0f406b8b8d
|
Merge branch 'udmf-fof-brightness' into 'next'
HWR transparent FoF plane brightness
See merge request STJr/SRB2!1857
|
2022-11-10 15:05:49 +00:00 |
|
Monster Iestyn
|
6a6d92a824
|
Update credits
|
2022-11-10 14:08:11 +00:00 |
|
Eidolon
|
07665ae502
|
hwr: Use UDMF FOF_SPLAT for splat flats and walls
|
2022-11-09 17:40:43 -06:00 |
|
Eidolon
|
0f2fe5983e
|
hwr: Use lightlevel on transparent planes
|
2022-11-09 17:31:49 -06:00 |
|
Eidolon
|
12c2ddb115
|
Merge branch 'uncappedrevengeance' into next
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
|
2022-11-08 21:13:50 -06:00 |
|
Eidolon
|
3597957af1
|
Merge branch 'cmake-zlib-internalized' into 'next'
cmake: build zlib manually in internal build
See merge request STJr/SRB2!1856
|
2022-11-09 02:30:35 +00:00 |
|
Eidolon
|
98371df7fc
|
Merge branch 'cmake-misc-options' into 'next'
cmake: Port misc options from Makefiles
See merge request STJr/SRB2!1855
|
2022-11-09 02:02:51 +00:00 |
|
Eidolon
|
e265adf53f
|
cmake: disallow in-source builds
|
2022-11-08 19:36:40 -06:00 |
|
Eidolon
|
54bfed1bcd
|
cmake: gitignore /build
Too common of a build pattern to ignore
|
2022-11-08 19:30:23 -06:00 |
|
Eidolon
|
c1023b54ee
|
cmake: disable debug symbols for openmpt
|
2022-11-08 19:28:12 -06:00 |
|