MascaraSnake
b6a5ff98f0
Merge branch 'udmf-sector-fields' into udmf-full
2022-01-07 12:46:47 +01:00
MascaraSnake
8b5f6cca37
Add command line parameter for saving the current map in TEXTMAP format
2022-01-07 12:45:40 +01:00
MascaraSnake
1de5b77710
Fix typo
2022-01-07 10:25:32 +01:00
MascaraSnake
659410dde1
Use Slope Skew flag instead of Upper Unpegged for FOF skewing
2022-01-05 23:47:05 +01:00
MascaraSnake
e406a52446
Remove weird special behavior for two-sided upper textures in software
2022-01-05 22:33:14 +01:00
MascaraSnake
fcb69b9c2f
Rename more linedef flags
2022-01-05 19:43:40 +01:00
MascaraSnake
2bef8da42f
Remove access to unused effect6 flag in UDMF
2022-01-05 18:42:53 +01:00
MascaraSnake
5f97047b96
Rename linedef flags
2022-01-05 18:40:02 +01:00
MascaraSnake
55559a5f98
Split P_ConvertBinaryMap into multiple functions
2022-01-05 18:15:04 +01:00
MascaraSnake
06b7d7ceb8
Make only ML_EFFECT3 affect midtexture pegging in UDMF
2022-01-05 18:05:47 +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
MascaraSnake
d25bc75a92
Remove redundant UDMF check in P_LoadSidedefs
2022-01-05 09:22:13 +01:00
MascaraSnake
a8e32cfe12
Fix incorrect turnaround behavior for bounceFloor and bounceCeiling
2022-01-05 00:26:10 +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
MascaraSnake
577ae68d6d
Make sector friction a floating-point field
2022-01-04 21:25:34 +01:00
MascaraSnake
88fae019a2
Fix typos in binary-to-UDMF conversion
2022-01-04 19:59:51 +01:00
MascaraSnake
9d67420e5c
Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag
2022-01-04 19:57:14 +01:00
MascaraSnake
7609f300ba
Fix typo in laser FOF conversion
2022-01-04 19:45:36 +01:00
MascaraSnake
ca1d844278
Merge branch 'blentran-update' into udmf-full
2022-01-04 19:36:20 +01:00
MascaraSnake
afde568856
Add blendmode support to FOFs
2022-01-04 19:33:17 +01: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
MascaraSnake
913731b4bc
Merge branch 'blentran-update' into udmf-full
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
# src/p_spec.c
2022-01-02 23:19:47 +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
spherallic
1a21ca14f0
Fix cyan pixel cutting in Software
2022-01-02 20:44:24 +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
MascaraSnake
8e4cbf8b76
Disable ML_EFFECT5 on linedef executor triggers for UDMF maps (what a pointless feature)
2021-12-31 15:33:47 +01:00
MascaraSnake
2886a277d8
Turn the fog wall linedef type into a blendmode
2021-12-31 15:00:27 +01:00
MascaraSnake
e4d7b3df6c
Minor cleanup in P_SpawnSpecials
2021-12-31 14:17:17 +01:00
MascaraSnake
0d2d7a2803
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
...
# Conflicts:
# src/p_spec.c
2021-12-31 14:14:23 +01:00
MascaraSnake
5873ecfa02
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-31 14:12:13 +01:00
MascaraSnake
98157daa1c
Merge branch 'udmf-executor-triggers' into udmf-thing-types
2021-12-31 14:11:50 +01:00
MascaraSnake
63978b76df
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-12-31 14:11:18 +01:00
MascaraSnake
b35da98a3c
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-12-31 14:10:50 +01:00
MascaraSnake
ee728126df
Fix oversight with linedef type 604
2021-12-31 14:09:38 +01:00
MascaraSnake
9b780f417e
Fix a conversion oversight with linedef type 8
2021-12-31 14:06:06 +01:00
MascaraSnake
eef7763d68
Set SSF_WINDCURRENT and SSF_CONVEYOR automatically if there's a pusher/conveyor
2021-12-31 13:58:41 +01:00
MascaraSnake
2b4d32b372
Turn solid lava into a damagetype
2021-12-31 12:15:01 +01:00
MascaraSnake
e011962156
Make the sector special field inaccessible in UDMF
2021-12-31 11:44:05 +01:00
MascaraSnake
208395214a
Implement sector fields for linedef executor triggering
2021-12-31 11:39:34 +01:00
MascaraSnake
b3be8d1f44
Implement sector damagetype field
2021-12-31 08:53:00 +01:00
MascaraSnake
417809f78e
Fix typo in P_MobjTouchingSectorSpecial
2021-12-31 00:05:47 +01:00
MascaraSnake
feaa4f1273
Replace most sector specials with sector special flags
2021-12-31 00:03:24 +01:00
MascaraSnake
e1393954c7
Make deprecated sector types inaccessible in UDMF
2021-12-30 21:27:09 +01:00
MascaraSnake
570a6ab395
Turn "intangible to camera" sector special into a sector flag
2021-12-30 20:37:57 +01:00
MascaraSnake
7b830fbddf
Add "change sector's gravity" linedef executor in UDMF to replace linedef type 1
2021-12-30 19:28:01 +01:00
MascaraSnake
b3863c57be
Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF
2021-12-30 18:50:02 +01:00
MascaraSnake
86e2fefcac
Add sector gravity field for UDMF
2021-12-30 18:19:42 +01:00
spherallic
d9410e3e6a
fix compile warnings (this really puts the mess in message)
2021-12-30 16:29:37 +01:00
MascaraSnake
e3d41e0bda
Adapt linedef type 540 to UDMF
2021-12-30 15:32:28 +01:00
MascaraSnake
f30b97ba93
Adapt heat wave effect to UDMF
2021-12-30 14:48:40 +01:00
MascaraSnake
b74d06b4e7
Netsync sector flags
2021-12-30 14:33:24 +01:00
MascaraSnake
2a1f96aa3c
Adapt linedef type 8 to UDMF
2021-12-30 14:26:51 +01:00
MascaraSnake
2fd6eafbcf
Expose sector flags to Lua and UDMF
2021-12-30 14:16:00 +01:00
MascaraSnake
34229030f2
Make implementation of slope copying with linedef type 700 not hacky
2021-12-30 08:10:20 +01:00
MascaraSnake
696d4945a7
Adapt linedef type 14 to UDMF
2021-12-30 07:54:16 +01:00
MascaraSnake
73ba288e5d
P_ProcessLinedefsAfterSidedefs: Skip text copying in UDMF
2021-12-29 23:45:43 +01:00
MascaraSnake
9af28321a5
Fix unadapted flag for linedef type 426
2021-12-29 23:12:46 +01:00
MascaraSnake
69797377c4
Adapt some parameter linedef types to UDMF
2021-12-29 23:03:37 +01:00
MascaraSnake
0b3180cdfa
Adapt linedef type 64 to UDMF
2021-12-29 21:03:47 +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
MascaraSnake
29ee8484eb
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-29 15:53:46 +01:00
MascaraSnake
338f1357a6
Particle generator: Use args[6] instead of angle for tagging
2021-12-29 15:53:20 +01:00
MascaraSnake
228efa5ffc
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 15:29:59 +01:00
MascaraSnake
1e1ea22e51
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 13:53:38 +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
MascaraSnake
49c1645b5f
Adapt linedef type 63 to UDMF
2021-12-29 11:03:00 +01: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
MascaraSnake
63548fe235
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-29 10:59:43 +01: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
MascaraSnake
3bac97ee65
Clean up P_SpawnSpecials a bit
2021-12-29 10:59:26 +01:00
MascaraSnake
234e8f5f8f
Disable camera scanner effect in UDMF
2021-12-29 10:55:39 +01:00
MascaraSnake
c76d0e3326
Implement linedef executor for changing linedef args
2021-12-29 10:42:20 +01:00
MascaraSnake
e7869039db
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-29 09:40:47 +01:00
MascaraSnake
95248dc80f
Merge branch 'next' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
2021-12-29 09:35:25 +01:00
MascaraSnake
1aa9ba1447
Delete removed mobj types from deh_tables.c
2021-12-29 08:31:47 +01:00
MascaraSnake
cbf32c6615
Adapt some miscellaneous linedef types to UDMF
2021-12-29 08:12:28 +01:00
MascaraSnake
e76d332678
Disable the old hacky way of doing egg capsules in UDMF maps
2021-12-28 23:51:08 +01:00
MascaraSnake
2a868ca60d
Adapt Glaregoyles to UDMF
2021-12-28 23:06:48 +01:00
MascaraSnake
a091b7d16d
Adapt bosses to UDMF and remove now-unused mapthing flags
2021-12-28 22:52:24 +01:00
MascaraSnake
e71a952d70
Adapt monitors to UDMF
2021-12-28 17:54:26 +01:00
MascaraSnake
79c3197de2
Adapt various thing types for UDMF
2021-12-28 16:38:52 +01:00
MascaraSnake
53931727bd
Adapt pushables to UDMF
2021-12-28 14:28:36 +01:00
MascaraSnake
42f823600c
Adapt NiGHTS items to UDMF
2021-12-28 14:04:30 +01:00
MascaraSnake
b4a206c063
Adapt remaining enemies to UDMF
2021-12-28 13:14:48 +01:00
MascaraSnake
5d1284bc81
Fix unitialized array in P_ConvertBinaryMap
2021-12-28 11:42:53 +01:00
MascaraSnake
1cff7a161a
Adapt ambient sound effects to UDMF
2021-12-28 09:58:45 +01:00
MascaraSnake
5248271619
Adapt blast linedef executor to UDMF
2021-12-28 08:33:57 +01:00
MascaraSnake
e140bd8252
Adapt balloon colors to UDMF
2021-12-28 08:26:04 +01:00
MascaraSnake
8b69c62111
Adapt more scenery items to UDMF
2021-12-28 08:19:56 +01:00
MascaraSnake
b1d0870511
(Mostly) adapt fan to UDMF
2021-12-28 07:47:10 +01:00
MascaraSnake
90eb7c71a3
Adapt skybox view point to UDMF
2021-12-28 07:29:41 +01:00
MascaraSnake
43a15387d2
Adapt diagonal springs to UDMF
2021-12-27 21:28:42 +01:00
MascaraSnake
fd3fa9a924
Adapt flame-related objects to UDMF
2021-12-27 18:52:46 +01:00
MascaraSnake
720df51b6e
Adapt most flame jet settings to UDMF
2021-12-27 17:58:18 +01:00
MascaraSnake
3bab07d036
Adapt flickies to UDMF
2021-12-27 17:36:51 +01:00
MascaraSnake
8db84ffef9
Adapt boss waypoint to UDMF
2021-12-27 15:39:14 +01:00
MascaraSnake
06bbee50bf
Adapt boss IDs and trigger tags to UDMF
2021-12-27 15:07:37 +01: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
MascaraSnake
a14eacd63a
Bowser isn't a boss, so don't call A_BossDeath just to do that one thing it needs to do
2021-12-27 08:55:59 +01:00
MascaraSnake
c550de5dfa
Adapt spikes to UDMF
2021-12-27 07:32:57 +01:00
MascaraSnake
36217c6468
Finish adapting slope vertices to UDMF
2021-12-26 21:33:20 +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
MascaraSnake
8535b595d6
Adapt some more player spawning stuff to UDMF
2021-12-26 21:11:24 +01:00
MascaraSnake
ea6fe56df6
Refactor A_BossDeath
2021-12-26 20:31:02 +01:00
MascaraSnake
3661fd5079
Adapt boss fly point to UDMF
2021-12-26 20:09:38 +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
MascaraSnake
baa99150d0
Adapt Fang waypoint to UDMF
2021-12-25 09:58:00 +01: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
MascaraSnake
fe8c1d1331
Adapt Pyre Fly to UDMF
2021-12-21 22:00:42 +01:00
MascaraSnake
5eb2448a40
Adapt Pterabytes to UDMF
2021-12-21 21:57:35 +01:00
MascaraSnake
a5ac10733a
Adapt Hive Elemental to UDMF
2021-12-21 21:51:37 +01:00
MascaraSnake
52c319167f
(Mostly) adapt the Ideya Drone to UDMF
2021-12-21 21:41:00 +01:00
MascaraSnake
5918ecc2fe
Refactor star post check
2021-12-21 18:32:24 +01:00
MascaraSnake
693fa7ba81
Adapt star posts to UDMF
2021-12-21 18:27:19 +01:00
MascaraSnake
af30847a1f
Adapt zoom tube waypoint to UDMF
2021-12-21 18:24:58 +01:00
MascaraSnake
81bf0dceb2
Turn makesoftwarecorona into a function
2021-12-21 18:12:38 +01:00
MascaraSnake
4b58b45b5f
Adapt emblem tags to UDMF
2021-12-21 17:58:37 +01:00
MascaraSnake
cbebdc219d
Adapt pop-up turret to UDMF
2021-12-21 17:45:43 +01:00
MascaraSnake
7eee8b10a9
Add A_LinedefExecuteFromArg to deh_tables.c
2021-12-21 17:31:29 +01:00
MascaraSnake
bfcbf5136b
Adapt SDURF and Puma to UDMF
2021-12-21 17:28:29 +01:00
MascaraSnake
3205b6d83a
Adapt player starts to UDMF
2021-12-21 08:01:51 +01:00
MascaraSnake
72e2c24fdb
Adapt some reserved tags to UDMF
2021-12-20 23:28:18 +01:00
MascaraSnake
db1f215327
Implement generic item rows and circles
2021-12-20 21:14:39 +01: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
MascaraSnake
59c6d59c00
Adapt NiGHTS things to UDMF
2021-12-19 21:30:49 +01:00
MascaraSnake
482c24a1fb
Adapt NiGHTS track items to UDMF
2021-12-18 10:45:50 +01:00
MascaraSnake
1a1e5faf08
Adapt fan particle generator to UDMF
2021-12-18 10:31:42 +01:00
MascaraSnake
ebf692f143
Adapt push/pull point to UDMF
2021-12-16 07:00:30 +01:00
MascaraSnake
2a2d70e7cf
Refactor some onconveyor stuff
2021-12-14 20:29:14 +01:00
MascaraSnake
fa92ed2a8b
Add a wrapper function for writing a constant into a string arg
2021-12-14 19:08:59 +01:00
MascaraSnake
ed9a562ec4
Adapt maces to UDMF
2021-12-14 18:50:47 +01:00
MascaraSnake
c1e22c4bb6
Add two more linedef/thing args because the maces need them
2021-12-14 06:43:06 +01:00
spherallic
e7a7a3b213
Prevent Pyrefly fire from warping up nearby ledges.
2021-12-13 15:20:43 +01:00
MascaraSnake
1b023732d0
Adapt rock spawner to UDMF
2021-12-13 08:24:52 +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
MascaraSnake
f714966c83
Remove outdated linedef type check in HWR_ProcessSeg
2021-12-12 08:27:27 +01:00
MascaraSnake
ac3dd146c7
Expose blendmodes to UDMF
2021-12-12 07:02:17 +01:00
GoldenTails
9282a18d82
oops forgot to remove the old hardcoded defines
2021-12-11 20:11:46 -06:00
GoldenTails
20987eba92
Use lookup tables, macros, and for loops to shorten up the wad search code.
...
The old inline mess needed to go badly.
2021-12-11 20:00:00 -06:00
MascaraSnake
2c0fb5e80f
Delete accidentally added .orig file
2021-12-09 22:12:48 +01:00
MascaraSnake
21f8baea4a
Make trigger conditions for "all players" triggers consistent
2021-12-09 21:36:46 +01:00
MascaraSnake
a35a3b3edc
Sector specials: Give up on trying to find polyobjects in touched sectors
2021-12-09 21:32:34 +01:00
MascaraSnake
cc38cd0071
Remove outdated console warning that never happens anyway
2021-12-09 21:00:22 +01:00
MascaraSnake
dc4dd75810
Add NiGHTS mare trigger linedef type and deprecate the NiGHTS mare sector type
2021-12-09 20:57:44 +01:00
MascaraSnake
18e8ebf394
Add emerald check trigger linedef types and deprecate the emerald check sector type
2021-12-09 20:37:39 +01:00
MascaraSnake
22420f92d2
Some trigger lineder cleanup
2021-12-09 20:02:03 +01:00
MascaraSnake
c43d5c7183
Adapt linedef types 334-336 to UDMF
2021-12-09 19:53:14 +01:00
MascaraSnake
adaf599e87
Adapt linedef types 331-333 to UDMF
2021-12-09 19:33:02 +01:00
MascaraSnake
a7f5bcfea7
Adapt linedef type 305-307 to UDMF
2021-12-09 19:17:16 +01:00
MascaraSnake
670e32908e
Adapt linedef type 308 to UDMF
2021-12-09 18:56:50 +01:00
MascaraSnake
126cbdd189
Adapt linedef types 321-322 to UDMF
2021-12-09 18:15:27 +01:00
MascaraSnake
2638e1212c
Fix a typo
2021-12-09 16:10:39 +01: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
MascaraSnake
875ba7915c
Adapt linedef types 309-312 to UDMF
2021-12-09 08:49:50 +01:00
MascaraSnake
9d87e97275
Adapt linedef types 317-320 to UDMF
2021-12-09 08:08:04 +01:00
MascaraSnake
f86dff8cf2
Adapt linedef types 314-315 to UDMF
2021-12-09 07:56:15 +01:00
MascaraSnake
92e724faca
Adapt linedef types 303-304 to UDMF
2021-12-09 07:47:01 +01:00
MascaraSnake
f60873c19b
Adapt linedef types 300-302 to UDMF
2021-12-09 07:30:55 +01:00
MascaraSnake
44434a64d1
Refactor P_RunTriggerLinedef
2021-12-09 07:10:16 +01:00
MascaraSnake
060bc5fde0
Replace P_ThingOnSpecial3DFloor with the more versatile P_MobjTouchingSectorSpecial
2021-12-08 21:07:26 +01:00
MascaraSnake
1a2b0d24ab
Make all players triggers work if players are in different sectors with the same tag
2021-12-08 20:29:10 +01:00
MascaraSnake
c8cb096647
"Floor touch" sector specials are no longer contaminated by "anywhere in sector" specials
2021-12-07 21:39:45 +01:00
Hannu Hanhi
f3c5addab7
Improve OpenGL GDI Generic error message
2021-12-07 22:35:04 +02:00
MascaraSnake
3cd56e456d
Rewrite pushable/mobj linedef executor trigger code
2021-12-07 19:20:26 +01:00
MascaraSnake
c9ed484129
Rewrite each time thinker
2021-12-07 07:17:58 +01:00
MascaraSnake
222d05a424
Refactor sector special plane touching code
2021-12-07 07:15:52 +01:00
katsy
97e2fe18c6
fix spike sandwich teleportation issue
2021-12-06 18:00:30 -06:00
MascaraSnake
9ebc259ab3
Split P_ProcessSpecialSector into multiple functions
2021-12-06 18:50:06 +01: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
f359151457
Merge branch 'trigger-bruh' into udmf-executor-triggers
2021-12-05 08:36:11 +01:00
MascaraSnake
55fc7cbd67
Fix "all players" check in T_EachTimeThinker
2021-12-05 07:20:55 +01:00
sphere
7601afb6c1
blentran part 3: Wall & plane blendmodes.
2021-12-05 00:48:21 +01:00
sphere
a3be09bb3f
blentran part 2: Sprite & patch blendmodes.
2021-12-05 00:48:21 +01:00
sphere
3802f601a9
blentran part 1: Flag changes & semibright support.
2021-12-05 00:48:21 +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
MascaraSnake
87a6528f00
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-12-03 19:26:46 +01:00
MascaraSnake
f5cda9f64c
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-12-03 19:23:24 +01:00
MascaraSnake
aee4996eba
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-12-03 19:22:37 +01:00
MascaraSnake
99515bce24
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-12-03 19:21:44 +01:00
MascaraSnake
76962a3a3f
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-12-03 19:20:39 +01:00
MascaraSnake
c4775ed37b
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# extras/conf/SRB2-22.cfg
# src/p_ceilng.c
2021-12-03 19:10:29 +01: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
MascaraSnake
adce427299
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/p_user.c
2021-12-03 18:58:02 +01:00
MascaraSnake
6dc49042de
Port katsy's bouncy FOF cleanup
2021-12-03 18:48:16 +01: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
MascaraSnake
d44ef91f6f
Re-add FF_BUSTUP to INT_CONST
2021-11-28 19:34:42 +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
Jaime Ita Passos
0ecfc38c46
Remove misplaced line from R_DrawTiltedSplat_NPO2_8
2021-11-06 01:49:29 -03:00
katsy
da33cb674e
fix water fof height calculation on slopes
2021-11-05 16:51:44 -05:00
SteelT
c55e973364
MSYS2: Don't compile with dynamic base
...
Resolves #671
2021-11-03 17:16:46 -04:00
sphere
06dfd360ee
Merge branch 'drawntooverlay' into 'next'
...
Make Overlay objects account for player->drawangle
See merge request STJr/SRB2!1599
2021-10-29 10:40:25 +00:00
SMS Alfredo
865c0a081d
Make Overlay objects account for player->drawangle
2021-10-29 10:40:25 +00:00
Hannu Hanhi
77ecfb9cdc
Perfstats averaging and refactor
2021-10-29 02:18:02 +03:00
sphere
2d8230cb27
Merge branch 'sunnywithcloudsandshowers' into 'next'
...
Fix broken rain to rain weather switching
See merge request STJr/SRB2!1626
2021-10-27 17:52:29 +00:00
katsy
e10eddd11d
Fix broken rain to rain weather switching
2021-10-27 17:52:29 +00:00
sphere
edaa955bcc
Merge branch 'dave-credits' into 'next'
...
Fix #672
Closes #672
See merge request STJr/SRB2!1623
2021-10-27 17:51:29 +00:00
GoldenTails
8110473643
Give userdata that needed names some names.
2021-10-22 18:31:37 -05:00
Jaime Ita Passos
5db4bff19c
Fix slope planes not being able to render fog
2021-10-12 14:10:48 -03:00
FlykeSpice
a8c6a65260
Fix visplanes getting allocated twice
...
I guess that is legacy remnant stuff
2021-10-11 00:20:11 -04:00
Hannu Hanhi
91aeba6c66
Request 24-bit depth buffer from SDL
...
Should fix problems caused by 16-bit depth buffer usage
2021-10-08 22:47:22 +03:00
Vincent Robinson
f70491b2b5
Make linedef 96 apply to tags from 97-99, but not to itself
2021-10-04 14:23:56 -07:00
MascaraSnake
5f7babb53f
Adapt linedef type 313 to UDMF
2021-09-26 20:42:01 +02:00
MascaraSnake
c9f510d096
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-09-26 07:12:32 +02:00
MascaraSnake
75ef804f64
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-09-26 07:01:56 +02:00
MascaraSnake
53f8a1bfb2
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-26 07:01:23 +02:00
MascaraSnake
98f99e52f8
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-26 06:56:12 +02:00
MascaraSnake
db0e6b23d7
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-26 06:53:20 +02:00
MascaraSnake
bfc13c2529
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
2021-09-26 06:50:34 +02:00
MascaraSnake
f26f41e03a
Fix thinker functions that still use tag instead of args[0] for FOFs
2021-09-26 06:48:26 +02:00
SteelT
0f4074f22d
Remove unused I_GetMouseGrab function
2021-09-23 13:46:26 -04:00
MascaraSnake
3cc66ba9cb
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-09-23 11:44:17 +02:00
MascaraSnake
25bc48b8dd
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-09-23 11:31:01 +02:00
MascaraSnake
f22e0a41da
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-23 11:22:23 +02:00
MascaraSnake
05b93b676e
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-23 11:02:23 +02:00
MascaraSnake
7f6933317d
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-23 10:41:23 +02:00
MascaraSnake
5df1dd324d
Fix oversight in T_MoveFloor
2021-09-23 10:24:02 +02:00
MascaraSnake
280d23782c
Adapt linedef executor triggers that don't involve sector effects to UDMF
2021-09-23 10:21:53 +02:00
katsy
ed5942a0b6
fix tailsbot controls
2021-09-22 23:18:54 -05:00
katsy
791b981fd8
null gamestate during pre-intermission to prevent unwanted interaction
2021-09-22 16:22:47 -05:00
MascaraSnake
a61343bc8b
P_LinedefExecute: Use global taglists to find trigger linedefs
2021-09-22 10:38:08 +02:00
MascaraSnake
03c1c592ab
I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF)
2021-09-22 08:57:48 +02:00
MascaraSnake
8ef8279764
Adapt FOF-related linedef executors to UDMF
2021-09-22 07:32:39 +02:00
MascaraSnake
df7b22ac8a
Minor cleanup in P_ConvertBinaryMap
2021-09-21 15:34:47 +02:00
MascaraSnake
61e9adf30b
Adapt linedef type 412 to UDMF
2021-09-21 15:31:53 +02:00
MascaraSnake
132f3f21f1
Adapt linedef type 457 to UDMF
2021-09-21 15:10:50 +02:00
MascaraSnake
d8b5cb6c90
Adapt linedef type 422 to UDMF
2021-09-21 14:59:58 +02:00
MascaraSnake
be480eead0
Linedef type 464: Re-add mobjtype check that I accidentally removed
2021-09-21 12:59:20 +02:00
MascaraSnake
8b6140ddb2
Linedef type 464: Use taglist search to find egg capsule center
2021-09-21 12:55:56 +02:00
MascaraSnake
41d18bc591
Binary-to-UDMF conversion: Set up mapthing tags before global taglists are built
2021-09-21 12:55:22 +02:00
MascaraSnake
2e120953ec
Fix typo in linedef type 400 conversion
2021-09-21 11:35:04 +02:00
MascaraSnake
d47069fbb6
Adapt linedef types 409 and 410 to UDMF
2021-09-21 11:30:34 +02:00
James R
d88eb7cc14
Missed the 'i'
2021-09-21 02:17:44 -07:00
James R
143a515445
Correct Big Wave Dave/InstantSonic credits
2021-09-21 02:15:11 -07:00
MascaraSnake
cabafeef1c
Adapt linedef type 464 to UDMF
2021-09-21 10:35:01 +02:00
MascaraSnake
890934264b
Adapt linedef type 414 to UDMF
2021-09-21 10:14:55 +02:00
MascaraSnake
69e0c636a0
Adapt linedef type 459 to UDMF
2021-09-21 09:05:40 +02:00
MascaraSnake
ea1d442f31
Adapt linedef type 434 to UDMF
2021-09-21 08:34:55 +02:00
MascaraSnake
17bd20a15e
Adapt linedef type 463 to UDMF
2021-09-21 07:44:55 +02:00
MascaraSnake
b898a773ab
Adapt linedef types 425 and 442 to UDMF
2021-09-21 07:36:54 +02:00
MascaraSnake
76c6b6f24f
Forgot to adapt half of linedef type 449
2021-09-20 15:07:08 +02:00
MascaraSnake
1bbf1b2887
Adapt linedef type 438 to UDMF
2021-09-20 14:50:18 +02:00
MascaraSnake
3a73c6167c
Adapt linedef type 439 to UDMF
2021-09-20 14:42:21 +02:00
MascaraSnake
877ec96eec
Adapt a whole bunch of linedef executors to UDMF
2021-09-20 14:25:07 +02:00
MascaraSnake
00b04f6d9e
Adapt some player-related linedef executors to UDMF
2021-09-20 13:31:32 +02:00
MascaraSnake
4028d392b0
Adapt linedef types 423 and 424 to UDMF
2021-09-20 12:42:31 +02:00
MascaraSnake
d2eb4587c2
Adapt linedef type 415 to UDMF
2021-09-20 12:32:01 +02:00
MascaraSnake
1b339a9e00
Adapt linedef types 600-601 to UDMF
2021-09-20 08:36:55 +02:00
MascaraSnake
609fb91e4b
Stop elevator abuse
2021-09-20 08:18:59 +02:00
MascaraSnake
1784c7b0ef
Add linedef executor for modifying (as opposed to copying) a sector's light level
2021-09-20 07:54:10 +02:00
MascaraSnake
6871262909
Allow "fade light level" linedef executor to fade relative to current value
2021-09-19 23:12:30 +02:00
MascaraSnake
318c1b477d
Adapt lighting effects to UDMF
2021-09-19 17:07:08 +02:00
MascaraSnake
44faed6285
Make light levels in thinkers INT16
2021-09-19 16:25:27 +02:00
MascaraSnake
9180b86e9e
No more unnecessary light level twiddling
2021-09-19 16:12:06 +02:00
MascaraSnake
18c2cfcace
Clean up arguments for the lighting effect functions
2021-09-19 15:52:54 +02:00
MascaraSnake
fe708db398
Adapt setup of some lighting linedef executors to UDMF
2021-09-19 14:23:04 +02:00
MascaraSnake
68aa14f7d0
Netsync floor/ceiling lighting
2021-09-19 09:20:00 +02:00
MascaraSnake
e43831bedb
Expose floor/ceiling lighting to Lua
2021-09-19 09:06:39 +02:00
MascaraSnake
e15c160773
Implement per-sector floor/ceiling lighting
2021-09-19 08:58:21 +02:00
MascaraSnake
de82afe338
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-17 10:36:35 +02:00
MascaraSnake
e144f97d35
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-17 10:35:41 +02:00
MascaraSnake
a5959c0248
Merge branch 'next' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2021-09-17 10:34:07 +02:00
MascaraSnake
9d3dc98939
Fix "render insides" condition being inverted for intangible FOFs
2021-09-17 09:57:53 +02:00
katsy
3d2f9e6150
don't create the default patches if we have an interscreen
2021-09-13 17:20:20 -05:00
James R
0ac36b7ce1
Remove mixed code and declarations warning
2021-09-12 19:07:40 -07:00
James R
923e6f31aa
Fix faulty comparison
...
Logical comparisons evaluate to a boolean value...
2021-09-12 19:03:39 -07:00
James R
fec5f2778e
Fix compiler warnings
2021-09-12 19:03:39 -07:00
James R
c33d8b3b5d
Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor
2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d
Revert "Merge branch 'draw-act-num' into 'next'"
...
This reverts merge request !1532
2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df
Merge branch 'draw-act-num' into 'next'
...
Expose act number drawing functions to Lua
See merge request STJr/SRB2!1532
2021-09-12 22:15:43 +00:00
Tatsuru
252a48c2dc
Merge branch 'shorter-hidetime' into 'next'
...
Cut cv_hidetime's minimum value to 1 (resolves #586 )
Closes #586
See merge request STJr/SRB2!1544
2021-09-12 22:13:26 +00:00
Tatsuru
1875c0dc79
Merge branch 'where-the-fuck-is-my-mobj-at' into 'next'
...
Add player mobj check to P_PlayerInPain (resolves #640 )
Closes #640
See merge request STJr/SRB2!1587
2021-09-12 22:06:54 +00:00
Tatsuru
bb0a0bd4ab
Merge branch 'oneline' into 'next'
...
Add a missing scale assignment to A_Boss3ShockThink
See merge request STJr/SRB2!1588
2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78
Add a missing scale assignment to A_Boss3ShockThink
2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90
Merge branch 'shocksplit' into 'next'
...
Split up x/y/z averages in A_Boss3ShockThink (resolves #589 )
Closes #589
See merge request STJr/SRB2!1538
2021-09-12 21:49:28 +00:00
Tatsuru
cd5ba1271a
Merge branch 'youvebeenblocked' into 'next'
...
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332 )
Closes #332
See merge request STJr/SRB2!1491
2021-09-12 21:38:40 +00:00
Tatsuru
66f054f150
Merge branch 'mapload-trigger-fix' into 'next'
...
Don't call map load trigger linedefs when joining or reloading gamestate
See merge request STJr/SRB2!1592
2021-09-12 21:08:52 +00:00
Tatsuru
df249a4a4d
Merge branch 'folder-fixes' into 'next'
...
Fix minor issues with folder addons
See merge request STJr/SRB2!1617
2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e
Fix minor issues with folder addons
2021-09-12 21:08:06 +00:00
Tatsuru
96a378ef1e
Merge branch 'replay-overwrite-fix' into 'next'
...
Replay overwrite fix
See merge request STJr/SRB2!1523
2021-09-12 20:33:15 +00:00
Tatsuru
94799e2196
Merge branch 'fix-antique-ghost-netvars' into 'next'
...
Fix antique ghost netvars
See merge request STJr/SRB2!1545
2021-09-12 20:33:01 +00:00
Tatsuru
59e1706f5c
Merge branch 'png-trans-fix' into 'next'
...
Fix issue with png_get_tRNS
See merge request STJr/SRB2!1606
2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6
Merge branch 'develop-fix' into 'next'
...
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
Closes #663
See merge request STJr/SRB2!1607
2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c
Merge branch 'playercontroldirection' into 'next'
...
Remove camera dependency from P_GetPlayerControlDirection
Closes #183
See merge request STJr/SRB2!1512
2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5
Merge branch 'fix-archiving-error-msg' into 'next'
...
Fix incorrect error message during Lua archiving
See merge request STJr/SRB2!1593
2021-09-12 20:27:17 +00:00
Tatsuru
bcd7468d25
Merge branch 'lua-camera' into 'next'
...
Allow Lua write access to camera_t variables & expose the cameras globally
See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next
2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016
Merge branch 'even-more-slope-copying' into 'next'
...
Add flag to line slopes for even more slope copying
See merge request STJr/SRB2!1550
2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9
Merge branch 'master' into next
2021-09-12 15:46:32 -04:00
SteelT
a822de5ffc
Merge branch 'fix-gme-disabled' into 'master'
...
Fix gme support being effectively disabled
See merge request STJr/SRB2!1586
2021-09-11 15:05:34 +00:00
Tatsuru
8aee7fcbce
Merge branch 'floorsprite-fix' into 'next'
...
Fix #649
Closes #649
See merge request STJr/SRB2!1604
2021-09-11 15:00:14 +00:00
Tatsuru
6ed063dcce
Merge branch 'polish-lua-inputs' into 'next'
...
Polish the Lua input library
See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
Tatsuru
033c661431
Merge branch 'folder' into 'next'
...
Implement folder loading
See merge request STJr/SRB2!1568
2021-09-10 17:10:26 +00:00
Tatsuru
2eed4a9265
Merge branch 'sunbehindcloud' into 'next'
...
Refactor weather switching (fixes #541 )
Closes #541
See merge request STJr/SRB2!1498
2021-09-10 17:00:44 +00:00
katsy
50fe45efe6
Refactor weather switching ( fixes #541 )
2021-09-10 17:00:43 +00:00
Tatsuru
eec765749b
Merge branch 'drawcroppedpatch-improvements' into 'next'
...
V_DrawCroppedPatch(...) Lua exposure and improvements
See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
Tatsuru
ce98758bd6
Merge branch 'equationslopes' into 'next'
...
Add generalized slopes in UDMF
See merge request STJr/SRB2!1530
2021-09-09 22:12:18 +00:00
SteelT
2578e01cfb
Merge branch 'writable-colormaps' into 'next'
...
Make the colormap returned by v.getColormap() writable.
See merge request STJr/SRB2!959
2021-09-05 21:07:10 +00:00
James R
1af05afb0e
Merge branch 'better-gcc-check' into 'master'
...
Makefile: Improve gcc detection
See merge request STJr/SRB2!1608
2021-09-04 00:43:16 +00:00
James R
cbc5cc3b2a
Fix GCC 11 array-bounds warning in P_SetupStateAnimation
...
Removing inline here silences the warning somehow, it
could be a GCC bug?
2021-09-03 17:18:00 -07:00
James R
c1458aa6c7
Merge branch 'master' into next
2021-09-03 17:15:53 -07:00
James R
8e0831a183
Fix unused variable warning under NOPNG
2021-09-03 17:15:36 -07:00
GoldenTails
1639676e8d
Actually free the drawnstr pointer after we're done using it.
...
It probably was like this originally because past Golden was confused about why free was throwing errors :P
2021-09-03 09:14:04 -05:00
GoldenTails
f0bee67d6e
Remove unused static-alloc drawnstr
, rename drawnstrptr
to drawnstr
.
2021-09-03 09:03:46 -05:00
GoldenTails
7e3a6bd44c
Increase Connect via IP textbox width and have shorten and truncate the text as necessary
2021-09-03 09:03:46 -05:00
namishere
39bd9c6da8
Make next compile again
2021-08-30 23:18:25 -07:00
James R
f4f7af6f6d
Add my full name
2021-08-30 18:40:36 -07:00
GoldenTails
1a8ec7975c
Makefile: Improve gcc detection
...
Wasn't working for me until I fixed it.
Turns out gcc really doesn't like giving its name out.
Most of the time it reads argv[0].
2021-08-28 15:39:34 -05:00
Shane Ellis
b73c24a0c5
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
2021-08-28 17:14:36 +00:00
Jaime Ita Passos
3ff8d9d3b1
Fix issue with png_get_tRNS
...
This fixes an oversight where the return value of png_get_tRNS was
being ignored.
2021-08-26 13:37:52 -03:00
Jaime Ita Passos
450955cba2
Fix floor sprite projection
2021-08-26 13:22:32 -03:00
Shane Ellis
ccc71ddafc
Merge branch 'addplayer' into 'next'
...
Multiplayer Bot Features (aka AddPlayer)
See merge request STJr/SRB2!1383
2021-08-25 21:38:37 +00:00
GoldenTails
72bf2a9897
Add angle field to linedef_t
2021-08-24 03:13:18 -05:00
SteelT
4a6acc2c8d
Fix metal recordings not being saved in srb2home
2021-08-22 16:13:40 -04:00
LJ Sonic
9b7263855e
Prevent input.setMouseGrab from interfering with window focus
2021-08-18 20:58:13 +02:00
sphere
4309b592f8
Merge branch 'shiny' into 'next'
...
Give Coins drop shadows
See merge request STJr/SRB2!1591
2021-08-17 13:09:53 +00:00
LJ Sonic
5340db5f67
Make gc_ constants uppercase
2021-08-15 16:15:28 +02:00
LJ Sonic
772695741c
Rename KeyNumToString to KeyNumToName and vice-versa
2021-08-15 15:24:23 +02:00
James R
3b6d8eca83
Merge branch 'master' into next
2021-08-14 15:34:52 -07:00
James R
824b1ab28c
Makefile: use full stem in dependency generation
...
Previously took only the filename, so the directory
component was stripped. This broke dependencies for
basically every file.
2021-08-14 15:29:21 -07:00
LJ Sonic
5bc0ce7a62
Give fields in event_t better names
2021-08-14 23:42:39 +02:00
LJ Sonic
c2907b89f7
Pass a keyevent_t userdatum to key hooks
2021-08-14 20:34:59 +02:00
LJ Sonic
5b949a6751
Expose keyevent_t to Lua
2021-08-14 20:33:42 +02:00
LJ Sonic
38e82e55fc
Add a "repeated" field to event_t
2021-08-14 20:33:20 +02:00
LJ Sonic
8adf4b672a
Put Lua input library in its own namespace
2021-08-13 22:34:36 +02:00
LJ Sonic
6403a38c72
Fix again
2021-08-10 01:48:26 +02:00
LJ Sonic
a9b35a6f7a
Fix incorrect error message during Lua archiving
2021-08-10 00:15:44 +02:00
LJ Sonic
d1e8b05749
Don't call map load trigger linedefs when joining or reloading gamestate
2021-08-08 19:43:42 +02:00
SMS Alfredo
2d218859ff
Give coins a drop shadow
2021-08-06 23:25:19 -05:00
sphere
1d92456ad5
Merge branch 'gl-texfmt-p8-ap88-a8-ai8-fix' into 'next'
...
Fix #492
Closes #492
See merge request STJr/SRB2!1431
2021-08-02 13:10:32 +00:00
sphere
ab044a270b
Merge branch 'nolua-alias' into 'next'
...
Fix console aliases bypassing CV_NOLUA
Closes #619
See merge request STJr/SRB2!1573
2021-08-02 13:09:12 +00:00
sphere
198127dd6f
Merge branch 'demos-revert-netvars' into 'next'
...
Revert netvars to user value after demo finishes playback
See merge request STJr/SRB2!1578
2021-08-02 13:08:43 +00:00
Lach
6cf4f79bab
Merge branch 'zmovement-remove-fix' into 'next'
...
Fix for #551
See merge request STJr/SRB2!1590
2021-08-02 02:01:45 +00:00
Monster Iestyn
df99cde40f
mo not mobj!
2021-07-31 22:11:44 +01:00
Monster Iestyn
7dddc631d7
P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely)
2021-07-31 21:14:48 +01:00
Radicalicious
d50e3bff70
ACTUALLY fix the issue.
2021-07-29 15:55:19 +00:00
Radicalicious
58db5a6904
Fix P_PlayerInPain crash.
2021-07-28 15:42:44 +00:00
lachablock
434b119ccf
Merge remote-tracking branch 'origin/next' into playercontroldirection
2021-07-28 11:55:12 +10:00
Nev3r
6d76d05d62
Merge branch 'working-server-incompatibility-checks' into 'next'
...
Actually tell you if the server is running an incompatible version
See merge request STJr/SRB2!1509
2021-07-16 16:55:41 -04:00
SteelT
71f905f95b
Fix gme support being effectively disabled
...
I found this easier than trying to adjust the makefile, as it uses the same thing to automatically generate the various NO* compile options.
2021-07-16 15:26:09 -04:00
CobaltBW
bac4116130
Merge branch 'addplayer' of https://git.do.srb2.org/STJr/SRB2.git into addplayer-2021-7-15
2021-07-15 15:36:44 -07:00
CobaltBW
95359fef51
Amendment to G_RemovePlayer to preserve lua error handlers
2021-07-15 15:19:47 -07:00
CobaltBW
22f42efb61
Cleaned up leftover comments
2021-07-15 15:09:02 -07:00
CobaltBW
48514ee88d
Fixed G_RemovePlayer crash in players.iterate
...
This was done by storing flag-for-removal status as a boolean inside the player struct.
Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 15:04:24 -07:00
CobaltBW
4486ff065a
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 13:03:26 -07:00
CobaltBW
1c3a898bbb
Fixed locked characters being visible in multiplayer select screen
2021-07-15 12:53:13 -07:00
Nev3r
3a49b9519d
Remove &, since args and stringargs are arrays
2021-07-13 17:55:06 +02:00
Nev3r
22dfa05c31
Forgot the stringargs.
2021-07-13 17:44:28 +02:00
Nev3r
aed86781fc
Bugfix - Fix sporadically occurring incorrect userdata types in Lua, caused by previously loaded userdata which didn't get invalidated in previous sessions.
...
Invalidate userdata for line and mapthing args.
Invalidate userdata for slopes and their normal, origin and direction vectors.
2021-07-13 17:41:38 +02:00
Shane Ellis
33ae95bf13
G_RemovePlayer error handling
2021-07-12 23:38:52 -04:00
sphere
113cedd4b6
Merge branch 'polyobject-plane-stability' into 'next'
...
Use floating-point math for polyobject planes as well.
Closes #581
See merge request STJr/SRB2!1533
2021-07-12 12:47:35 -04:00
James R
58fa44e8dc
CMP0115
2021-07-12 03:50:44 -07:00
SteelT
0faecf0959
version.h: Update comment about contacting an MS admin
2021-07-11 20:51:06 -04:00
Monster Iestyn
c337709d10
Update f_finale.c
2021-07-11 16:32:36 -04:00
lachablock
117e3e2670
Expose P_TryCameraMove and P_TeleportCameraMove, disallow write access to camera.x and camera.y, allow write access to camera.height and camera.radius
2021-07-11 16:23:50 +10:00
lachablock
366b1f65a1
Allow Lua write access to camera_t variables & expose the cameras globally
2021-07-10 18:22:07 +10:00
James R
e30d4f954b
Revert netvars after demo finishes playback
...
(Demos do not call CL_Reset BTW.)
2021-07-08 14:37:03 -07:00
SMS Alfredo
cb619fad5d
Rebase on !1307
2021-07-07 19:57:28 -05:00
James R
b4fa98d2fb
Refactor hudlib hooks to hooklib
...
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.
HUD hooks may also be added using addHook.
addHook('HUD', fn[, type])
hud.add still exists, but the intention is to remove it
eventually.
2021-07-07 00:23:51 -07:00
James R
ae57b6ca86
MORE MACROS
...
I just can't stop myself!
2021-07-07 00:21:08 -07:00
James R
331329306c
Refactor hook ref allocation
2021-07-06 20:27:00 -07:00
James R
a75d4a1c36
Automatically count hook values
2021-07-06 18:42:08 -07:00
lachablock
2e7141b54a
Use tracer's color for uncolored objects flagged with MF2_LINKDRAW
2021-07-06 18:56:45 +10:00
lachablock
7ea73bf817
Add a color field to vissprites and use that instead of referencing its mobj
2021-07-06 18:36:05 +10:00
James R
14c5d2c916
Warn if Lua attempted access NOLUA consvar
...
And quote variable name.
2021-07-05 18:39:12 -07:00
James R
18cbc1e370
Fix aliases bypass COM_SAFE
2021-07-05 18:31:04 -07:00
MascaraSnake
7e88db938d
Adapt polyobject translucency fade linedef to UDMF
2021-07-04 19:28:14 +02:00
MascaraSnake
6d007f388a
Adapt set translucency linedef to UDMF
2021-07-04 15:37:42 +02:00
MascaraSnake
d2ad12c034
Adapt polyobject displacement linedefs to UDMF
2021-07-04 14:41:37 +02:00
MascaraSnake
429c6588af
Adapt polyobject waving flag linedef to UDMF
2021-07-04 14:10:11 +02:00
MascaraSnake
5c2ce62f00
Adapt polyobject visibility/tangibility linedefs to UDMF
2021-07-04 13:45:41 +02:00
MascaraSnake
2cbda0e5ac
Adapt polyobject waypoint movement linedef to UDMF
2021-07-04 13:20:10 +02:00
MascaraSnake
6e9afabd44
Adapt polyobject move and rotate linedef types to UDMF
2021-07-04 12:54:48 +02:00
LJ Sonic
0482eacb7c
Load add-ons in the order in which the -file and -folder arguments are specified
2021-07-03 19:58:59 +02:00
James R
e24fe29114
Merge remote-tracking branch 'origin/master' into next
2021-07-02 15:55:36 -07:00
MascaraSnake
3b1d64703d
Adapt polyobject door move linedef types to UDMF
2021-07-02 17:18:55 +02:00
MascaraSnake
805bafd936
Adapt "change plane scroller direction" linedef type to UDMF
2021-07-02 12:51:39 +02:00
MascaraSnake
64b67bcfe0
Wind/current linedef: Apply to front sector if tag = 0
2021-07-01 23:15:13 +02:00
MascaraSnake
9718674d3b
Check for sector type in T_PointPusher
2021-07-01 20:59:46 +02:00
MascaraSnake
dcba011cf3
Adapt wind/current linedefs to UDMF
2021-07-01 20:35:13 +02:00
MascaraSnake
6f698b3065
Refactor wind/current thinker
2021-07-01 20:05:23 +02:00
MascaraSnake
d0888c4ac5
Split wind/current and point push/pull thinkers
2021-07-01 18:48:18 +02:00
MascaraSnake
052bfe130c
Make exclusive scrolling the default
2021-07-01 00:47:56 +02:00
MascaraSnake
977887f456
Adapt scroller linedefs to UDMF
2021-06-30 23:50:54 +02:00
Shane Ellis
afa8466b30
comment cleanup
2021-06-30 01:38:04 -04:00
Shane Ellis
94441d6eee
comment cleanup
2021-06-30 01:36:28 -04:00
Shane Ellis
ee765d1043
comment cleanup
2021-06-30 01:34:21 -04:00
Shane Ellis
dad361721f
comment cleanup
2021-06-30 01:32:24 -04:00
James R
22ab611daa
Makefile: do not automatically set WINDOWSHELL
...
According to this answer--
https://stackoverflow.com/a/45952425
--Make will always prefer a unix shell, even on Windows,
if one can be found in Path. So we can't check PATH to
determine if it's a Windows shell... this is just too much
bother.
2021-06-29 16:23:27 -07:00
James R
abdf5c101c
Makefile: report SHELL
2021-06-29 16:22:46 -07:00
James R
17e31f21ff
Merge branch 'master' into next
2021-06-29 14:42:53 -07:00
James R
6c03f9b5b3
fuck
2021-06-29 14:42:40 -07:00
CobaltBW
4f04097066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer
2021-06-29 14:32:46 -07:00
CobaltBW
c3fa9bea0f
ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc
2021-06-29 14:07:49 -07:00
James R
215edeb395
Merge branch 'master' into next
2021-06-29 13:58:48 -07:00
James R
c1ecfa306f
Makefile: 'dep' not 'deps'
2021-06-29 13:58:38 -07:00
James R
7d01bd38d8
Fix return value of Lua key hooks not being used
2021-06-29 01:49:53 -07:00
James R
90763d42e1
Shuffle LUA_HookKey
2021-06-29 01:49:45 -07:00
MascaraSnake
06e06a1cb6
Replicate old hack in binary maps: Translucent FOFs set to full opacity cut cyan pixels
2021-06-27 18:45:56 +02:00
MascaraSnake
b0a762a45e
Add missing null checks after P_AddFakeFloor calls
2021-06-27 17:49:00 +02:00
MascaraSnake
09bcc918c5
Fix alpha for rising and intangible FOFs
2021-06-27 17:14:34 +02:00
MascaraSnake
6f38e2fc8e
Merge branch 'next' into udmf-fofs-mkii
2021-06-27 16:47:28 +02:00
MascaraSnake
ac5eb1518d
Add floor/ceiling/both enum
2021-06-27 12:36:46 +02:00
MascaraSnake
2da5b54e73
Now that set flats linedef exists, simplify set heights linedef
2021-06-27 12:21:26 +02:00
MascaraSnake
099cea0a19
Implement "set flats" linedef type
2021-06-27 11:56:06 +02:00
MascaraSnake
4b0e311740
Fix typo
2021-06-27 09:54:48 +02:00
MascaraSnake
92982be76b
Adapt the remaining plane movement linedef types to UDMF
2021-06-27 09:53:57 +02:00
flarn2006
a5cd764772
move MT_BOXSPARKLE in the list
2021-06-26 15:42:41 -04:00
flarn2006
22272732f0
Exclude MT_BOXSPARKLE from Mario blocks
2021-06-26 14:59:56 -04:00
MascaraSnake
588c56b224
Floor/ceiling movers: Stop abusing the texture variable to store the sourceline
2021-06-26 16:25:14 +02:00
MascaraSnake
202c56054e
Remove unused ceiling_t variables
2021-06-26 16:15:38 +02:00
MascaraSnake
299b2dcff2
Fix a small oversight
2021-06-26 15:29:42 +02:00
MascaraSnake
446e78b6e2
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 15:28:28 +02:00
MascaraSnake
63eafff5fe
Linedef type 403: Don't run the linedef executor twice
2021-06-26 14:53:14 +02:00
MascaraSnake
9fdd9060e4
Adapt crusher linedefs to UDMF
2021-06-26 12:53:14 +02:00
MascaraSnake
c8bb18b389
Adapt linedef type 53-58 to UDMF
2021-06-26 10:23:12 +02:00
MascaraSnake
5b1a42af4c
Refactor T_MoveFloor
2021-06-26 10:00:40 +02:00
MascaraSnake
de462f1213
Refactor T_MoveCeiling
2021-06-26 09:43:46 +02:00
MascaraSnake
d5490132b9
Remove crusher types from T_MoveCeiling (they're handled by T_CrushCeiling)
2021-06-26 09:30:17 +02:00
MascaraSnake
8f39e23105
Adapt linedef type 405 and 407 to UDMF
2021-06-26 08:43:35 +02:00
MascaraSnake
53976e4b52
Adapt linedef types 403-404 to UDMF
2021-06-26 08:31:59 +02:00
MascaraSnake
0eabbf0170
Instant ceiling movement: Only change texture if it's not -1
2021-06-25 22:06:04 +02:00
MascaraSnake
df965b1578
Fix thwomps going too fast by a factor of 8
2021-06-25 18:41:14 +02:00
MascaraSnake
6abcba6876
Adapt linedef types 400-401 to UDMF + some EV_ cleanup
2021-06-25 18:34:56 +02:00
MascaraSnake
825b4b384a
Remove unused elevateCurrent elevator type
2021-06-25 11:40:19 +02:00
MascaraSnake
770612bc9d
Adapt moving platform linedef specials to UDMF
2021-06-25 11:33:16 +02:00
MascaraSnake
259700be3c
Get rid of customspeed in EV_DoElevator and read speed from args[1]
2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95
-Pass tag as argument to EV_ functions
...
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
2021-06-25 10:12:16 +02:00
LJ Sonic
4af3b860fd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next
2021-06-25 00:30:30 +02:00
James R
753522fbb6
Merge remote-tracking branch 'origin/master' into next
2021-06-24 14:14:17 -07:00
MascaraSnake
5df079c653
Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated
2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e
Merge branch 'next' into udmf-fofs-mkii
2021-06-23 19:48:26 +02:00
James R
ed85e994a4
Remove misplaced parentheses
2021-06-22 15:49:59 -07:00
James R
c3ad5de912
Makefile: let variables be defined on Make line
...
If a variable is defined as in 'make CC=gcc-10', then that
definition overrides anything other definition in the
Makefile.
2021-06-22 15:47:48 -07:00
James R
5f4d7e3c5b
Makefile: fail if old build directories exist
...
After a checkout from before revision, old directories
such as bin/Linux64 only remain if untracked files exist
within. This may be confusing to the user. They may even
use an outdated executable if it is one of those untracked
files.
2021-06-22 15:14:42 -07:00
LJ Sonic
c319f46462
Merge branch 'hooklib-refactor' into 'next'
...
Hooklib refactor
See merge request STJr/SRB2!1307
2021-06-22 09:52:12 -04:00
GoldenTails
389cea2bc1
You probably don't want to memorise the formula to convert arccos to arcsin so
2021-06-22 01:38:37 -05:00
James R
d5146945a6
Makefile: don't automatically set WINDOWSHELL unless PATH matches Windows norms
...
This is for MSYS2, which requires unix shell commands.
2021-06-21 16:10:13 -07:00
James R
2d7a8c3c57
Makefile: use shell commands to read in Sourcefile
...
File function is not supported < Make 4.2.
2021-06-21 14:51:42 -07:00
James R
fa7a674113
Merge remote-tracking branch 'origin/master' into next
2021-06-19 19:39:15 -07:00
James R
c1aca51fc3
Fix basic warnings
2021-06-19 18:32:56 -07:00
Shane Ellis
09f445f227
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/g_game.c
2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
2021-06-19 20:49:12 +02:00
LJ Sonic
cfa48574be
Merge branch 'next' into 'lua-inputs'
...
# Conflicts:
# src/lua_script.c
2021-06-19 10:34:48 -04:00
sphere
357b64129c
Merge branch 'robo-hood-nojump' into 'next'
...
Restore toggle for Robo-Hood to not jump away from nearby players.
See merge request STJr/SRB2!1548
2021-06-18 10:00:42 -04:00
Radicalicious
63d217b689
Revert "Hopefully fix ghosts"
...
This reverts commit e46afda896
2021-06-18 05:06:52 +00:00
Radicalicious
e46afda896
Hopefully fix ghosts
2021-06-18 01:04:49 -04:00
sphere
3486e12088
Merge branch 'multitag-ignore0' into 'next'
...
Ignore a linedef tag of 0 when using linedef action 96.
See merge request STJr/SRB2!1543
2021-06-17 13:03:05 -04:00
sphere
0e030466e1
Add flag to line slopes for copying their slopes to the other side.
2021-06-17 13:23:27 +02:00
James R
b04c79d8a7
Say 'at'
2021-06-16 16:58:47 -07:00
James R
c142b3241d
Makefile: alert full path of final executable
...
With added textual contrast.
2021-06-16 16:26:17 -07:00
James R
3a044e71cc
Disable EXE disassembly and compression by default
...
NOOBJDUMP=1 and NOUPX=1 have been removed. Make 'dump'
target to disassemble. UPX=upx to compress executable.
Setting UPX used to cause it to fail. That has been fixed.
2021-06-16 15:39:23 -07:00
sphere
df5c9933ec
Restore toggle for Robo-Hood to not jump away from nearby players.
2021-06-16 16:12:38 +02:00
sphere
d90b6949d7
Merge branch 'i-havent-the-foggiest' into 'next'
...
Allow P_CheckSight to see through FF_FOG FOFs
See merge request STJr/SRB2!1546
2021-06-16 09:29:01 -04:00
sphere
d11a1bb016
Merge branch 'srbii' into 'next'
...
Replace "II" in credits with "2" for consistency
See merge request STJr/SRB2!1547
2021-06-15 05:42:59 -04:00
Radicalicious
781678389f
Replace "II" with "2" for consistency
2021-06-12 20:36:57 -04:00
James R
8be7c1a03d
Fix double micros conv.
...
blame e0a307da15
2021-06-11 18:31:38 -07:00
Radicalicious
460d46bbc9
Cut cv_hidetime's minimum value all the way down to 1
2021-06-11 10:52:31 -04:00
James R
46ca9613c6
Pop hook id fetched from table
2021-06-10 18:09:39 -07:00
James R
c9417f26e5
Fix pop original table in lua net archive
2021-06-10 17:47:03 -07:00
Monster Iestyn
4c9b83b6bd
Allow P_CheckSight to see through FF_FOG FOFs
2021-06-10 21:20:42 +01:00
Ors
2a89154667
Revert an accidental whitespace change
2021-06-10 14:23:51 -04:00
Riku Salminen
f1a96bd7ee
Add support for ghosts with netvars in 2.2.6 and before
2021-06-10 21:18:45 +03:00
Radicalicious
9210923b86
Cut cv_hidetime's minimum value to 5 seconds
2021-06-10 12:59:54 -04:00
sphere
52f9b47ce3
Ignore a linedef tag of 0 when using linedef action 96.
2021-06-10 17:49:33 +02:00
Radicalicious
165be34206
Fix player maxstep, oops
2021-06-09 12:59:06 -04:00
Riku Salminen
45e57fa791
Revert "Revert "Made height/spinheight and height change values in replays more accurate""
...
This reverts commit fbeabad797
.
2021-06-09 19:40:59 +03:00
Riku Salminen
fbeabad797
Revert "Made height/spinheight and height change values in replays more accurate"
...
This reverts commit 3daee0ebf8
.
2021-06-09 19:28:14 +03:00
sphere
786516fa5f
Merge branch 'kart-latency' into 'next'
...
Kart cmd->latency port
See merge request STJr/SRB2!1470
2021-06-09 10:53:09 -04:00
Radicalicious
976373dd37
Calculate maxstep for pushables
2021-06-08 23:45:50 -04:00
sphere
be8c97728c
Merge branch 'aproxdistance' into 'next'
...
Restore P_AproxDistance Lua parity
See merge request STJr/SRB2!1531
2021-06-08 07:47:38 -04:00
lachablock
4d1b3edb03
Split up x/y/z averages in A_Boss3ShockThink
2021-06-08 17:21:54 +10:00
James R
c325306ddf
Merge remote-tracking branch 'origin/master' into makefile-revision-final
2021-06-07 18:36:01 -07:00
James R
0f4eb4fab9
Merge conflicts 4d22b9f17
2021-06-07 18:13:56 -07:00
James R
4d22b9f17f
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2021-06-07 18:12:52 -07:00
lachablock
0c5018040c
Merge remote-tracking branch 'origin/master' into next
2021-06-06 21:25:08 +10:00
sphere
c266a27073
Merge branch 'master' into 'master'
...
Fix console text bleeding
See merge request STJr/SRB2!1434
2021-06-06 07:01:30 -04:00
GoldenTails
409cba678d
metalrecording
2021-06-05 18:35:44 -05:00
Monster Iestyn
090e5384d5
Merge branch 'blendmode-rangecheck' into 'next'
...
Handle invalid blend modes
See merge request STJr/SRB2!1486
2021-06-05 09:02:31 -04:00
Radicalicious
7483a9d049
Switch num and flags so flags is optional
2021-06-03 10:55:42 -04:00
sphere
6ff212b79f
Use floating-point math for polyobject planes as well.
2021-06-03 16:01:09 +02:00
Radicalicious
cb5e433a49
Update lua_hudlib.c
2021-06-03 09:34:18 -04:00
lachablock
476dcc861b
Restore P_AproxDistance Lua parity
2021-06-03 14:36:29 +10:00
Shane Ellis
18c47afc76
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/lua_baselib.c
# src/r_skins.c
2021-06-02 11:47:11 -04:00
sphere
2df75610e6
Merge branch 'allow-lua-to-override-special-stages' into 'next'
...
Allows Lua to transport you to a different map in place of a Special Stage.
See merge request STJr/SRB2!1368
2021-06-02 11:16:15 -04:00
sphere
8cfe7cd971
Merge branch 'unix-rdynamic' into 'next'
...
Compile with -rdynamic for UNIXCOMMON platforms
See merge request STJr/SRB2!1481
2021-06-02 06:31:14 -04:00
sphere
4aa3bea6ca
Merge branch 'fix-console-splitting' into 'next'
...
Fix the console splitting up halfway through startup.
Closes #349
See merge request STJr/SRB2!1494
2021-06-02 06:31:01 -04:00
sphere
fb453491dd
Merge branch 'models-spr2endstate' into 'next'
...
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state
See merge request STJr/SRB2!1515
2021-06-02 06:28:51 -04:00
Nev3r
a4300220e9
whitespace
2021-06-02 11:36:52 +02:00
Nev3r
9c68f8cbb0
Fix the equation constant fields not being filled properly.
2021-06-02 11:21:37 +02:00
Nev3r
aec1ab304a
Let equation slopes be read from textmaps.
2021-06-02 11:00:57 +02:00
Nev3r
36ce44e0a3
Add slope equation constant parsing functionality.
2021-06-02 11:00:47 +02:00
Nev3r
8cb62eeca5
Initialize slopes before the map loads.
2021-06-02 10:59:57 +02:00
sphere
d040b61edc
Merge branch 'multitagging_plus' into 'next'
...
Enhance the multitagging functionality added by !1485
See merge request STJr/SRB2!1524
2021-06-01 17:25:29 -04:00
flarn2006
115254efc9
Fix compiler warning related to precedence
2021-06-01 17:10:29 -04:00
sphere
5a91f3326a
Merge branch 'disable-int-emeralds' into 'next'
...
Some more intermission features for Lua
See merge request STJr/SRB2!1329
2021-06-01 15:38:00 -04:00
sphere
e203e457de
Merge branch 'custom3drotate-scale-fix' into 'next'
...
A_Custom3DRotate scale fix
See merge request STJr/SRB2!1525
2021-06-01 15:02:43 -04:00
sphere
70bcb6081f
Merge branch 'dashmode-lowroad' into 'next'
...
Have Metal Sonic use spinheight while dashing
See merge request STJr/SRB2!1382
2021-06-01 15:00:08 -04:00
sphere
69b6c409b5
Merge branch 'flicky-mapload-crash-fix' into 'next'
...
Flicky mapload crash fix (and other tmthing-related fixes)
Closes #81
See merge request STJr/SRB2!1522
2021-06-01 14:58:01 -04:00
flarn2006
172454f108
Fix offset_tags array indices
2021-06-01 10:09:57 -04:00
Nev3r
f7ee0dacf2
Merge branch 'lua_mapnumber' into 'next'
...
Expose M_MapNumber to Lua
See merge request STJr/SRB2!1521
2021-06-01 07:43:33 -04:00
Nev3r
2d155fa366
Merge branch 'remove-fracunit-2' into 'next'
...
I have no idea why software does this.
See merge request STJr/SRB2!1517
2021-06-01 07:42:36 -04:00
Nev3r
de0a91729b
Merge branch 'buttered-lua' into 'next'
...
Expose P_ButteredSlope to lua
See merge request STJr/SRB2!1397
2021-06-01 07:39:19 -04:00
Nev3r
6edad47788
Merge branch 'no-airwalking-springs' into 'next'
...
No airwalking (from horizontal springs)
See merge request STJr/SRB2!1428
2021-06-01 07:38:04 -04:00
Nev3r
b49238f7c4
Merge branch 'remove-iterdeclarations' into 'next'
...
Remove TAG_ITER_DECLARECOUNTER
See merge request STJr/SRB2!1398
2021-06-01 07:36:50 -04:00
Nev3r
ab06ff011e
Merge branch 'colorfret' into 'next'
...
Respect mobj->color while enemies & bosses flash (resolves #531 )
Closes #531
See merge request STJr/SRB2!1513
2021-06-01 02:31:22 -04:00
Nev3r
9e7d619a5b
Merge branch 'golden-nitpicks-use-of-base-10' into 'next'
...
Use more readable hex constants in the Software Renderer splat and floorsprite drawers.
See merge request STJr/SRB2!1442
2021-06-01 02:29:53 -04:00
sphere
4908712641
Merge branch 'go-away' into 'next'
...
Make a few messages more helpful (resolves #485 )
Closes #485
See merge request STJr/SRB2!1519
2021-05-31 16:32:42 -04:00
sphere
65350e59c9
Merge branch 'rollout-stuff' into 'next'
...
Rollout rock improvements
Closes #445 , #221 , and #532
See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
Radicalicious
3e91a8b2d4
Revert "Update p_user.c"
...
This reverts commit 92209bf246
2021-05-31 19:23:37 +00:00
Radicalicious
92209bf246
Update p_user.c
2021-05-31 15:09:54 -04:00
sphere
33d0438033
Merge branch 'fuckeggguard' into 'next'
...
Make Armageddon Shield instantly kill Egg Guards (Closes #225 )
Closes #225
See merge request STJr/SRB2!1378
2021-05-31 09:34:14 -04:00
sphere
aec209ad2d
Merge branch 'slider' into 'next'
...
Allow sliders passage through spin gaps (resolves #576 )
Closes #576
See merge request STJr/SRB2!1520
2021-05-31 08:31:42 -04:00
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
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
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
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
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
Sally Coolatta
a583027006
Remove prints
2021-05-07 19:52:29 -04:00
Sally Coolatta
dc6851dabc
Save skin name instead of skin number into save files
...
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-07 19:41:44 -04:00
James R
9e7d80c2c4
Makefile: suppress DEL error
2021-05-07 16:08:24 -07:00
Monster Iestyn
a98b0834a6
Merge branch 'deh-buffer-unclog' into 'next'
...
Fix a series of buffer overflows in SOC (primarily Character section) loading
See merge request STJr/SRB2!1457
2021-05-07 18:47:51 -04:00
Monster Iestyn
70052a099c
Merge branch 'acos' into 'next'
...
arccosine Lua exposure
See merge request STJr/SRB2!1455
2021-05-07 18:33:55 -04:00
James R
c06817d008
Makefile: fix mingw/64 swapped with 32-bit
2021-05-07 15:30:46 -07:00
Monster Iestyn
529d297895
Merge branch 'soc-caption' into 'next'
...
[SUGOI] Allow setting sound captions in SOC
See merge request STJr/SRB2!1469
2021-05-07 18:21:48 -04:00
Monster Iestyn
d00726cbe9
Merge branch 'monster-cleaning-up-again' into 'next'
...
Monster cleaning up again
See merge request STJr/SRB2!1433
2021-05-07 17:33:00 -04:00
Monster Iestyn
fa140c1eb3
Merge branch 'load-netgame-error-fixes' into 'next'
...
Load netgame error fixes
See merge request STJr/SRB2!1482
2021-05-07 17:27:19 -04:00
James R
ee72312dea
Merge remote-tracking branch 'origin/master' into makefile-revision-final
2021-05-07 13:32:19 -07:00
Monster Iestyn
b7ff0164e9
Merge branch 'polyobject-ffloor-fix' into 'next'
...
Polyobject over 3D floor fix for software renderer
See merge request STJr/SRB2!1488
2021-05-07 16:11:03 -04:00
Sally Coolatta
4478265400
Fix title card patches not actually having enough room for an entire lump name
2021-05-07 14:15:37 -04:00
Sally Coolatta
8e8881b534
Fix custom title card text not looping properly
2021-05-07 14:14:31 -04:00
LJ Sonic
07e69c5eb3
Add copyright date ranges for files created in 2020
2021-05-07 18:04:30 +02:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
lachablock
8b021ec16b
but if you close your eyes EH OH, EH OH
2021-05-07 12:38:24 +10:00
Tatsuru
3159d5a6e4
2.2.9 prep
2021-05-06 21:58:21 -03:00
sphere
6053740ef7
Merge branch 'light-userdata-is-wrong' into 'next'
...
Stop using metatables with light userdata
See merge request STJr/SRB2!1495
2021-05-06 12:14:36 -04:00
sphere
413c8563c9
Merge branch 'things-to-tide-you-over' into 'next'
...
Update URL on the addon screen
See merge request STJr/SRB2!1489
2021-05-06 08:18:12 -04:00
James R
ec8b63d675
Makefile: remove last of unused flags
2021-05-05 21:21:55 -07:00
James R
f9813844e7
Update CMakeLists.txt to use Sourcefiles
...
This establishes (near) parity of source code file lists
between the Makefile and CMakeLists.txt
To make that change I messed around CMakeLists.txt a bit.
It now uses target_sources and target_compile_definitions.
I also removed some MSVC stuff since we don't actually
care about MSVC--it made things easier.
CMake minimum version 3.0 -> 3.13 for target_sources.
2021-05-05 04:00:44 -07:00
James R
3d7205d494
Fix minor errors with Windows ECHO, DEL, MD
...
- Quotes were not removed by ECHO.
- DEL would print an error on nonexistent file.
- MD would do this plus return a nonzero exit code.
2021-05-04 22:34:20 -07:00
James R
888073d64d
Fix make clean printing header
2021-05-04 16:54:47 -07:00
James R
b31056c7d9
Rewrite Makefile to be modular as well as more automated
...
Some key points for programmers:
- Source code files are mostly listed in a 'Sourcefile'.
So you no longer directly edit the object list. There
can be multiple Sourcefiles and they can even live in
subdirectories--the directory name will be prepended to
every filename in the list. Of course, the Makefile
still needs to be edited to read from each Sourcefile.
- Different rules are no longer required for source code
files that live in subdirectories (such as sdl/ or
hardware/). Subdirectories Just Work so go ham!
In addition to those points, another important change is
that the bin directory is no longer divided into platform
subdirectories (Linux64, Mingw, etc). Executables now go
directly into bin. If you use DEBUGMODE or target 64-bit,
then subdirectories for 'debug' and '64' will be made
though.
Oh by the way, I don't think make clean actually removed
files before on Windows. It should now. I also fixed as
many little inconsistencies like that as I noticed.
And now just an overview of the technical aspects that
shouldn't affect anyone who doesn't REALLY care about the
Makefile...
objs and dep directories have been moved to a make
directory. Makefile.cfg and its variants have been moved
out of their various subdirectories to src/Makefile.d
make distclean removes the bin and make directories
entirely, but make clean and cleandep still only affect
the current build target.
When I say automation, I mean that a lot of copy pasting
in the Makefile has been reduced.
2021-05-04 04:22:37 -07:00
James R
44d217807f
Collect makefiles
2021-05-03 23:07:44 -07:00
Steel Titanium
80fe39bbd1
Fix MusicChange hook not returning some values correctly
2021-05-03 01:40:02 -04:00
James R
aee963f4e9
Replace LUA_PushLightUserdata with LUA_PushUserdata
...
See 7df6a309
and 83a87042
. I didn't realize that light
userdata's metatable is shared--like numbers or strings.
So it cannot be paired with a metatable.
I also made a few minor tweaks to Lua cvars, other than
accounting for the double pointer in the userdata.
2021-05-02 21:59:23 -07:00
James R
ed5a7f51e8
Revert "Merge branch 'lightmemedata' into 'next'"
...
This reverts commit d4c08a8410
, reversing
changes made to e100f21dda
.
2021-05-02 21:32:07 -07:00
GoldenTails
ab84bd5370
Fix the console splitting up halfway through startup.
2021-05-02 00:03:35 -05:00
Tatsuru
aac3ca320b
Update LOCATIONSTRING2 as well
2021-05-01 10:24:28 -03:00
Sally Coolatta
381ead4d7e
Level select no longer assumes that games will always be linear
...
- If a level is in-between two with the same header, it would previously create two headers with the same name. Now it groups all levels with the same header together.
- Previously, a header would only be visible if its first map was visible. Now it will show the header if you've visited any level under the header.
For SUGOI.
2021-04-30 21:46:09 -04:00
LJ Sonic
f97dc1093a
Merge branch 'kitchensync' into 'next'
...
Attempt to resolve teleportation resync issue
See merge request STJr/SRB2!1490
2021-04-30 20:39:11 -04:00
katsy
815db01438
adjust cooldown to 5 seconds (bandage fix for 2.2.9)
2021-04-30 20:30:35 -04:00
katsy
858cb98e57
attempt to resolve teleportation resync issue
2021-04-30 17:26:09 -05:00
Tatsuru
ea7b332525
Visit srb2.org/addons to get & make addons!
2021-04-30 15:49:09 -03:00
Jaime Ita Passos
b4a09405a7
Use 64-bit math for calculating the texture origin X/Z
2021-04-29 19:24:37 -03:00
Jaime Ita Passos
9d41325843
Only adjust slope offsets if the plane isn't rotated
2021-04-28 22:15:05 -03:00
Jaime Ita Passos
090f304f33
Use 64-bit x/y in R_GetSlopeZAt
2021-04-28 22:00:20 -03:00
Jaime Ita Passos
1cf13a22e4
Merge branch 'next' into polyobject-ffloor-fix
2021-04-28 20:29:41 -03:00
Monster Iestyn
b8ba2c5b70
Merge branch 'next' into load-netgame-error-fixes
...
# Conflicts:
# src/d_clisrv.c
2021-04-28 18:08:48 +01:00
Jaime Ita Passos
8f47a7e9cc
Prevent texture wobbling on planes with no flat alignment
2021-04-27 22:59:06 -03:00
Jaime Ita Passos
0fba870a35
Revert "Use floating point trig in R_SetSlopePlane"
...
This reverts commit 63761a2d07
.
2021-04-27 22:54:56 -03:00
Jaime Ita Passos
63761a2d07
Use floating point trig in R_SetSlopePlane
2021-04-27 20:42:59 -03:00
Jaime Ita Passos
1c6296653a
Use floating point GetSlopeZAt for the texture origin vector
2021-04-27 20:32:41 -03:00
GoldenTails
691b17a88e
Dynamically allocate space for a state's action field
...
It was previously restricted arbitrarily to 32 cells (31 usable characters) due to someone else's laziness
2021-04-27 17:28:49 -05:00
Jaime Ita Passos
e4b8dc6584
Fix sloped plane offsets in Software, and fix rotated flat alignment in OpenGL.
...
+ unrelated slope plane optimizations in Software
2021-04-27 19:01:09 -03:00
Zwip-Zwap Zapony
21da6ce704
Auto-crop at splitscreen borders
...
V_DrawCroppedPatch will no longer go beyond splitscreen borders when V_PERPLAYER is used
2021-04-27 21:30:00 +02:00
Jaime Ita Passos
548554431b
Handle invalid blend modes properly
2021-04-27 00:20:41 -03:00
Jaime Ita Passos
85c53b35cd
Use old routine for PO2 spans
2021-04-26 22:17:03 -03:00
Vincent Robinson
f437d6afec
Add linedef specials for multitagging in binary maps
2021-04-26 16:27:39 -07:00
LJ Sonic
3491112818
Update copyright date
2021-04-27 00:33:24 +02:00
LJ Sonic
0d4d3a5207
Revert "Lua: ensure order of MIN, MAX possible values"
...
This reverts commit c51c478740
.
2021-04-26 21:11:24 +02:00
LJ Sonic
cd4cfba500
Delete faulty return
2021-04-26 21:10:32 +02:00
Monster Iestyn
34fa977192
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 19:07:11 +01:00
LJ Sonic
664f5fe5b1
Merge branch 'erz3-tol' into 'next'
...
Give TOL_ERZ3 an appropriate identifier (closes #516 )
Closes #516
See merge request STJr/SRB2!1471
2021-04-26 06:08:31 -04:00
LJ Sonic
7d167f531b
Merge branch 'lua-minmax-plus' into 'next'
...
Let Lua cvars use preset values in addition to MIN and MAX
See merge request STJr/SRB2!1480
2021-04-26 06:06:58 -04:00
Steel Titanium
7cd41a8eb7
Compile with -rdynamic on UNIXCOMMON platforms
2021-04-26 03:48:38 -04:00
James R
92aeadc36b
It is impossible for a string to be allocated in this case
2021-04-25 22:01:40 -07:00
James R
85914cc7cd
Free zstring when switching to preset value
...
This is only applicable for bounded cvars (MIN, MAX),
since otherwise there's no way to allocate a zstring.
2021-04-25 21:55:04 -07:00
James R
c51c478740
Lua: ensure order of MIN, MAX possible values
...
Cvars could now have a range (MIN, MAX) plus some preset
values, but Lua could not take advantage of this due to
table order not being guaranteed.
2021-04-25 21:51:24 -07:00
Sally Coolatta
4bafd62271
Only return skin string number if it existed
2021-04-25 18:44:07 -04:00
Sally Coolatta
92107f28d5
Add string variable for unlockables and emblems
...
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
2021-04-25 17:54:47 -04:00
Sally Coolatta
f0b9e0e415
Default to first usable skin instead of 0, I_Error if none are usable
2021-04-25 16:38:33 -04:00
LJ Sonic
d18fc8882f
Merge branch 'dont-load-dont-unload' into 'next'
...
Fix a dedicated crash in Special Stage intermissions (2.2.9 RC1)
See merge request STJr/SRB2!1475
2021-04-25 16:35:46 -04:00
LJ Sonic
1d07fc2de3
Merge branch 'spritedef-add-hotfix' into 'next'
...
Spritedef add hotfix
See merge request STJr/SRB2!1476
2021-04-25 16:34:39 -04:00
LJ Sonic
1e394a80bf
Merge branch 'possible-netgame-quit-crash-hotfix' into 'next'
...
Possible netgame quit crash hotfix
Closes #487
See merge request STJr/SRB2!1477
2021-04-25 16:33:49 -04:00
Sally Coolatta
382c0aa7de
Fix overshadowed declaration
2021-04-25 16:27:15 -04:00
Monster Iestyn
70939a7a3d
Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all.
2021-04-25 21:08:12 +01:00
LJ Sonic
02ee480abe
Merge branch 'gl-colormapped-epolyflag' into 'next'
...
Fix uninitialized reads in PreparePolygon
See merge request STJr/SRB2!1392
2021-04-25 14:19:24 -04:00
sphere
a90642bfa9
Merge branch 'ogl-midtexture-zfighting-fix' into 'next'
...
Render midtextures on two-sided lines with a z-buffer offset
See merge request STJr/SRB2!1376
2021-04-25 14:02:02 -04:00
Monster Iestyn
65624bf6c0
Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly
2021-04-25 19:01:51 +01:00
Tatsuru
376d6cd6a2
Don't try to free patches in dedicated
2021-04-25 14:26:43 -03:00
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Zwip-Zwap Zapony
acff5c1ada
Merge branch 'next' into drawcroppedpatch-improvements
2021-04-25 10:15:16 +02:00
Radicalicious
e510e71617
Remove fire shield flash
2021-04-23 15:50:48 -04:00
Tatsuru
4f2f94d02d
Compatibility with the current identifier
2021-04-21 22:22:37 -03:00
Tatsuru
da56e84d2c
Change TOL_ERZ3 identifier
2021-04-21 22:17:16 -03:00
Sally Coolatta
57d81ddb21
Kart cmd->latency port
...
Nev3r was talking about something that would've been drastically improved with this, and it is really simple, so I ported it :)
2021-04-21 19:58:14 -04:00
SMS Alfredo
abc886b9ac
REVERSESUPER rises from the grave
2021-04-21 18:20:56 -05:00
GoldenTails
e7156db79d
Allow Lua to draw level title strings, and get the width and height of what would be drawn
2021-04-20 23:52:25 -05:00
GoldenTails
43c21edcbd
Send IntermissionThinker and intermission hud hooks stagefailed
.
2021-04-20 23:52:25 -05:00
GoldenTails
aa54a04c9e
Allow Lua to stop the intermission level title strings from drawing
2021-04-20 23:52:25 -05:00
GoldenTails
6c4e7e13e0
Allow Lua to disable the emeralds that appear in the Special Stage intermission.
2021-04-20 23:52:25 -05:00
Sally Coolatta
ce3c5e081e
Missed a few lines in the prev commit
2021-04-20 22:19:56 -04:00
Sally Coolatta
8f01e85ade
Allow spaces in captions defined in SOC
2021-04-20 22:10:11 -04:00
Jaime Ita Passos
77b8578d04
Add ease Lua library
2021-04-19 21:42:00 -03:00
Sally Coolatta
41f492f2f9
Don't award any potentially cheesable bonuses if the stage was failed.
...
Time Bonus is 0'd out if the stage was failed, since you can defeat the whole point of it if the stage lets you fail it immediately. Same with Guard Bonus -- it's not really a no-hit run if you didn't interact with anything.
Kept others that are more effort-based like Ring Bonus to give the player a little bit of partial credit, especially since Special Stages do this too.
2021-04-19 17:59:55 -04:00
Sally Coolatta
30e7455178
Failing a stage just displays the level title
2021-04-19 17:50:49 -04:00
Sally Coolatta
d8d3dee46f
Add linedef executor for toggling stagefailed
...
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
2021-04-19 17:20:34 -04:00
SMS Alfredo
228668ce98
Change the render flags to extra flags and improve SF_NOSUPERSPRITES
2021-04-19 14:25:34 -05:00
Jaime Ita Passos
b026a6991c
Easing functions
2021-04-19 15:52:07 -03:00
sphere
d71b99a56b
Merge branch 'comparepolygons-fix' into 'next'
...
Remove bad pointer arithmetic in polygon comparators (fixes #295 )
Closes #295
See merge request STJr/SRB2!1462
2021-04-19 14:33:41 -04:00
sphere
164fbeff91
Merge branch 'fix-perfstats-3' into 'next'
...
Fix incorrect values caused by outdated use of timing functions in perfstats 3
See merge request STJr/SRB2!1460
2021-04-19 14:33:31 -04:00
sphere
194d0b8201
Merge branch 'interfission' into 'next'
...
Cache teamflags/icons before drawing if they don't exist yet (closes #511 )
Closes #511
See merge request STJr/SRB2!1459
2021-04-19 14:33:23 -04:00
sphere
315582bd6c
Merge branch 'fix-blendtables' into 'next'
...
Fix blend tables generation
See merge request STJr/SRB2!1458
2021-04-19 14:33:12 -04:00
sphere
d871612a72
Merge branch 'openglol' into 'next'
...
Fix HWR_DrawSprite sigsegv
See merge request STJr/SRB2!1454
2021-04-19 14:33:03 -04:00
Sally Coolatta
d59f25a6cd
stagefailed is more useful
...
- Can now apply to normal stages, simply defaults to "false" in normal stages.
- Post-level cutscenes are now always skipped when the stage was failed.
- Exposed the boolean as a Lua read+write global.
Desired for SUGOI, as it allows for visited flags not be updated, and level completion emblems to not be awarded. Which means a lot less crappy non-ideal workarounds.
Normal stage intermission currently does not reflect failure state at all. Maybe it could always skip, never award score bonuses, have different text... etc. Probably would leave that up to vanilla dev opinion.
2021-04-18 12:59:49 -04:00
Hannu Hanhi
ee578b68f4
Remove bad pointer arithmetic in polygon comparators, that was causing glitches
2021-04-17 03:11:29 +03:00
katsy
d35a1811d6
clean up bouncy fof code
2021-04-16 04:49:33 -05:00
Hannu Hanhi
3670af5a31
Fix incorrect values caused by outdated use of timing functions in perfstats 3
2021-04-16 00:38:34 +03:00
katsy
7b83345c75
need to create the patches here if they don't already exist
2021-04-14 19:29:53 -05:00
Jaime Ita Passos
d5e9005dd0
Fix NPOT flats, other minor changes.
2021-04-14 11:34:36 -03:00
Jaime Ita Passos
b3d7df74c0
This is my attempted fix for texture rotation on slopes, in Software.
2021-04-14 10:55:52 -03:00
Jaime Ita Passos
0d4d2ed6d8
Fix blend tables generation
2021-04-13 12:11:31 -03:00
katsy
23759c67aa
move HWR_GetMappedPatch earlier
2021-04-12 21:26:29 -05:00
X.organic
6f0b4a4f6d
Remove some dead code from DEH_LoadDehackedFile
...
Also fixes a buffer overflow, but said overflow generally got caught by
the stack smashing protector. Still, it's better for SOC files not to be
able to crash the game that easily.
2021-04-12 19:09:21 +02:00
X.organic
f0f3b33d71
Edit note_size alias to get rid of warnings
2021-04-12 19:09:21 +02:00
X.organic
701c6c8968
Fix myhashfgets-related buffer overflows in deh_soc.c
2021-04-12 19:09:12 +02:00
GoldenTails
8f322fd86f
name kinda sucked
2021-04-11 18:33:11 -05:00
GoldenTails
4f3802a2cc
acos Lua exposure
2021-04-11 18:32:49 -05:00
sphere
bcd3245b76
Merge branch 'blendmode-revision' into 'next'
...
Blending changes
See merge request STJr/SRB2!1446
2021-04-11 08:18:12 -04:00
sphere
00e81cac8e
Merge branch 'badflags' into 'next'
...
Fix CTF flag patch garbage (resolves #506 )
Closes #506
See merge request STJr/SRB2!1453
2021-04-10 11:34:07 -04:00
sphere
1d863408c7
Merge branch 'dedicated-scoretally-crash-fix' into 'next'
...
Fix dedicated server crashing when exiting special stage (Fixes #453 )
Closes #453
See merge request STJr/SRB2!1451
2021-04-10 11:34:00 -04:00
sphere
d18ef87465
Merge branch 'gl-deletetexture-fix' into 'next'
...
Fix a OpenGL backend DeleteTexture crash (Fixes #499 )
Closes #499
See merge request STJr/SRB2!1448
2021-04-10 11:33:53 -04:00
katsy
876daa7d6e
fix ctf flag garbage
2021-04-07 04:57:18 -05:00
SMS Alfredo
3f086ff612
The intial
2021-04-07 01:14:32 -05:00
Steel Titanium
77f2b1f682
Prevent redudant result patch caching on competition
2021-04-07 01:11:39 -04:00
Steel Titanium
a501b7b00d
Reorganize the switch block, add missing int_comp case
2021-04-07 00:55:08 -04:00
James R
1db163f942
Merge branch 'master' into next
2021-04-06 16:19:15 -07:00
SwitchKaze
c3d5740e98
Fix console text bleeding edge case
...
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
2021-04-06 15:06:44 -05:00
James R
e39bf7503f
Makefile: fix object file not depending on headers
...
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Steel Titanium
101b6e46d4
Even more bruhs
2021-04-05 22:56:03 -04:00
Steel Titanium
33b7075d46
bruh
2021-04-05 22:50:22 -04:00
Steel Titanium
35c0f8b5cc
Correct function name comment
2021-04-05 22:44:16 -04:00
Steel Titanium
397fdef034
Load intermission patches in Y_LoadIntermisionData
2021-04-05 22:34:52 -04:00
Lach
c99e53d735
Merge branch 'dashmode-crash' into 'next'
...
Fix jet fume crash when dashmode is above DASHMODE_MAX
See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a01a420aa0
Brackets
2021-04-05 18:10:34 -07:00
Sally Coolatta
3dd04b90c6
Fix jet fume crash when dashmode is above DASHMODE_MAX
...
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
2c1b383c4a
Merge branch 'uppercase-tty' into 'next'
...
Let uppercase letters thru dedicated console
See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04:00
GoldenTails
776ce2a750
bruh i messed up
2021-04-05 04:20:09 -05:00
GoldenTails
5b2abfa18d
Replace some decimal constants with more descriptive hex constants.
2021-04-05 04:19:35 -05:00
James R
84191252d2
Remove code that converts uppercase letters to lower, when coming from dedicated console
2021-04-04 17:01:54 -07:00
Hannu Hanhi
e9213b2b41
Fix a OpenGL backend DeleteTexture crash
2021-04-04 21:29:15 +03:00
katsy
57c7a18a20
don't say we launched if we didn't actually launch
2021-04-02 20:50:56 -04:00
SwitchKaze
3895c02330
Revert "Remove key stuff"
...
This reverts commit a439e569
2021-04-02 15:46:08 -05:00
SwitchKaze
0db07cef0e
Adjust joystick axis enum
2021-04-02 15:46:08 -05:00
SwitchKaze
5a247bf375
Fix typo in comment of I_GetMouseGrab
2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58
Remove key stuff
2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b
Mouse improvements
2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a
Expose inputs to Lua
2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed
Refactor mouse
2021-04-02 15:22:22 -05:00
LJ Sonic
99c773f39e
Merge branch 'dontdothisinsoftwarelol' into 'next'
...
don't HWR_ClearAllTextures() in software (fixes #389 )
Closes #389
See merge request STJr/SRB2!1440
2021-03-31 16:19:18 -04:00
LJ Sonic
4ef3477054
Merge branch 'smoother-freelook' into 'next'
...
Smoother freelook in Software
See merge request STJr/SRB2!1444
2021-03-31 16:17:40 -04:00
LJ Sonic
a584d7edea
Merge branch 'playercanenterspingaps' into 'next'
...
Do not let SF_NOJUMPSPIN characters enter sectors they could not enter if standing at full height (Closes #457 )
Closes #457
See merge request STJr/SRB2!1432
2021-03-31 16:15:35 -04:00
LJ Sonic
933fad7702
Merge branch 'fix-luafile-transfer' into 'next'
...
Prevent a single client from blocking Lua file transfers
See merge request STJr/SRB2!1435
2021-03-31 14:28:22 -04:00
LJ Sonic
4b15b52dfc
Our menu system sucks. That's all I have to say.
2021-03-31 19:49:37 +02:00
katsy
d1700bbf18
Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol
2021-03-31 03:15:31 -05:00
Jaime Ita Passos
7e6bc97240
Smoother freelook in Software
...
Mhm hmm...
2021-03-30 22:52:50 -03:00
Jaime Ita Passos
59be35e533
Rename functions, make more efficient, fix subtractive in Software
2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481
Blend modes revision
...
This changes how blend modes render, and includes fixes.
2021-03-30 17:03:05 -03:00
Monster Iestyn
0d5284c36c
Murder MSDOS
, another of the remaining DOS port related macros
...
I also put in a missing `defined (__APPLE__)` in d_netcmd.h related to cv_mouse2opt
Also removed a redundant `!defined (__APPLE__)` in d_main.c
2021-03-30 19:27:10 +01:00
Jaime Ita Passos
4025a1d517
[Software] A few floorsprite fixes
...
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
2021-03-29 23:04:13 -03:00
namishere
32a4b270df
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into buttered-lua
2021-03-29 16:15:50 -07:00
Mari0shi06
29704e141b
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:29:24 -04:00
Mari0shi06
715a3661b5
Revert "Change Raspberry's chat color to V_ROSYMAP"
...
This reverts commit 192fa5cb4b
2021-03-28 21:27:46 +00:00
Mari0shi06
192fa5cb4b
Change Raspberry's chat color to V_ROSYMAP
2021-03-28 17:26:41 -04:00
Mari0shi06
424f67a74b
Revert "Change Raspberry's chat colormap to V_ROSYMAP"
...
This reverts commit 428ae3127e
2021-03-28 21:19:26 +00:00
Mari0shi06
428ae3127e
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:12:58 -04:00
katsy
d6eaf7e0ff
clear before switching, not after
2021-03-28 12:22:04 -05:00
katsy
55d63000f4
don't HWR_ClearAllTextures() in software
2021-03-27 18:30:59 -05:00
Monster Iestyn
df9b5c4312
Merge branch 'avoid-savemoddata' into 'next'
...
Fix addons with custom gamedata not loading
Closes #473
See merge request STJr/SRB2!1427
2021-03-26 13:06:49 -04:00
lachablock
8162d90c94
Fix LUAh_PlayerHeight returning wrong default value
2021-03-26 18:01:55 +11:00
LJ Sonic
854e43ea7c
Kick clients if they take too long to download a Lua file
2021-03-25 22:43:06 +01:00
LJ Sonic
b6e5837161
Use a separate transfer status for disconnected nodes
2021-03-25 22:28:35 +01:00
SteelT
fa8947ad8f
Merge branch 'no-apng-compile-fix' into 'next'
...
Fix unused variable warning when USE_APNG is not defined
See merge request STJr/SRB2!1343
2021-03-25 14:02:23 -04:00
SwitchKaze
6267abac8a
Fix console text bleeding
2021-03-25 12:43:30 -05:00
lachablock
000e865f80
Revise spinheight/gap entry conditions (again), let's keep things WAY simpler:
...
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
2021-03-25 21:42:25 +11:00
lachablock
6ea9653681
Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks
2021-03-25 21:41:09 +11:00
lachablock
b1a9262889
Fix P_PlayerCanEnterGaps issues with polyobject collision
2021-03-25 15:58:52 +11:00
lachablock
f99d89742a
Revise conditions under which players use spinheight and enter gaps:
...
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
2021-03-25 15:57:35 +11:00
Monster Iestyn
7511911846
Merge branch 'custom3dcrash' into 'next'
...
Fix sigsegv caused by bad target check in A_Custom3DRotate
See merge request STJr/SRB2!1430
2021-03-24 14:24:21 -04:00
Monster Iestyn
4a898bace6
Merge branch 'next' into monster-cleaning-up-again
2021-03-24 15:39:38 +00:00
Monster Iestyn
91187f91be
Merge branch 'fix-opengl-drawcroppedpatch' into 'next'
...
Fix OpenGL V_DrawCroppedPatch (Fixes #452 )
Closes #452
See merge request STJr/SRB2!1412
2021-03-24 11:34:58 -04:00
Jaime Ita Passos
08937f892a
Allocate a buffer for non-RGBA to RGBA texture conversions.
...
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
2021-03-23 01:18:28 -03:00