Commit graph

11282 commits

Author SHA1 Message Date
Hannu Hanhi
49d03913d7 Add missing optimization to npo2 sloped floor sprites 2022-01-14 20:45:28 +02:00
Hannu Hanhi
d0966f123f Fix software splats not being clipped by ceiling walls 2022-01-14 20:11:49 +02:00
Hannu Hanhi
f72f45d93a Fix software splats breaking and crashing in skyboxes 2022-01-14 19:53:03 +02:00
spherallic
8007aa82ca Merge branch 'next' into tutorial-scenery 2022-01-13 16:03:57 +01:00
katsy
fe3a201df5 fix oldringexplode not scaling or flipping 2022-01-13 02:52:10 -06:00
lachablock
4af820e82c Restore a cast I didn't realize used to be there 2022-01-13 09:56:47 +11:00
lachablock
70a1dd6db0 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-13 09:52:38 +11:00
LJ Sonic
b7dbb7782e Only load map lumps that are WADs or have no extension 2022-01-12 23:06:26 +01:00
sphere
f8532d4ad1 Merge branch 'blentran-update' into 'next'
Blentran - updated

See merge request STJr/SRB2!1656
2022-01-11 21:53:49 +00:00
sphere
53f9d4b2e0 Merge branch 'new-default-controls' into 'next'
Several changes to default control settings

See merge request STJr/SRB2!1682
2022-01-11 21:19:05 +00:00
sphere
0ca74432f9 Merge branch 'ogl-better-gpu-error' into 'next'
Improve OpenGL GDI Generic error message

See merge request STJr/SRB2!1673
2022-01-11 21:16:32 +00:00
sphere
ea3b867c7e Merge branch 'rotationcrash' into 'next'
Fix 2.2.10 pre1 rollangle crash (resolves #747)

Closes #747

See merge request STJr/SRB2!1707
2022-01-11 21:16:14 +00:00
sphere
af925c1742 Merge branch 'taglists-refactor' into 'next'
Speed up taglist creation

See merge request STJr/SRB2!1702
2022-01-11 21:15:06 +00:00
lachablock
8ed18a12a4 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-11 20:04:22 +11:00
katsy
2e4c5d1446 alternate fix to #555 which doesn't crash the game 2022-01-10 19:32:21 -06:00
spherallic
af5173c90f Increase Eggman's hitboxes to actually match the current sprites. 2022-01-10 21:38:30 +01:00
LJ Sonic
a6808de96c Fix message sending code using hardcoded buffer size 2022-01-10 20:12:27 +01:00
LJ Sonic
de9d6ecbe6 Fix long chat messages causing net command failures 2022-01-10 20:05:58 +01:00
LJ Sonic
aee7803621 Add SKIPSTRINGL macro 2022-01-10 20:03:36 +01:00
LJ Sonic
05f1a9edc1 Revert "Fix long chat messages causing net command failures"
This reverts commit 1377824799.
2022-01-10 19:57:15 +01:00
LJ Sonic
7ea81eacc5 Fix say command and its variants using hardcoded buffer size 2022-01-10 19:31:41 +01:00
LJ Sonic
3083290af8 Add READSTRINGL and WRITESTRINGL macros 2022-01-10 18:57:18 +01:00
LJ Sonic
a668546088 Make byte stream manipulation code easier to read 2022-01-10 18:56:42 +01:00
GoldenTails
e0afc2d2b6 Add a player->mo check before attempting to account for ztargetting. 2022-01-09 17:09:57 -06:00
MascaraSnake
95e909400f Fix blendmode regression in OpenGL caused by faulty fog wall support 2022-01-09 13:45:56 +01:00
spherallic
8651123463 Fix errors with the hardcoded Nightopians from Dream Hill. 2022-01-08 19:47:00 +01:00
MascaraSnake
3248556fa9 Speed up taglist creation 2022-01-07 18:42:56 +01:00
MascaraSnake
5149699def Update VS project files 2022-01-07 18:00:56 +01:00
MascaraSnake
549569e75b Fix offset calculation for segs that represent linedef backsides 2022-01-05 10:08:49 +01:00
spherallic
a08c7eac1f wip: staterange actions 2022-01-05 09:55:46 +01:00
Hannu Hanhi
a8fe12ae98 Hack that fixes software drop shadow crashes by bypassing incorrectly set variables 2022-01-04 22:30:50 +02:00
spherallic
c7281d1801 Fix cyan pixel cutting in Software 2022-01-04 14:26:04 +01:00
MascaraSnake
8c17bb57e6 Turn the fog wall linedef type into a blendmode 2022-01-04 14:26:03 +01:00
MascaraSnake
3b08a15860 Expose blendmodes to UDMF 2022-01-04 14:26:03 +01:00
sphere
f455bf347b blentran part 3: Wall & plane blendmodes. 2022-01-04 14:26:03 +01:00
sphere
470b069179 blentran part 2: Sprite & patch blendmodes. 2022-01-04 14:26:03 +01:00
sphere
f9d2fd9ce5 blentran part 1: Flag changes & semibright support. 2022-01-04 14:26:03 +01:00
LJ Sonic
1377824799 Fix long chat messages causing net command failures 2022-01-03 22:37:19 +01:00
LJ Sonic
0241016f6a Do not attempt to disconnect when a packet checksum is invalid 2022-01-03 12:13:55 +01:00
LJ Sonic
159be00109 Support delete key in chatbox 2022-01-03 00:37:11 +01:00
LJ Sonic
af629fefe9 Fix long chat messages crashing the game 2022-01-03 00:08:23 +01:00
LJ Sonic
3c8a29f1ff Add SKIPSTRINGN macro 2022-01-03 00:06:43 +01:00
LJ Sonic
055d57c56c Fix single-letter messages not being sent 2022-01-03 00:06:20 +01:00
LJ Sonic
b933316f23 Cleanup chat event handling 2022-01-02 23:19:34 +01:00
LJ Sonic
e761e36c55 Cleanup and fix chat deleting and pasting 2022-01-02 23:06:34 +01:00
LJ Sonic
2bbbd57c6e Turn HU_queueChatChar into HU_sendChatMessage 2022-01-02 18:35:11 +01:00
LJ Sonic
b8975b6a71 Group related chat stuff together 2022-01-02 17:50:01 +01:00
LJ Sonic
3638d5d556 Cleanup chat code a little 2022-01-02 17:08:10 +01:00
LJ Sonic
f8afdeb35f Cleanup chatbox sanitizing code 2022-01-02 15:48:31 +01:00
LJ Sonic
34ad64ba59 Cleanup chatbox reset code 2022-01-02 15:41:54 +01:00
LJ Sonic
d9bc478822 Cleanup blank chatbox checking code 2022-01-02 15:39:16 +01:00
spherallic
719ceb0586 Add collision check for flipped water drops 2022-01-01 19:34:27 +01:00
spherallic
d9410e3e6a fix compile warnings (this really puts the mess in message) 2021-12-30 16:29:37 +01:00
spherallic
17251895ea Increase default camera height for both playstyles 2021-12-29 19:29:41 +01:00
spherallic
4d1fb04327 Update playstyle names on the input display 2021-12-29 19:29:41 +01:00
spherallic
0a38fef147 Several changes to default control settings:
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
2021-12-29 19:29:36 +01:00
sphere
e8c83f48be Merge branch 'fix-binary-mtag' into 'next'
Make linedef 96 apply to tags from 97-99, but not to itself

See merge request STJr/SRB2!1633
2021-12-29 10:07:35 +00:00
sphere
4e972f7d24 Merge branch 'deathpit_explosions' into 'next'
Fix enemy/boss/minecart explosions in death pits (Closes #67)

Closes #67

See merge request STJr/SRB2!1688
2021-12-29 10:00:25 +00:00
sphere
2e8b7688e8 Merge branch 'resolve-329' into 'next'
Allow changing the master server address while hosting a netgame

Closes #329

See merge request STJr/SRB2!1687
2021-12-29 10:00:08 +00:00
sphere
c12ad1d63c Merge branch 'invert' into 'next'
Give the inverted flashpal a constant

See merge request STJr/SRB2!1685
2021-12-29 10:00:04 +00:00
sphere
68547a503b Merge branch 'botsforexit' into 'next'
Don't count bots in playersforexit

See merge request STJr/SRB2!1684
2021-12-29 09:59:54 +00:00
katsy
effcb948ad Don't count bots in playersforexit 2021-12-29 09:59:54 +00:00
sphere
e152a32c10 Merge branch 'HUD_fixes' into 'next'
Some hud fixes (by Confusion)

See merge request STJr/SRB2!1670
2021-12-29 09:59:40 +00:00
lachablock
392e782893 Don't modify drawangle when taking damage in strafe mode 2021-12-27 23:35:01 +11:00
sphere
31eb2a7e77 Merge branch 'nobotbonus' into 'next'
Don't award end-of-level bonuses to Tailsbot

See merge request STJr/SRB2!1676
2021-12-27 11:49:13 +00:00
spherallic
1040141560 Fix enemy/boss/minecart explosions in death pits 2021-12-27 12:41:04 +01:00
spherallic
b830fee2e3 Allow changing the master server address while hosting a netgame. 2021-12-26 21:30:36 +01:00
spherallic
bb514d227c Don't count music.dta as a main wad when using listwad 2021-12-26 21:12:39 +01:00
sphere
6cb6cc5afb Merge branch 'fixlazytails' into 'next'
Set a default botleader if we don't have one (resolves #717)

Closes #717

See merge request STJr/SRB2!1683
2021-12-26 12:41:49 +00:00
katsy
243a797efe Set a default botleader if we don't have one (resolves #717) 2021-12-26 12:41:49 +00:00
katsy
9b10473e0d add invert flashpal constant 2021-12-24 19:36:26 -06:00
sphere
2615528f45 Merge branch 'pterabyte-mash' into 'next'
CR_PTERABYTE tweaks (Closes #304)

Closes #304

See merge request STJr/SRB2!1380
2021-12-24 13:29:13 +00:00
lachablock
2975b22aed Merge remote-tracking branch 'origin/next' into server-bots 2021-12-22 19:46:33 +11:00
lachablock
1eb1ad2677 Fix compile warning 2021-12-22 19:46:16 +11:00
sphere
4b9d40b911 Merge branch 'we-do-a-little-trolling' into 'next'
Take ramp sectors into account for pushables (closes #595)

Closes #595

See merge request STJr/SRB2!1540
2021-12-20 12:34:26 +00:00
sphere
646844bfdc Merge branch 'fix-drowning-vanishing' into 'next'
Fix player disappearing when drowning in painstate (resolves #597)

Closes #597

See merge request STJr/SRB2!1667
2021-12-20 12:33:20 +00:00
sphere
b092374e1a Merge branch 'lagspikes' into 'next'
Minor spike optimisations

See merge request STJr/SRB2!1669
2021-12-20 12:33:13 +00:00
sphere
1abe3374ef Merge branch 'sandwich' into 'next'
Fix spike sandwich teleportation issue (resolves #693)

Closes #693

See merge request STJr/SRB2!1672
2021-12-20 12:33:00 +00:00
sphere
3e8e6bcbb8 Merge branch 'netsave-pmomz-fix' into 'next'
Include pmomz for mobjs in net savestates and load if it exists (Resolves #713)

Closes #713

See merge request STJr/SRB2!1675
2021-12-20 12:32:55 +00:00
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
lachablock
7ed8178372 Oops typo 2021-12-12 19:18:13 +11:00
lachablock
2794727201 Improve bot handling:
- bot ticcmds are generated and sent by the server only
- fix issue where server would not send all ticcmds to clients if bots were in the game
- fix bots still responding to P1's inputs while P1's controls are locked
- fix bot player's directional controls being rotated when controlled by P2
2021-12-12 18:52:27 +11:00
spherallic
6f5b34f7c1 Don't award end-of-level bonuses to bots. 2021-12-09 12:45:18 +01:00
John FrostFox
c420de6f11 Include pmomz for mobjs in net savestates and load if it exists 2021-12-09 11:42:06 +03:00
Hannu Hanhi
f3c5addab7 Improve OpenGL GDI Generic error message 2021-12-07 22:35:04 +02:00
katsy
97e2fe18c6 fix spike sandwich teleportation issue 2021-12-06 18:00:30 -06:00
LJ Sonic
6504557393 Merge branch 'asin' into 'next'
arcsine Lua wrapper

See merge request STJr/SRB2!1554
2021-12-06 00:01:45 +00:00
LJ Sonic
066a9d1534 Merge branch 'fix-musicchange-hook' into 'next'
Fix MusicChange hook crashing when called

See merge request STJr/SRB2!1671
2021-12-05 17:02:20 +00:00
LJ Sonic
f271f88c7f Fix MusicChange hook crashing when called
BRUH MOMENT BRUH MOMENT
PREPARE THE HALL OF SHAME
2021-12-05 17:59:33 +01:00
spherallic
fdc825721f some hud fixes, by Confusion 2021-12-05 12:47:20 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
55fc7cbd67 Fix "all players" check in T_EachTimeThinker 2021-12-05 07:20:55 +01:00
Radicalicious
86edb1e4ca Fix player disappearing when drowning in painstate 2021-12-03 23:20:07 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next'
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
2021-12-03 18:02:06 +00:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next'
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
2021-12-03 12:18:39 +00:00
SteelT
bb514a0627 Merge branch 'metal-recording-srb2home' into 'next'
Fix metal recordings not being saved in srb2home

See merge request STJr/SRB2!1601
2021-12-03 00:32:06 +00:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next'
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
2021-12-02 23:57:42 +00:00
LJ Sonic
b959d0f4ab Merge branch 'fix-console-keyup' into 'next'
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
2021-12-02 23:57:38 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next'
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
2021-12-02 23:57:26 +00:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next'
Raise addon limit

See merge request STJr/SRB2!1465
2021-12-02 22:50:46 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
599abc2a78 Merge branch 'lua-timestamp' into 'next'
Timestamp function for Lua

See merge request STJr/SRB2!1647
2021-12-02 22:41:08 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00
LJ Sonic
14403737ef Raise the file upload speed drastically 2021-12-02 23:15:55 +01:00
LJ Sonic
425d1f1b53 Make all key identifiers lowercase 2021-12-02 21:03:16 +01:00
LJ Sonic
443c51714a Fix KeyUp hook being called when the console is open 2021-12-02 21:02:54 +01:00
sphere
33c43744b4 Merge branch 'what' into 'next'
Clean up bouncy fof code + fix bugs (closes #291)

Closes #291

See merge request STJr/SRB2!1461
2021-12-02 17:29:43 +00:00
sphere
dad13f2dde Merge branch 'myfixes' into 'next'
Fix visplanes getting allocated twice (backport from srb2kart)

See merge request STJr/SRB2!1636
2021-12-02 11:25:18 +00:00
sphere
3597475a9d Merge branch 'drawtiltedsplat-npo2-typo' into 'next'
Remove that line again

See merge request STJr/SRB2!1645
2021-12-02 11:12:24 +00:00
sphere
a8f754283b Merge branch 'lethallavaland' into 'next'
fix MFE_TOUCHWATER (and MFE_TOUCHLAVA) not applying while standing on sloped water or lava (resolves #365, #201)

Closes #201 and #365

See merge request STJr/SRB2!1654
2021-12-02 10:22:14 +00:00
sphere
ec23753b69 Merge branch '401-fix' into 'next'
Add toggle for linedef action 401 to not change the ceiling texture.

Closes #567

See merge request STJr/SRB2!1663
2021-12-02 10:11:21 +00:00
sphere
cef9a1ad18 Merge branch 'damagetype-fixes' into 'next'
A few damage type fixes

Closes #392

See merge request STJr/SRB2!1660
2021-12-02 10:10:19 +00:00
sphere
b3e2b1671e Merge branch 'menu-edits-2210' into 'next'
Small menu edits

Closes #614 and #87

See merge request STJr/SRB2!1658
2021-12-02 10:10:08 +00:00
spherallic
c1c7607cb0 Add toggle for linedef action 401 to not change the ceiling texture. 2021-12-02 01:52:45 +01:00
sphere
16251734ce Merge branch 'hehballs' into 'next'
Fix Large Spike Balls not dealing spike damage

See merge request STJr/SRB2!1661
2021-12-01 10:06:01 +00:00
SMS Alfredo
aca0ba0f4b wow 2021-11-30 22:46:51 -06:00
SMS Alfredo
a5e1167ad2 balls 2021-11-30 20:51:15 -06:00
spherallic
9bdfafc9dd Add DMG_FIRE to Pyrefly fire and lavafall objects. 2021-11-29 19:25:30 +01:00
spherallic
49e6e7a80f Fix retracting spikes dealing typeless damage instead of spike damage. 2021-11-27 16:19:04 +01:00
spherallic
1afb0c556a Make Brak's electric barrier damage Elemental and Flame Shields. 2021-11-27 14:23:02 +01:00
spherallic
6a6b292c73 Fix Flame Shield interactions in old-style special stages. 2021-11-27 14:22:21 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next'
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
sphere
59660c56c2 Merge branch 'name-unnamed-userdata' into 'next'
Give userdata that needed names some names.

See merge request STJr/SRB2!1639
2021-11-26 14:07:39 +00:00
sphere
b83de902a5 Merge branch 'less-console-text-draw' into 'next'
Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357
2021-11-26 13:57:55 +00:00
sphere
dd2a1c8394 Merge branch 'master' into 'next'
merge master into next again

See merge request STJr/SRB2!1659
2021-11-26 13:57:28 +00:00
sphere
f97261ae85 Merge branch 'let-mixed-declarations' into 'master'
Remove mixed code and declarations warning

See merge request STJr/SRB2!1618
2021-11-26 13:55:43 +00:00
sphere
e0071c1c36 Merge branch '11-array-bounds' into 'master'
Fix GCC 11 array-bounds warning in P_SetupStateAnimation

See merge request STJr/SRB2!1614
2021-11-26 13:55:40 +00:00
spherallic
4480af69c7 Only show Ultimate mode warning in unmodified vanilla gameplay. 2021-11-26 14:18:08 +01:00
sphere
08e63fc822 Show values on (float) sliders in the options menu. 2021-11-26 14:18:00 +01:00
sphere
d9fde5c395 Add emblem counter to the Extras checklist. 2021-11-26 14:17:49 +01:00
sphere
a48c8826a1 Add modifiedgame warning to save select menu. 2021-11-26 14:17:36 +01:00
sphere
00c50aea78 Merge branch 'master' into 'next'
merge master into next

Closes #671

See merge request STJr/SRB2!1657
2021-11-25 09:25:52 +00:00
sphere
b868716672 Merge branch 'tails' into 'next'
Remove misplaced CopyTiccmd from 2phuman (resolves #674)

Closes #674

See merge request STJr/SRB2!1627
2021-11-25 09:19:53 +00:00
sphere
f191525fbb Merge branch 'interfree' into 'next'
Don't cache the default background patches if we have an interscreen (resolves #546)

Closes #546

See merge request STJr/SRB2!1619
2021-11-25 09:19:46 +00:00
sphere
e01c91d58a Merge branch 'fix-nonet-compiling' into 'next'
Fix NONET compiling

See merge request STJr/SRB2!1651
2021-11-25 09:19:30 +00:00
sphere
b955c9c4d5 Merge branch 'boxsparkle_mario' into 'next'
Exclude MT_BOXSPARKLE from Mario blocks

See merge request STJr/SRB2!1556
2021-11-24 13:43:20 +00:00
sphere
8a5cf4aea6 Merge branch 'ringslinger-penalty-split' into 'next'
Fix Ringslinger weapon ring penalty missplitment

Closes #684

See merge request STJr/SRB2!1655
2021-11-24 13:27:07 +00:00
sphere
88e022b6e1 Merge branch '555-2-2-9-rotated-patches-are-cropped-have-incorrect-dimensions' into 'next'
Fix #555

Closes #555

See merge request STJr/SRB2!1648
2021-11-24 12:22:11 +00:00
Hannu Hanhi
8136f5522b Fix uninitialized history pointers in thinkframe_hooks array 2021-11-10 01:55:31 +02:00
sphere
d776b1a23e Merge branch 'revert-2578e01c' into 'next'
Revert "Merge branch 'writable-colormaps' into 'next'" (closes #675)

Closes #675

See merge request STJr/SRB2!1649
2021-11-09 16:06:59 +00:00
Zwip-Zwap Zapony
cade6f3cf6 Fix Ringslinger weapon ring penalty missplitment 2021-11-09 16:59:49 +01:00
Hannu Hanhi
56c5a887c8 Call the Lua timestamp function getTimeMicros 2021-11-08 20:28:35 +02:00
Jaime Ita Passos
1d7061b892 Fix NONET compiling 2021-11-08 01:34:03 -03:00
Jaime Ita Passos
32a68f35c9 Change my name 2021-11-08 01:11:51 -03:00
LZA
34b05efdf1 Revert "Merge branch 'writable-colormaps' into 'next'"
This reverts merge request !959
2021-11-08 03:40:53 +00:00
Jaime Ita Passos
a14c008dee Fix #555 2021-11-08 00:38:24 -03:00
Hannu Hanhi
270c7701b4 Timestamp function for Lua 2021-11-08 01:17:30 +02:00
sphere
9a5bb59801 https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152 2021-11-07 12:51:21 +01:00