Commit graph

14211 commits

Author SHA1 Message Date
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
GoldenTails
3d0e8f194a Allow people to update their Master Server listing on command. 2021-05-23 19:21:23 -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
sphere
d915da6509 Merge branch 'dashaction' into 'next'
Scale minimum dashmode thok speed on actionspd, not normalspeed

See merge request STJr/SRB2!1311
2021-05-10 08:45:26 -04:00
Lach
5cab285b2c Merge branch 'make-ghosts-target-origin' into 'next'
Set the target of a spawned ghost to where it came from.

Closes #517

See merge request STJr/SRB2!1358
2021-05-10 08:40:41 -04:00
Lach
5fb4b34f8c Merge branch 'steamed' into 'next'
Make steam apply sprung flag

See merge request STJr/SRB2!1365
2021-05-10 08:39:06 -04:00
Lach
e1843841bc Merge branch 'lunch' into 'next'
Don't apply pw_justlaunched if the player didn't actually launch off a slope

See merge request STJr/SRB2!1447
2021-05-10 08:37:55 -04:00
Lach
58a070ca03 Merge branch 'no-fire-shield-palflash' into 'next'
No fire shield palflash (resolves #512)

Closes #512

See merge request STJr/SRB2!1473
2021-05-10 08:37:20 -04:00
Lach
ecd59feafb Merge branch 'rosycolormap-raspberry' into 'next'
Change Raspberry's chat colormap to V_ROSYMAP

See merge request STJr/SRB2!1441
2021-05-10 08:36:26 -04:00
sphere
c25ecfc35f Merge branch 'more-slope-copying' into 'next'
Add more actions for slope copying

See merge request STJr/SRB2!1406
2021-05-10 07:43:03 -04:00
sphere
44f3edb218 Merge branch 'binary-multitagging' into 'next'
Add linedef specials for multitagging in binary maps

See merge request STJr/SRB2!1485
2021-05-10 07:42:55 -04:00
RJPFonseca
69647eb78d Used spaces instead of tabs in Makefile.cfg 2021-05-09 19:10:53 +01:00
LJ Sonic
d0adee76b2 Merge branch 'the-year-is-2021' into 'master'
The year is 2021

See merge request STJr/SRB2!1500
2021-05-09 09:28:31 -04:00
James R
35244fa736 Clang: fix -Wimplicit-const-int-float-conversion
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
2021-05-08 16:49:23 -07:00
James R
210c9419e4 Ignore -Wtrigraphs 2021-05-08 16:49:18 -07:00
Sally Coolatta
ec8e884a31 Removed this function 2021-05-08 12:56:33 -04:00
Sally Coolatta
5d93f86499 Merge branch 'next' into skin-unlocks-sanity 2021-05-08 12:55:46 -04:00
lachablock
d2db204058 Fix rollout rock controls in 2D mode 2021-05-08 18:34:32 +10:00
lachablock
755cf6e952 Merge remote-tracking branch 'origin/next' into rollout-stuff 2021-05-08 13:03:18 +10:00
lachablock
3880263f1f Add machine dashmode as a condition for gap passage.
(Also remove the sprite2 check, we don't need to be that stingy since PlayerHeight hooks allow greater control over that now!)
2021-05-08 12:27:29 +10:00
lachablock
47f465ccea Merge remote-tracking branch 'origin/next' into dashmode-lowroad 2021-05-08 12:16:46 +10:00
James R
87afa7655a CMake: fix ASM compile
- target_sources from correct directory
- enable_language must be used in add_executable directory
2021-05-07 18:59:51 -07:00
Sally Coolatta
d136c60a3f Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not.
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-07 20:13:16 -04:00