Commit graph

10644 commits

Author SHA1 Message Date
James R
28931b90dc Merge branch 'ogl-polyobject-tex-fix' into 'next'
Fix OpenGL polyobject texture distortion

See merge request STJr/SRB2!1086
2020-07-24 04:49:25 -04:00
James R
932bf9b20e Merge branch 'ogl-shader-light-clamp' into 'next'
Clamp light level for shaders. Fixes #194.

Closes #194

See merge request STJr/SRB2!1085
2020-07-24 04:47:57 -04:00
James R
b45bd6990e Merge branch 'ogl-fog-block-fix' into 'next'
Don't discard zero alpha fog block fragments. Fixes #198.

Closes #198

See merge request STJr/SRB2!1084
2020-07-24 04:45:50 -04:00
James R
47581607ef Merge branch 'netticbuffer-port' into 'next'
Port netticbuffer from Kart

See merge request STJr/SRB2!1077
2020-07-24 04:45:08 -04:00
Hannu Hanhi
e331c9d18e Fix OpenGL polyobject texture distortion 2020-07-23 20:51:05 +03:00
Hannu Hanhi
e4d6e92f37 Clamp light level for shaders. Fixes #194. 2020-07-23 19:05:17 +03:00
Hannu Hanhi
80172ee932 Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
James R
c944d3adf4 Merge branch 'fix-nights-fullbright' into 'next'
NiGHTS fullbright fixes

See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
James R
4d16f16dab Merge branch 'fix-superfloat' into 'next'
Fix Super Sonic exploiting CA_FLOAT abilities

See merge request STJr/SRB2!1081
2020-07-22 22:13:51 -04:00
James R
8d60579e6c Merge branch 'demo-quit-crash-fix' into 'next'
Fix crash if you start recording a replay and immediately close the game

See merge request STJr/SRB2!1082
2020-07-22 22:11:03 -04:00
James R
57d7c1ab12 Merge branch 'next-compile-now' into 'next'
AND OR PARENTHESIS

See merge request STJr/SRB2!1083
2020-07-22 22:08:31 -04:00
James R
196beead7d Parenthesis 2020-07-21 16:16:03 -07:00
James R
735942a437 Merge branch 'next-lc-uint16' into 'next'
Allow modification of built-in skincolors

See merge request STJr/SRB2!1078
2020-07-21 17:56:12 -04:00
Steel Titanium
76702d6712 Fix crash if you start recording a replay and immediately close the game 2020-07-20 22:19:44 -04:00
lachwright
242e128aa0 Fix Super Sonic exploiting CA_FLOAT abilities 2020-07-21 03:50:26 +08:00
SwitchKaze
5332fff540 Deny standard color accessibility changes 2020-07-20 12:06:57 -05:00
lachwright
cea3f64c88 Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
a8e16638ee Merge branch 'muspostbossname-fix' into 'next'
Fix muspostbossname sometimes returning garbage.

Closes #197

See merge request STJr/SRB2!1076
2020-07-20 04:47:40 -04:00
SwitchKaze
ee9c146b5d Re-enable built-in color modification 2020-07-19 17:23:08 -05:00
Steel Titanium
e9a03401cb Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
Steel Titanium
05ac0fc7ea Fix muspostbossname sometimes returning garbage. 2020-07-19 13:47:33 -04:00
James R
7c2f81e4ed Merge branch 'next-lc-uint16' into 'next'
Fix skincolor-related memory leak

See merge request STJr/SRB2!1066
2020-07-16 22:01:07 -04:00
James R
fa90ff6bae Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
James R
d6b831053f Merge branch 'fix-lib_freeslot' into 'next'
Fix lib_freeslot

See merge request STJr/SRB2!1064
2020-07-14 18:32:10 -04:00
James R
30d27ded6e Merge branch 'minor-lua-fixes' into 'next'
Minor Lua Fixes (CONS_Printf and mobj_t.valid)

See merge request STJr/SRB2!1065
2020-07-14 18:32:00 -04:00
SwitchKaze
734033250d Fix skincolor-related memory leak 2020-07-14 17:09:31 -05:00
kaysrishaq
7f9175033d minor lua fixes
minor lua fixes
2020-07-14 01:34:57 -04:00
kaysrishaq
29a116ba81 Fix lib_freeslot 2020-07-13 18:56:07 -04:00
James R
34bd0d9fe7 Merge branch 'various-color-fixes' into 'next'
Various color fixes

See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
James R
3253ffbbc8 Merge branch 'cmake-adjustments' into 'master'
CMAKE additions: SDL Mixer X, *.debug adjustments, CPACK adjustments, CCACHE

See merge request STJr/SRB2!992
2020-07-13 12:40:13 -04:00
James R
00ceca8cc6 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
4985d94386 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R
42b0ab1851 Merge branch 'p-xymovement-lua-exposure' into 'next'
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
5bcc821a7d Merge branch 'remove-glide-2' into 'next'
Remove references to the Glide API

See merge request STJr/SRB2!1037
2020-07-12 19:10:34 -04:00
James R
839f086216 A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
Kays Ishaq
e849c9898e move dupenum declaration to beginning of block 2020-07-12 19:05:27 -04:00
James R
b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
ada06910dc Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
4b3d6f04f8 Expose P_PlayerZMovement to Lua.
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
df1fd0c456 Expose P_SceneryZMovement to Lua.
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
4710e4f07c Expose P_RingZMovement to Lua.
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
6d3a2919a2 Expose P_ZMovement to Lua.
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
27c25bfa1e Expose P_SceneryXYMovement to Lua.
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
6ac3d62321 Expose P_RingXYMovement to Lua.
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
fe67781d68 Expose P_XYMovement to Lua.
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
James R
bc2f83ec05 Merge branch 'p-rail-thinker-lua-exposure' into 'next'
Expose P_RailThinker to Lua.

See merge request STJr/SRB2!1059
2020-07-12 18:54:28 -04:00
James R
6c875a8097 Merge branch 'marathoninfo2' into 'next'
Marathon Run fixes (Resolves #184)

Closes #184

See merge request STJr/SRB2!1061
2020-07-12 18:47:38 -04:00
James R
6f8dfb6fca Merge branch 'version-prep-is-a-stinky-butt-head' into 'master'
Automate some of the version numbers nonsense

See merge request STJr/SRB2!1054
2020-07-12 18:45:51 -04:00
James R
f1a5f5952b Merge branch 'fix-required-flat' into 'next'
Comment out unused border patch variables.

See merge request STJr/SRB2!1055
2020-07-12 18:42:42 -04:00
Monster Iestyn
d40022d75f Merge branch 'ogl-sort-crash-fix' into 'next'
Fix crash by handling precip mobjs correctly in ogl sprite sorting

See merge request STJr/SRB2!1062
2020-07-12 15:44:58 -04:00