Commit graph

12381 commits

Author SHA1 Message Date
sphere
ae9e0e7f08 Merge branch 'text-loops' into 'next'
Custom title card bruh moments

See merge request STJr/SRB2!1501
2021-05-31 08:25:43 -04:00
Nev3r
a48af30465 Merge branch 'easings' into 'next'
Easing functions

See merge request STJr/SRB2!1467
2021-05-31 02:34:02 -04:00
flarn2006
0b51b391f1 Make 96's flags consistent with 97-99 by default 2021-05-30 12:16:15 -04:00
sphere
fb4b3b8130 Merge branch 'ogl-fof-wall-slope-fix2' into 'next'
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg

Closes #192

See merge request STJr/SRB2!1361
2021-05-30 11:32:30 -04:00
Monster Iestyn
d10cf4faf5 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear!
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
2021-05-29 22:54:58 +01:00
flarn2006
f8fe763df2 Fix linedef type 99 2021-05-29 12:28:06 -04:00
flarn2006
2d4411d077 Remove empty 'else' block (also leftover) 2021-05-29 12:23:35 -04:00
flarn2006
5090de5809 Remove leftover debug printfs 2021-05-29 12:09:30 -04:00
flarn2006
93de054786 Fix linedef type 96 (I had it all wrong) 2021-05-29 11:08:57 -04:00
Nev3r
b978bc4507 Merge branch 'sw-tilted-npo2-span-opt' into 'next'
NPO2 slope span optimization

See merge request STJr/SRB2!1216
2021-05-29 09:30:58 -04:00
flarn2006
eee894581a Make linedef 96 skip the control sector 2021-05-29 00:54:31 -04:00
flarn2006
7d71d534d4 Add missing "/ FRACUNIT" to texture offset code 2021-05-29 00:40:06 -04:00
flarn2006
8d8f62baef Add additional multitagging functionality 2021-05-28 23:59:39 -04:00
SteelT
ad2b4b1809 Merge branch 'save-skin-names' into 'next'
Save skin names in save files instead of skin numbers

See merge request STJr/SRB2!1503
2021-05-28 22:05:20 -04:00
SteelT
c0f8cb29aa Merge branch 'select-heading-no-gaps' into 'next'
[SUGOI] Level select no longer assumes that games will always be linear

See merge request STJr/SRB2!1492
2021-05-28 21:51:52 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next'
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
2021-05-28 21:51:00 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next'
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
Riku Salminen
22aaffa35d non-misleading comment 2021-05-28 22:32:11 +03:00
Riku Salminen
21dab7bd66 Add previous demo version to acceptable demo versions for demo comparison 2021-05-28 22:30:43 +03:00
Monster Iestyn
45b1223f3e My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit 2021-05-28 18:56:32 +01:00
Monster Iestyn
ada6ec07db Fix Lua versions of P_ZMovement and its clones as well as P_MovePlayer so tmthing changes don't linger afterwards 2021-05-28 18:47:09 +01:00
Monster Iestyn
07801a2a18 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook 2021-05-28 18:42:19 +01:00
flarn2006
fd82357d4f Expose M_MapNumber to Lua 2021-05-27 18:35:15 -04:00
sphere
75938e2dfa Merge branch 'software-slope-plane-uv-fix-attempt' into 'next'
Fix slope plane rotation and alignment (resolves #508)

Closes #508

See merge request STJr/SRB2!1464
2021-05-27 16:56:16 -04:00
katsy
6286fc8b05 add sliding flag to spinheight conditions 2021-05-26 02:37:46 -04:00
katsy
a1235e144d allow sliders passage through spin gaps 2021-05-26 01:09:56 -05:00
katsy
b2ae7c79e7 make a few messages more helpful 2021-05-24 00:00:01 -05:00
Jaime Ita Passos
75397c347d Remove FRACUNIT/2 2021-05-22 21:09:06 -03:00
Jaime Ita Passos
a1553c4623 Update r_opengl.c 2021-05-22 20:08:11 -03:00
Jaime Ita Passos
75ebdda31b Merge remote-tracking branch 'origin' into gl-texfmt-p8-ap88-a8-ai8-fix 2021-05-22 19:44:57 -03:00
lachablock
750bdd9d60 Respect mobj->color while enemies & bosses flash, but in OpenGL 2021-05-22 23:25:36 +10:00
lachablock
99ad188263 Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state 2021-05-22 18:17:48 +10:00
lachablock
4e5c3566c9 Respect mobj->color while enemies & bosses flash 2021-05-22 16:52:01 +10:00
lachablock
7c11bc8ac5 Remove camera dependency from P_GetPlayerControlDirection 2021-05-21 20:28:50 +10:00
Steel Titanium
d9395b0a73 Merge branch 'master' into next 2021-05-19 23:09:14 -04:00
Steel Titanium
5e1e587ebb Merge branch 'rjpfonseca-bugfix-1' 2021-05-19 23:06:18 -04:00
Steel Titanium
7862a557c8 Merge branch 'bugfix-1' of https://github.com/rjpfonseca/SRB2 into rjpfonseca-bugfix-1 2021-05-19 22:57:38 -04:00
SteelT
695722269b Merge branch 'warnings' into 'master'
Fix some compiler warnings

See merge request STJr/SRB2!1504
2021-05-19 22:54:48 -04:00
sphere
60bbf1d8bc Merge branch 'fix-pit_checkthing-crash' into 'next'
Check against null tmpusher source before attempting to push a thing.

See merge request STJr/SRB2!1413
2021-05-19 08:12:30 -04:00
sphere
dc5572ba21 Merge branch 'trns-chunk-fix' into 'next'
tRNS chunk fix

See merge request STJr/SRB2!1393
2021-05-19 06:07:38 -04:00
sphere
bcd3a6b82b Merge branch 'optimize-getpatchpixel' into 'next'
Optimize Picture_GetPatchPixel

See merge request STJr/SRB2!1342
2021-05-19 06:07:23 -04:00
sphere
186ef0479d Merge branch 'death-of-musicslots2' into 'next'
Remove music slot compatibility

See merge request STJr/SRB2!1321
2021-05-19 05:27:31 -04:00
Jaime Ita Passos
5b86b8991c Use floating point trigonometry 2021-05-16 21:43:52 -03:00
Jaime Ita Passos
7500d12eeb Merge remote-tracking branch 'origin' into software-slope-plane-uv-fix-attempt 2021-05-16 20:56:53 -03:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Steel Titanium
f55a5b3b0b Add badge to readme showing latest stable release 2021-05-11 20:02:12 -04:00
James R
c13e1a74dd Reject banned players with refusereason 2021-05-10 18:10:53 -07:00
James R
8486a9386d serverinfo: enumerate refusereason 2021-05-10 18:10:16 -07:00
James R
22bfc2db78 Refactor HandleConnect refusals
Also removed some version fields from serverconfig_pak and
clientconfig_pak. Client version will be checked with
SRB2APPLICATION and MODVERSION.

Not updating PACKETVERSION because those packets shouldn't
have been packetversion'd in the first place.
2021-05-10 17:50:01 -07:00
James R
0edbca5e02 Actually report server version mismatches
Incompatible servers get dropped from the server list. It
turns out the server list is also used when connecting
directly to a server. This meant that if you tried
connecting to a server that was incompatible, you'd just
get an infinite connection screen, as if the server was
completely unreachable.

Now it won't drop the server if you are directly
connecting to it. I also copied some incompatibility
messages from HandleConnect.
2021-05-10 16:51:18 -07:00