Commit graph

1441 commits

Author SHA1 Message Date
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next'
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
2023-04-12 17:50:01 +00:00
Gustaf Alhäll
4c02bde4e9
Fix crash during debug when escaping pterabyte 2023-04-10 18:31:12 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
James R
ff0f6e9b74 Add CV_ALLOWLUA to a bunch of cvars
These cvars can be modified by Lua.

- advancemap
- allowexitlevel
- allowjoin
- allowmlook
- allowseenames
- allowteamchange
- autobalance
- basenumlaps
- cam2_adjust
- cam2_centertoggle
- cam2_curdist
- cam2_curheight
- cam2_dist
- cam2_height
- cam2_lockaimassist
- cam2_lockedinput
- cam2_orbit
- cam2_rotate
- cam2_rotspeed
- cam2_shiftfacingchar
- cam2_simpledist
- cam2_simpleheight
- cam2_speed
- cam2_still
- cam2_turnfacingability
- cam2_turnfacingchar
- cam2_turnfacinginput
- cam2_turnfacingspindash
- cam2_turnmultiplier
- cam_adjust
- cam_centertoggle
- cam_curdist
- cam_curheight
- cam_dist
- cam_height
- cam_lockaimassist
- cam_lockedinput
- cam_orbit
- cam_rotate
- cam_rotspeed
- cam_shiftfacingchar
- cam_simpledist
- cam_simpleheight
- cam_speed
- cam_still
- cam_turnfacingability
- cam_turnfacingchar
- cam_turnfacinginput
- cam_turnfacingspindash
- cam_turnmultiplier
- color
- color2
- competitionboxes
- cooplives
- coopstarposts
- countdowntime
- exitmove
- flagtime
- forceskin
- friendlyfire
- gravity
- hidetime
- inttime
- itemfinder
- killingdead
- matchboxes
- maxplayers
- mute
- numlaps
- overtime
- pausepermission
- playersforexit
- pointlimit
- powerstones
- respawndelay
- respawnitem
- respawnitemtime
- restrictskinchange
- ringslinger
- runscripts
- scrambleonchange
- seenames
- servername
- showhud
- showinputjoy
- skin
- skin2
- specialrings
- startinglives
- tailspickup
- teamscramble
- timelimit
- touchtag
- tv_1up
- tv_bombshield
- tv_eggman
- tv_forceshield
- tv_invincibility
- tv_jumpshield
- tv_recycler
- tv_ringshield
- tv_superring
- tv_supersneaker
- tv_teleporter
- tv_watershield
2023-03-15 16:40:21 -07:00
Monster Iestyn
851ca92aaa revert Eidolon's edits for testing the IT/CTF flag sign fixes, they were left in by mistake 2023-02-28 17:51:26 +00:00
Eidolon
a308ad1119 Merge branch 'ctf-interpolation' into 'next'
Fix IT and ctf flag sign interpolation

See merge request STJr/SRB2!1939
2023-02-28 15:43:36 +00:00
Eidolon
c42ef9f1be Fix IT and ctf flag sign interpolation 2023-02-27 18:28:34 -06:00
sphere
1dfb8ed4c3 Merge branch 'issue912a' into 'next'
Fixes Issue #912

Closes #912

See merge request STJr/SRB2!1909
2023-02-27 20:37:38 +00:00
MascaraSnake
f94695390e Merge branch 'revert-gamepads' into 'next'
Revert Gamepads for now

See merge request STJr/SRB2!1926
2023-01-27 13:53:45 +00:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next"
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
2023-01-26 19:26:28 -06:00
Eidolon
add018cb83 Interpolate minecart marks
Fixes STJr/SRB2#906

Uses the old displacement of the minecart to position the mark relative
to its destination. It's not completely correct, but it works.
2023-01-25 21:09:50 -06:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging"
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00
Arthur
449d27749f Fixes Issue #912 2022-12-31 20:30:39 -05:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
sphere
060b79452a Merge branch 'remove-spinning' into 'next'
Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly

See merge request STJr/SRB2!1429
2022-12-31 09:39:06 +00:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code
Implements the SDL Game Controller API, haptics, and axis bindings.
2022-11-14 00:37:08 -03:00
Eidolon
c582d73e4c Merge branch 'slowball' into 'next'
Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
2022-11-14 02:23:39 +00:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next'
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
2022-11-13 23:40:56 +00:00
Eidolon
9a88c9ea47 Merge branch 'gravityflipping' into 'next'
Gravity flip bugfixes & additions

Closes #378, #661, and #430

See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Eidolon
12c2ddb115 Merge branch 'uncappedrevengeance' into next
Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
spherallic
57cf1f870d Fix Pterabyte spawns, revert mashing requirement, increase grace period 2022-10-25 13:11:30 +02:00
Eidolon
f43839ef8d uncapped: Reset cam interpolation on P_ResetCamera 2022-10-09 16:40:52 -05:00
spherallic
c92a371aa9 Clean up the start of P_CheckQuicksand 2022-10-08 10:58:09 +02:00
katsy
79e8e10e07 check for canbustwalls, not glide&climb 2022-10-04 16:22:07 -05:00
spherallic
9da90cef8e Merge branch 'next' into gravityflipping 2022-09-30 21:27:32 +02:00
sphere
70161ff52e Merge branch 'fancarry' into 'next'
Add carry type to fans (with fixed merge conflicts)

See merge request STJr/SRB2!1809
2022-09-30 13:07:19 +00:00
spherallic
bf466bfbd9 Fix P_InJumpFlipSector checking for outdated FOF flags 2022-09-29 19:32:53 +02:00
spherallic
f37d466343 Merge branch 'next' into gravityflipping 2022-09-29 19:27:00 +02:00
spherallic
2664fc700a Check for sector special flag instead of special number 2022-09-16 23:05:24 +02:00
spherallic
612424e2e2 Merge branch 'next' into fancarry 2022-09-16 22:54:08 +02:00
spherallic
9499d16221 Fix quicksand in reverse gravity 2022-09-12 11:27:28 +02:00
spherallic
42fc6c877b Remove hack in P_GetMobjGravity for spinfire, fix the underlying issue 2022-09-11 20:04:20 +02:00
spherallic
5e6185abe2 Fix Elemental stomp's flames while Gravity Boots are active 2022-09-11 18:28:17 +02:00
spherallic
8d06145377 Play gravity flip sound on jump in jumpflip sectors, reorganize code 2022-09-09 15:35:05 +02:00
spherallic
9fabddd4bb Add sector type that flips gravity upon jumping 2022-09-08 16:56:35 +02:00
SMS Alfredo
e070880ec0 Do the thing 2022-08-25 15:29:54 -05:00
MascaraSnake
ec119eac2f Merge branch 'next' into udmf-fof-flags 2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53 Add Lua backwards compatibility for FOF flags 2022-07-31 12:04:42 +02:00
sphere
c65851d17c Merge branch 'autobrake-fix' into 'next'
Make autobrake account for scale

See merge request STJr/SRB2!1782
2022-07-29 09:33:29 +00:00
Eidolon
805941a98f Merge public next into uncappedrevengeance
This is to capture the UDMF merges and make the later code review
easier.
2022-05-03 14:45:14 -05:00
Eidolon
0503c853cc Reset Metal fume interp state on appear 2022-04-27 18:19:00 -05:00
Eidolon
c79df7d58e Interpolate afterimages further back 2022-04-26 20:56:35 -05:00
Eidolon
9f845622cd Revert "P_InitAngle, to fix angle interpolation on spawning objects"
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
2022-04-26 20:56:34 -05:00
Eidolon
5790168194 Convert P_TeleportMove use to origin funcs 2022-04-26 20:56:34 -05:00
Sally Coolatta
e4930535f3 P_InitAngle, to fix angle interpolation on spawning objects 2022-04-26 20:56:31 -05:00
aiire
c4bb90fb0c do the thing 2022-04-21 16:55:57 +00:00