stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-02 22:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
14563 commits 180 branches 42 tags 328 MiB
Commit graph

12898 commits

Author SHA1 Message Date
spherallic
c2c430853c If Lua disabled intermission emeralds, skip sounds 2023-04-19 20:17:50 +02:00
spherallic
6ff37b47d9 Skip emerald bounce logic in Y_Ticker on dedicated 2023-04-19 12:13:29 +02:00
spherallic
e5a1fee759 Adjust default look/turn axis for new SDL2 version 2023-04-19 00:21:10 +02:00
Gustaf Alhäll
ad412c9700
Fix segfault when damaging mobj with no painstate 2023-04-18 22:08:26 +02:00
Gustaf Alhäll
072dd2eda7
Fix segfault when removing source from ShouldDamage 2023-04-18 20:46:13 +02:00
spherallic
3135cd37e6 Merge branch 'next' into public_next 2023-04-18 02:05:19 +02:00
spherallic
e4f92cc667 Always important 2023-04-18 02:04:23 +02:00
sphere
57b0dfcfac Merge branch 'nobotcamerareset' into 'next' 
Don't call P_ResetCamera when spawning a bot

Closes #971

See merge request STJr/SRB2!1966
 2023-04-18 00:01:04 +00:00
spherallic
930b1355ed Don't call P_ResetCamera when spawning a bot 2023-04-14 12:03:21 +02:00
spherallic
c61594931d Fix titlecard hook being inconsistent on map load 2023-04-14 00:28:14 +02:00
spherallic
488f0fdfab bruh 2023-04-12 20:06:02 +02:00
spherallic
9499cb5409 Merge branch 'next' into public_next 2023-04-12 19:51:17 +02:00
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
MascaraSnake
6258f14bab Merge branch 'setcontrol-buffer-overflow' into 'next' 
Fix buffer overflow in setcontrol with 2 arguments

See merge request STJr/SRB2!1954
 2023-04-12 09:20:33 +00:00
MascaraSnake
4f8625ef76 Merge branch 'metal-sonic-use-after-free' into 'next' 
Fix use-after-free when Metal Sonic charges energy balls

See merge request STJr/SRB2!1956
 2023-04-12 09:20:00 +00:00
MascaraSnake
d6375b1e18 Merge branch 'fix-wallspike-segfault' into 'next' 
Fix segfault when destroying wall spike while it moves

See merge request STJr/SRB2!1959
 2023-04-12 09:19:50 +00:00
MascaraSnake
29582e453d Merge branch 'ptera-escape-bad-state' into 'next' 
Fix crash during debug when escaping pterabyte

See merge request STJr/SRB2!1960
 2023-04-12 09:19:40 +00:00
MascaraSnake
efee750874 Merge branch 'mapheader-alloc-fix' into 'next' 
Fix R_SkinUsable crashes in (some) custom addons

Closes #994

See merge request STJr/SRB2!1962
 2023-04-12 08:01:50 +00:00
MascaraSnake
9e8200c1e3 Merge branch 'ambient-sound-fix' into 'next' 
Fix custom ambient sound mobjs not working

See merge request STJr/SRB2!1961
 2023-04-12 08:01:38 +00:00
spherallic
4b6de096e5 Define cv_addons_folder in dedicated 2023-04-12 00:59:08 +02:00
Gustaf Alhäll
cf67ba1d01
fixup! Fix segfault when killing wall spike while it moves 2023-04-11 22:51:18 +02:00
Gustaf Alhäll
cb849ca4f0
Fix segfault when first mobj in overlaycap is removed 2023-04-11 22:13:29 +02:00
MascaraSnake
8486bd083a R_SkinUsable: Only check header of current map if one exists 2023-04-11 19:13:30 +02:00
MascaraSnake
846cf71e6a F_StartTitleScreen: Make sure the level header for gamemap always exists 2023-04-11 18:48:23 +02:00
MascaraSnake
1cd5e10ab0 Fix custom ambient sound mobjs not working 2023-04-11 16:19:27 +02:00
Gustaf Alhäll
4c02bde4e9
Fix crash during debug when escaping pterabyte 2023-04-10 18:31:12 +02:00
Gustaf Alhäll
8b77af7378
Fix segfault when killing wall spike while it moves 2023-04-10 14:55:19 +02:00
MascaraSnake
16ad23f06d Fix flag mixup in P_GetOldFOFFlags() 2023-04-10 14:08:53 +02:00
Gustaf Alhäll
8218ce0fe2
Fix use-after-free when Metal Sonic charges energy balls 2023-04-07 14:49:31 +02:00
Gustaf Alhäll
2e3963fd16
Fix buffer overflow for setcontrol with 2 arguments 2023-04-02 21:58:42 +02:00
spherallic
9d6456c326 Merge branch 'next' into public_next 2023-04-02 19:33:16 +02:00
sphere
3c81938496 Merge branch 'io-limit' into 'next' 
Add basic rate limitation for Lua file access

See merge request STJr/SRB2!1947
 2023-03-31 16:13:42 +00:00
sphere
3f499178b0 Merge branch 'forceverticalflipflag' into 'next' 
Add flag to action 433 to force MFE_VERTICALFLIP

See merge request STJr/SRB2!1948
 2023-03-31 16:13:23 +00:00
sphere
e82bb933e7 Merge branch 'botchanges' into 'next' 
Bot adjustments

See merge request STJr/SRB2!1951
 2023-03-31 16:13:05 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
91ef59f76b Fix tiny regression with special stage tally 2023-03-31 13:36:54 +02:00
spherallic
498c9da859 Don't attract bomb spheres with Attraction shield 2023-03-29 16:41:45 +02:00
spherallic
540c5d6cc0 Add flag to action 433 to force MFE_VERTICALFLIP 2023-03-20 15:46:15 +01:00
LJ Sonic
0f9c5582a3 Add basic rate limitation for Lua file access 2023-03-19 14:52:12 +01:00
LJ Sonic
62aef145f5 Fix time functions not starting from zero 2023-03-19 14:44:18 +01:00
MascaraSnake
fff6683173 Clean up PIT_ChangeSector 2023-03-16 20:38:28 +01:00
MascaraSnake
afa1a9ab6a Split P_CheckSector further 2023-03-16 20:03:42 +01:00
MascaraSnake
411b79e456 P_CheckSector: Remove unnecessary static variables 2023-03-16 19:38:30 +01:00
MascaraSnake
0667bf74fe Remove duplicated code in P_CheckSector 2023-03-16 19:30:21 +01:00
MascaraSnake
1304874a8f Remove incorrect early returns in P_CheckSector 2023-03-16 19:17:42 +01:00
James R
07e4497320 Add COM_LUA to a bunch of commands 
These commands be run from Lua:

- add
- addfile
- addfolder
- archivetest
- ban
- banip
- causecfail
- cecho
- cechoduration
- cechoflags
- changeteam
- changeteam2
- charability
- charspeed
- cheats
- clearbans
- clearscores
- connect
- countmobjs
- csay
- demote
- devmode
- displayplayer
- downloads
- drop
- droprate
- dumplua
- echo
- exitgame
- exitlevel
- gametype
- getallemeralds
- getplayernum
- god
- gravflip
- help
- hurtme
- isgamemodified
- jumptoaxis
- kick
- listwad
- login
- manual
- map
- mapmd5
- masterserver_update
- memdump
- memfree
- mod_details
- motd
- noclip
- nodes
- notarget
- numnodes
- numthinkers
- objectplace
- password
- pause
- ping
- playintro
- promote
- quit
- reloadbans
- resendgamestate
- resetcamera
- resetemeralds
- restartaudio
- retry
- rteleport
- runsoc
- savecheckpoint
- say
- sayteam
- sayto
- scale
- screenshot
- serverchangeteam
- setcontinues
- setlives
- setrings
- showbanlist
- showmap
- showscores
- showtime
- skynum
- startmovie
- stopdemo
- stopmovie
- suicide
- teleport
- toggle
- togglemodified
- toggletwod
- tunes
- version
- vid_info
- vid_modelist
- vid_nummodes
- weather
 2023-03-15 17:22:56 -07:00
James R
49f1462f75 Only let Lua run commands registered with COM_LUA 2023-03-15 16:40:21 -07:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
James R
0405df1a47 Merge COM_SAFE with other COM flags 
Renames COM_SAFE to COM_LUA.
 2023-03-15 16:40:21 -07: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
James R
15e3d0e667 Fix toggle command and add command being able to bypass Lua restriction 2023-03-15 16:40:21 -07:00
James R
5d08bfd706 Rename CV_NOLUA to CV_ALLOWLUA, opt IN to Lua mutability 2023-03-15 16:40:21 -07:00
James R
a39f69c9c7 Reset com_flags at end of COM_BufExecute 
Fixes com_flags being discarded after the first command in
a chain (semicolon list).
 2023-03-15 16:40:21 -07:00
James R
e48786961a exec: pass on com_flags 2023-03-15 16:40:21 -07:00
James R
db4de0f50e sdl/i_video.c: fix compile prior to SDL 2.0.18 2023-03-15 16:39:53 -07:00
Tatsuru
2a50626b00 Initial commit 2023-03-15 17:50:13 -03:00
spherallic
b184067048 Add HUD icons for timed NiGHTS powerups 2023-03-14 14:19:53 +01:00
LJ Sonic
404492cb30 Merge branch 'floorspriteslope-interp-disable' into 'next' 
Disable floor splat slope interpolation

See merge request STJr/SRB2!1934
 2023-03-13 18:28:31 +00:00
LJ Sonic
ac4d89e4d8 Merge branch 'sw-vsync-fix' into 'next' 
Fix software vsync

See merge request STJr/SRB2!1940
 2023-03-13 18:28:28 +00:00
spherallic
a95f5ba7ea Merge branch 'next' into public_next 2023-03-13 12:03:24 +01:00
spherallic
57148ef9c2 Fix Explosion Ring explosion interpolation 2023-03-02 18:10:47 +01:00
spherallic
94396a9f9d Merge branch 'next' into fullscreen-toggle 2023-03-02 12:14:42 +01:00
MascaraSnake
b5c3b30f13 Merge branch 'fix-wnon-literal-null-conversion-and-wconstant-conversion' into 'next' 
Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings

See merge request STJr/SRB2!1929
 2023-03-02 09:12:24 +00: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
sphere
171f5ac21c Merge branch 'ambush-fix' into 'next' 
Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps

Closes #958

See merge request STJr/SRB2!1937
 2023-02-28 13:59:38 +00:00
sphere
b4e1f2d4ff Merge branch 'udmf-defaults' into 'next' 
Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty

Closes #973

See merge request STJr/SRB2!1936
 2023-02-28 13:59:35 +00:00
sphere
684566ebc4 Merge branch 'emblem-fix' into 'next' 
Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems

Closes #963

See merge request STJr/SRB2!1935
 2023-02-28 13:59:32 +00:00
sphere
51d32f87ba Merge branch 'deprecation-warnings' into 'next' 
Deprecated map effect stuff

Closes #956

See merge request STJr/SRB2!1933
 2023-02-28 13:59:30 +00:00
sphere
89e7ef16cc Merge branch 'issue711' into 'next' 
Fixes Issue #711

See merge request STJr/SRB2!1907
 2023-02-28 13:51:35 +00:00
Eidolon
c42ef9f1be Fix IT and ctf flag sign interpolation 2023-02-27 18:28:34 -06:00
sphere
7eabccbfac Merge branch 'issue568' into 'next' 
Fixes issue #568

Closes #568

See merge request STJr/SRB2!1913
 2023-02-27 20:37:50 +00: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
Eidolon
a32dc3daa0 Fix software vsync 
This pre-SDL 2.0.18 hack from the interp branch is no longer needed when
building with a new enough SDL version. This makes vid_wait toggleable
at all times if SDL is at least 2.0.18.
 2023-02-26 17:57:44 -06:00
MascaraSnake
bb9e7045c5 Fix wrong flag being checked in P_ProcessTeamBase 2023-02-25 15:43:51 +01:00
MascaraSnake
6e7ff69720 Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps 2023-02-25 15:03:52 +01:00
MascaraSnake
283f7e8919 Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty 2023-02-25 13:24:14 +01:00
MascaraSnake
d58dad7f98 Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems 2023-02-25 11:58:12 +01:00
Eidolon
9a9a16183f Disable floor splat slope interpolation 
Getting these to interpolate correctly is proving to be an absolute
ordeal and I would rather have them look correct-but-not-interpolated
than completely broken.
 2023-02-24 18:49:09 -06:00
MascaraSnake
aba57612d5 -Only print deprecated map effect warnings once on map load 
-Add missing unsupported effect warnings to P_WriteTextmap
-Apply spikes MSF_TRIGGERSPECIAL_TOUCH hack in UDMF too
 2023-02-19 07:27:16 +01:00
Eidolon
707860815b Merge GitHub PR #514 into next 
fix ARM builds being completely broken

Conditionally adds -mno-ms-bitfields based on architecture, as this is
only relevant on Intel architectures.

https://github.com/STJr/SRB2/pull/514
 2023-02-08 21:15:04 -06:00
cobalt2727
4f8d2fcdc8
fix ARM builds being completely broken 
If merged, this is the quickest approach to resolve https://github.com/STJr/SRB2/issues/513

...alternatively, we could just remove the option altogether but I don't have the time right now to test whether it's needed or not

To the best of my knowledge, this covers all possible amd64 `CMAKE_SYSTEM_PROCESSOR` values based on what I'm seeing at https://stackoverflow.com/questions/70475665/what-are-the-possible-values-of-cmake-system-processor
 2023-02-08 14:46:09 -05:00
Zwip-Zwap Zapony
702b2acfd3 Limit con_hudtime to 24 hours 
Also rename cons_msgtimeout to cons_hudtime for consistency
 2023-02-04 17:35:44 +01:00
Zwip-Zwap Zapony
cc6eac0886 Fix con_hudlines being off by one 2023-02-04 17:34:43 +01:00
spherallic
4a1e99729b Merge branch 'next' into public_next 2023-01-31 15:47:11 +01:00
sphere
337a94eb99 Merge branch '2211-gamepaddefaults' into 'next' 
Change gamepad defaults for 2.2.11

Closes #813

See merge request STJr/SRB2!1928
 2023-01-31 14:43:30 +00:00
MascaraSnake
efca1eccca Merge branch 'floormover-tag-fix' into 'next' 
EV_DoFloor: Set dummy tag correctly for chained linedef executing

Closes #932

See merge request STJr/SRB2!1898
 2023-01-28 06:33:11 +00:00
MascaraSnake
02fa860c46 Merge branch 'thingonspecial3dfloor' into 'next' 
Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility

See merge request STJr/SRB2!1905
 2023-01-28 06:32:42 +00:00
MascaraSnake
6055b1490b Merge branch 'udmf-triggerer' into 'next' 
UDMF: Use string values for the sector "triggerer" field

See merge request STJr/SRB2!1902
 2023-01-28 06:32:29 +00:00
MascaraSnake
c25cb5732d Merge branch 'specialstagepit-fix' into 'next' 
Disable exit sectors in non-NiGHTS special stages because they interfere with the pits

Closes #930

See merge request STJr/SRB2!1900
 2023-01-28 06:32:16 +00:00
Jaime Ita Passos
b64dac714f Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings 2023-01-28 00:18:55 -03:00
spherallic
a6599c176d Change gamepad defaults for 2.2.11 2023-01-27 16:49:53 +01:00
Arthur
20724ad70b Also retain PF_CANCARRY 2023-01-27 09:46:02 -05:00
spherallic
3bc519ed65 Merge branch 'next' into bbox 2023-01-27 14:59:39 +01: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
MascaraSnake
c84a71dcf5 Merge branch 'splitscreen-hooks' into 'next' 
Handle splitscreen lua hud lists separately

Closes #935

See merge request STJr/SRB2!1925
 2023-01-27 13:53:23 +00:00
MascaraSnake
5c91d78fcb Merge branch 'rollangle-parity' into 'next' 
Invert OpenGL rollangle for papersprites to match software renderer behaviour

Closes #849

See merge request STJr/SRB2!1924
 2023-01-27 13:52:00 +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
366ee4ad92 Revert "Merge branch 'gamepad-refactor-lua-features' into 'next'" 
This reverts commit 7f1cafcd3d, reversing
changes made to 696e2ab909.
 2023-01-26 19:26:24 -06:00
Eidolon
6cc48a6e89 Revert "Merge branch 'gamepad-refactor-lua-rumble' into 'next'" 
This reverts commit 7d8e8e20b7, reversing
changes made to 7f1cafcd3d.
 2023-01-26 19:26:21 -06:00
Eidolon
7ad54af89f Revert "Fix axis inversion and camera look inversion" 
This reverts commit 6428d6fc61.
 2023-01-26 19:26:17 -06:00
Eidolon
bbf6e8ccce Revert "sdl: SDL version-guard controller type and hidapi" 
This reverts commit ec58b1504d.
 2023-01-26 19:26:02 -06:00
Eidolon
2810a46095 Revert "sdl: Version-guard rumble and extended buttons" 
This reverts commit f5f224136b.
 2023-01-26 19:25:59 -06:00
Eidolon
40a5580e65 Revert "sdl: Yet more SDL rumble version-guards" 
This reverts commit df28ffd72e.
 2023-01-26 19:25:56 -06:00
Eidolon
f9c9e0829a Revert "sdl: I can't believe it's more version-guards" 
This reverts commit fdb6f2aff9.
 2023-01-26 19:25:53 -06:00
Eidolon
5827a19b89 Revert "Merge branch 'controller-fixes' into 'next'" 
This reverts commit 71736f358f, reversing
changes made to 4e3f78784a.
 2023-01-26 19:24:52 -06:00
Eidolon
bbd4cff75c Revert "Merge branch 'gamepadtweaks' into 'next'" 
This reverts commit 96bfd8cea7, reversing
changes made to 24f9ec4ec4.
 2023-01-26 19:24:21 -06:00
Eidolon
f1a7494a31 Handle splitscreen lua hud lists separately 
Fixes STJr/SRB2#935 by ensuring each drawlist is drawn separately while
stplyr is set correctly.
 2023-01-26 08:59:51 -06:00
Lach
42fa7f4723 Invert OpenGL rollangle for papersprites to match software renderer behaviour 2023-01-26 15:29:35 +11:00
Eidolon
b02707a4ee Adjust caption pop-in by tics instead of frames 
Fixes STJr/SRB2#900 pop-in animation being affected by framerate
 2023-01-25 21:09:50 -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
Eidolon
6c54af3774 Fix precip interpolation 
Fixes STJr/SRB2#916
 2023-01-25 21:09:50 -06:00
Alam Ed Arias
43eb7526c0 Update http-mserv.c 2023-01-20 19:00:50 +00: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
fe304ae2db Cleanup comments 2023-01-15 13:10:23 +01:00
LJ Sonic
d1ba9e0afd Cleanup 2023-01-15 13:08:31 +01:00
LJ Sonic
425fce69c9 Add missing include directive 2023-01-14 20:02:20 +01:00
LJ Sonic
823fa5d27b Cleanup 2023-01-14 20:02:06 +01:00
LJ Sonic
9291416a90 Split SV_SendTics into functions 2023-01-14 19:01:36 +01:00
LJ Sonic
530a03cc7d Fix function name 2023-01-14 15:14:09 +01:00
LJ Sonic
aa18d5c3ff Move net command sending to a new function 2023-01-14 14:53:27 +01:00
LJ Sonic
4081dd8edf Move net command copying to a new function 2023-01-14 14:52:13 +01:00
LJ Sonic
a7a3f97c7b Split PT_ClientCmd into functions 2023-01-14 14:49:33 +01:00
LJ Sonic
0859a1597f Add missing include directive 2023-01-13 22:28:03 +01:00
LJ Sonic
2a360a4201 Reorder functions in d_clisrv.c 2023-01-13 22:05:57 +01:00
spherallic
207053a023 Prevent A_LobShot from dividing by 0 2023-01-13 17:10:50 +01:00
LJ Sonic
ab23b445b0 Move netgame commands to a new file 2023-01-12 19:40:31 +01:00
sphere
96bfd8cea7 Merge branch 'gamepadtweaks' into 'next' 
Gamepad fixes & changes

Closes #813

See merge request STJr/SRB2!1899
 2023-01-11 12:54:24 +00:00
LJ Sonic
18bfc3266a Remove reboundstore timeout hack 2023-01-09 22:14:58 +01:00
LJ Sonic
62cfb0eb81 Fix clients not being able to join servers 2023-01-09 21:39:33 +01:00
LJ Sonic
1eb801399b Move comment to an appropriate place 2023-01-08 16:33:21 +01:00
LJ Sonic
5a608120ff Simplify convoluted code 2023-01-08 16:28:41 +01:00
LJ Sonic
62986da9da Remove useless variable 2023-01-08 13:27:08 +01:00
MascaraSnake
24f9ec4ec4 Merge branch 'fffff' into 'next' 
Fix fox follower's flickering flindicator (fixes #819)

Closes #819

See merge request STJr/SRB2!1918
 2023-01-08 10:28:48 +00:00
LJ Sonic
75b52171d2 Call all packet handlers from the same place 2023-01-08 00:47:33 +01:00
LJ Sonic
db85e956c9 Rename packet handlers to match their associated PT_ constants 2023-01-08 00:46:12 +01:00
LJ Sonic
fef13b630c Remove outdated or misleading comments 2023-01-08 00:43:18 +01:00
LJ Sonic
4a2fd43aff Add missing _pak suffix to a few packet structures 2023-01-07 16:14:41 +01:00
LJ Sonic
7240ed22de Add missing PT_ prefix to a few packet handlers 2023-01-07 15:57:17 +01:00
LJ Sonic
dfdbdee0a8 Move netcode console variables to appropriate files 2023-01-07 15:57:04 +01:00
LJ Sonic
94ba47a950 Remove unused stuff 2023-01-07 13:37:33 +01:00
LJ Sonic
d1c5f7adcc Move gamestate handling to a new file 2023-01-07 13:01:48 +01:00
MascaraSnake
f50e7f2515 Merge branch 'more-use-afters-frees' into 'next' 
Fix use after free bug

See merge request STJr/SRB2!1867
 2023-01-07 10:37:32 +00:00
MascaraSnake
6ece0f1a00 Merge branch 'fix-hurtmsg-hook' into 'next' 
Fix HurtMsg inflictor mobj type discriminator

Closes #874

See merge request STJr/SRB2!1903
 2023-01-07 10:32:58 +00:00
MascaraSnake
71d10ec579 Merge branch 'fishjump-fix' into 'next' 
Fix scaling mistake in A_FishJump

Closes #939

See merge request STJr/SRB2!1915
 2023-01-07 10:32:43 +00:00
katsy
20cd8cefd1 fix flickering flight indicator 2023-01-06 18:41:35 -06:00
sphere
cdf896b22f Merge branch 'nightshoopsanity' into 'next' 
Allow setting NiGHTS hoop pitch & yaw in degrees (in binary map format)

See merge request STJr/SRB2!1892
 2023-01-06 23:54:26 +00:00
LJ Sonic
f1ad1bf13e Declare data exchanged through the network to a new file 2023-01-05 23:48:44 +01:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00
katsy
3a04e11743 allow targeting invulnerable bosses 2023-01-05 14:11:54 -06:00
spherallic
ca8842fa45 Merge branch 'next' into gamepadtweaks 2023-01-04 09:01:55 +01:00
MascaraSnake
5bbfb1840a Fix scaling mistake in A_FishJump 2023-01-04 08:58:40 +01:00
Eidolon
c270cca55f Always swallow pad axis events when menu is active 
This prevents axis events from trickling out of the menu and taking
effect in G_Responder when they aren't hitting the digital deadzone
needed to be mapped into internal menu key events.
 2023-01-03 14:39:15 -06:00
Eidolon
eeff182abb Reverse axis event mapping in G_RemapGamepadEvent 
Was erroneously mapping events inside the deadzone as key down and vice
versa.
 2023-01-03 14:09:12 -06:00
Arthur
28f97dcd0b Also fix STJr/SRB2#618 since it is highly related. 2023-01-02 08:07:13 -05:00
Arthur
af146071d8 Check for spindash ability and dashspeed being > 0 before indiscriminately setting roll animation. 2023-01-02 07:34:33 -05:00
Arthur
7d53e4647b Fixes issue #568 2023-01-01 21:07:15 -05:00
Arthur
bd89b97e0a Fixes issue #704 2023-01-01 20:59:11 -05:00
Eidolon
4e3f78784a Merge branch 'MSVC-fix' into 'next' 
MSVC project file works again! Supports Visual Studio 2022.

See merge request STJr/SRB2!1904
 2023-01-01 19:19:13 +00:00
Ashnal
7800c9e5c9 Fix use after free bug 2023-01-01 12:31:12 -06:00
Eidolon
fdff419818 Merge branch 'hms-useragent' into 'next' 
http-mserv: add SRB2-specific user agent string

See merge request STJr/SRB2!1893
 2023-01-01 18:21:01 +00:00
LJ Sonic
b461cb919b Move server-side connection handling to a new file 2023-01-01 11:45:09 +01:00
MascaraSnake
e472c551e1 Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility 2023-01-01 11:31:44 +01:00
Arthur
52384053ce When attaching to a wall to do a climb, the second sidedef wasn't be handled properly. 2022-12-31 22:46:08 -05:00
Arthur
bc519ad132 Fix for issue #933 - special stage tokens should divert player until after the special stage with a custom exit map 2022-12-31 22:07:22 -05:00
Arthur
e909f8ec12 Fixes Issue #711 2022-12-31 21:06:39 -05:00
Arthur
449d27749f Fixes Issue #912 2022-12-31 20:30:39 -05:00
Arthur
636e6d8c14 MSVC project file works again! Supports Visual Studio 2022. 
Also fixed issues with the d_netcmd.c file/folder adding logic.
 2022-12-31 19:35:07 -05:00
LJ Sonic
4660d3cab6 Move client connection handling to a new file 2022-12-31 21:37:35 +01:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
James R
fbcdaa6f4d hooklib: move HurtMsg to mobj hooks 
Fixes regression of mobj type discriminator not working
for this hook.

blame 8d382e49fb
 2022-12-31 04:26:13 -08:00
James R
a895a5c374 hooklib: pass NULL mobj to only run mobj hooks with no type discriminator 2022-12-31 04:20:31 -08: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
MascaraSnake
193a592d46 Merge branch 'dyn-alloc-action-name' into 'next' 
Dynamically allocate space for a state's action field

See merge request STJr/SRB2!1478
 2022-12-31 09:35:15 +00:00
sphere
e401f77524 Merge branch 'extend-ip-textbox' into 'next' 
Extend the length of the Connect via IP textbox.

See merge request STJr/SRB2!1410
 2022-12-31 09:06:28 +00:00
sphere
e301268af7 Merge branch 'nodepthset' into 'next' 
Don't force bit depth to 8-bit when setting default video mode

See merge request STJr/SRB2!1733
 2022-12-31 09:01:27 +00:00
MascaraSnake
eac31dbac0 Merge branch 'metal-sonic-fixes' into 'next' 
Metal Sonic boss fight fixes

Closes #93 and #931

See merge request STJr/SRB2!1896
 2022-12-31 08:55:05 +00:00
MascaraSnake
ca039ad49b Merge branch 'node-shit' into 'next' 
Fix a few rendering errors

See merge request STJr/SRB2!1901
 2022-12-31 08:52:36 +00:00
LJ Sonic
05d232c029 Delete netcode 
Just kidding, I just deleted NONET
 2022-12-30 15:07:57 +01:00
LJ Sonic
e519f306fb Ignore duplicate PT_CLIENTJOIN packets 2022-12-30 14:03:32 +01:00
LJ Sonic
6ae44fe91d Rename ConnectionRefused to be more descriptive 2022-12-30 14:01:37 +01:00
LJ Sonic
c9dc44c2f6 Cleanup HandleConnect 2022-12-30 14:01:03 +01:00
LJ Sonic
d561b5a0bf Remove broken joinnextround console variable 2022-12-30 13:10:01 +01:00
MascaraSnake
6bbb032581 UDMF: Use string values for the sector "triggerer" field 2022-12-30 11:19:29 +01:00
MascaraSnake
0a0da81007 Fix typo 2022-12-30 07:52:19 +01:00
LJ Sonic
388505db62 Remove unneeded numplayerswaiting field 2022-12-30 02:46:59 +01:00
LJ Sonic
f27de6c324 Remove useless condition 2022-12-30 01:48:26 +01:00
LJ Sonic
ba91520eab Remove useless return value for SV_AddWaitingPlayers 2022-12-30 00:24:06 +01:00
LJ Sonic
36613d58e9 Cleanup sphere redistribution 2022-12-29 22:30:26 +01:00
LJ Sonic
6806fbce45 Fix sphere redistribution 2022-12-29 22:16:08 +01:00
LJ Sonic
dc39957539 Move sphere redistribution to its own function 2022-12-29 21:28:53 +01:00
LJ Sonic
2b2797ec66 Move player-node unlinking to a function 2022-12-29 20:48:17 +01:00
LJ Sonic
dc716d9ece Cleanup ResetNode 2022-12-29 20:45:56 +01:00
LJ Sonic
e6e9eef0e2 Merge node arrays into a structure 2022-12-29 15:52:45 +01:00
LJ Sonic
262ed6b7f3 Split packet handling switch into functions 2022-12-29 10:23:12 +01:00
LJ Sonic
33c76453e1 Remove snake_ prefix 2022-12-28 18:50:00 +01:00
LJ Sonic
ffbe140af5 Move snake minigame to its own files 2022-12-28 16:12:05 +01:00
LJ Sonic
d03ef0a441 Fix HOMs in large rooms 
Credits go to Lactozilla
 2022-12-27 20:31:55 +01:00
LJ Sonic
c8e579618a Fix maps with more than 65535 segs not working correctly 
This renders the "quadrant hack" and ZenNode largely useless
 2022-12-27 20:29:15 +01:00
LJ Sonic
58e5473c9e Fix integer overflow with diagonal node splits 
Fixes random invisible walls and possibly more errors
 2022-12-27 20:26:38 +01:00
MascaraSnake
937127e987 Disable exit sectors in non-NiGHTS special stages because they interfere with the pits 2022-12-27 16:49:52 +01:00
spherallic
d7606fd85a { 2022-12-27 13:48:42 +01:00
spherallic
f5ede24775 Fix gamepad being unable to skip tutorial prompt 2022-12-27 11:44:56 +01:00
MascaraSnake
3b9ed3e802 EV_DoFloor: Set dummy tag correctly for chained linedef executing 2022-12-27 10:54:24 +01:00
MIDIManNoah
98d544b459 Make some fixes for Metal Sonic's boss fight 2022-12-23 22:19:09 -05:00
spherallic
f3988231d4 Convert old joy## constants 2022-12-22 14:40:35 +01:00
spherallic
1964869c69 Remove redundant control axes & cleanup 2022-12-22 01:40:33 +01:00
spherallic
b772c3a00d Remove "controls per key" option 2022-12-22 00:02:30 +01:00
spherallic
7abdab09bd Check double usage per-player, remove 2.1 code 2022-12-21 23:51:24 +01:00
Lamibe
c1b85b212d Increased maxsend to 200MB 2022-12-19 10:38:17 +01:00
spherallic
a85876d0c2 Change gamepad defaults again, post-refactor 2022-12-16 01:25:54 +01:00
Eidolon
003ee55ccd http-mserv: add SRB2-specific user agent string 2022-12-13 11:44:27 -06:00
Eidolon
ba2a4f06d4 Merge branch 'next' into public_next 2022-12-10 22:04:41 -06:00
Eidolon
30df486dac Update zones.pk3 hash for pre3 (oops) 2022-12-10 15:32:06 -06:00
Eidolon
fdb6f2aff9 sdl: I can't believe it's more version-guards 2022-12-10 02:47:53 -06:00
Eidolon
df28ffd72e sdl: Yet more SDL rumble version-guards 2022-12-10 02:42:14 -06:00
Eidolon
f5f224136b sdl: Version-guard rumble and extended buttons 2022-12-10 02:34:33 -06:00
Eidolon
ec58b1504d sdl: SDL version-guard controller type and hidapi 2022-12-10 02:19:05 -06:00
Eidolon
9e191d0748 Bump SRB2VERSION and MODVERSION for 2.2.11 pre3 2022-12-08 21:27:24 -06:00
Eidolon
4c72154d4f Merge remote-tracking branch 'local-SRB2/next' into public_next 2022-12-08 21:26:28 -06:00
Eidolon
6428d6fc61 Fix axis inversion and camera look inversion 2022-12-08 21:25:10 -06:00
Eidolon
7d8e8e20b7 Merge branch 'gamepad-refactor-lua-rumble' into 'next' 
Add haptic functions for Lua scripting

See merge request STJr/SRB2!1872
 2022-12-09 02:17:17 +00:00
Eidolon
7f1cafcd3d Merge branch 'gamepad-refactor-lua-features' into 'next' 
Add gamepad library and hooks for Lua scripting

See merge request STJr/SRB2!1871
 2022-12-09 02:17:03 +00:00
Eidolon
696e2ab909 Merge branch 'gamepad-refactor' into next 
Some hacks from the snake minigame patch have been removed as they are
no longer needed.

See STJr/SRB2!1870

# Conflicts:
#	src/g_game.c
#	src/g_input.c
 2022-12-08 20:00:41 -06:00
Eidolon
d98d59494f Add missing level-load view reset from RR 2022-12-08 18:21:37 -06:00
sphere
b9c677e537 Merge branch 'triggerafterxcalls' into 'next' 
Fix callcount typo

Closes #922

See merge request STJr/SRB2!1890
 2022-12-08 12:25:03 +00:00
spherallic
d0a91646ef Allow setting hoop pitch/yaw in degrees (binary) 2022-12-07 12:34:35 +01:00
Eidolon
df131ef131 Bump SRB2VERSION and MODVERSION for 2.2.11 pre2 2022-12-06 18:43:59 -06:00
Eidolon
aac04b818c Merge branch '22-safe-addfolder' into 'public_next' 
Path security checks for addfile, addfolder and exec

See merge request STJr/SRB2Internal!633
 2022-12-07 00:43:31 +00:00
Eidolon
5cb13f9d1c Bump SRB2VERSION and MODVERSION for 2.2.11 pre1 2022-12-06 18:39:32 -06:00
Eidolon
cf699f23f9 Merge branch 'next' into public_next 2022-12-06 18:39:06 -06:00
Eidolon
9a7d15761d Merge branch '22-exec-files-only' into 'public_next' 
Fix exec crashing with out of memory if opening a directory

See merge request STJr/SRB2Internal!634
 2022-12-06 08:42:04 +00:00
Eidolon
6d44eb8016 Revert previous RemoveMobjInterpolator move 
Matching Ring Racers. Previous move was actually a mistake on the Kart
port. Done so there is never a condition where the interpolator isn't
removed.
 2022-12-05 17:22:01 -06:00
Eidolon
5bb7a527a1 Remove mobj interp. on early-free in P_RemoveMobj 
Fixes a crash that occurred frequently in special stages/NiGHTS.
 2022-12-04 22:25:23 -06:00
MascaraSnake
2cc7fe2bf0 Fix callcount typo 2022-12-04 09:14:55 +01:00
sphere
153def463f Merge branch 'fix-downloadsnakeconcent' into 'next' 
[Snake Controller Fix] fix NONET builds

See merge request STJr/SRB2!1888
 2022-11-29 12:07:57 +00:00
sphere
2e3253592a Merge branch 'polyvisiblefix' into 'next' 
Fix PolyObject visibility/tangibility constants

See merge request STJr/SRB2!1886
 2022-11-29 11:28:57 +00:00
sphere
cef1cc3fdc Merge branch 'dynslope-fix' into 'next' 
Dynamic slope vertices: Allow untagged vertices which don't move

Closes #917

See merge request STJr/SRB2!1885
 2022-11-29 11:28:55 +00:00
Zwip-Zwap Zapony
4e303ec59d better ifdef 2022-11-26 20:46:25 +00:00
ashifolfi
9cec9fbe97 fix NONET builds 2022-11-26 15:34:32 -05:00
LJ Sonic
c025c3408b Merge branch 'reverse-viewpoint-switch' into 'next' 
Better viewpoint switching

See merge request STJr/SRB2!1875
 2022-11-26 15:17:56 +00:00
LJ Sonic
5a38bbbbf5 Merge branch 'fix-downloadsnakeconcent' into 'next' 
Fix Download Consent/Snake minigame not having controller support

Closes #836 and #835

See merge request STJr/SRB2!1883
 2022-11-26 15:14:35 +00:00
Ace Lite
da9786b593 exposed floorlightsec, ceilinglightsec variables. 2022-11-25 23:16:11 +00:00
Ace Lite
656f7f94ac hw_main.c ceiling_y/xoffs renamed 2022-11-25 23:06:22 +00:00
Ace Lite
c5daa248d1 r_fps.c ceiling_y/xoffs renamed 2022-11-25 23:06:07 +00:00
Ace Lite
3217984f55 c-side offset/angle variable renamed 2022-11-25 23:01:27 +00:00
Ace Lite
9d4a3b91c3 change names of Lua variables for last time. 2022-11-25 22:27:41 +00:00
LJ Sonic
ddc708ac87 Remove shift+F12 shortcut 
This would conflict if your shift key is bound to a control =((
 2022-11-25 22:40:28 +01:00
sphere
0218f9c2fa Merge branch 'fix-suspicious-statue' into 'next' 
Fix suspicious statue still being tangible for ~40 tics after spawning lance-a-bot

Closes #856

See merge request STJr/SRB2!1882
 2022-11-25 19:51:15 +00:00
MascaraSnake
4de3ed0ab1 Fix PolyObject visibility/tangibility constants 2022-11-25 18:03:58 +01:00
MascaraSnake
1e6150e7fe Dynamic slope vertices: Allow untagged vertices which don't move 2022-11-24 22:20:54 +01:00
spherallic
ba1bad7a96 Merge branch 'next' into fullscreen-toggle 2022-11-24 21:41:06 +01:00
Ace Lite
27c6afb80b Yikes. how did I miss "_" on every single variable 2022-11-24 18:51:53 +00:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
Ace Lite
e789bf1fb2 Fix for consistency 
just *angle for *_angle
 2022-11-23 17:29:44 +00:00
ashifolfi
29aad5b7d5 WOW ITS A GOOD THING I DIDNT FORGET THIS HUH? 2022-11-23 12:27:01 -05:00
ashifolfi
8f5f5c1e22 hack and a half but joystick works now 2022-11-23 12:23:51 -05:00
Ace Lite
34cc1d1cc4 Exposed floor/ceiling pic x/y offsets to Lua. 2022-11-23 17:09:54 +00:00
ashi
1fb6adf390 change |= to &= 2022-11-23 16:22:52 +00:00
ashifolfi
741b1f415d very cool of vscode to not save when I told it to 2022-11-23 11:18:33 -05:00
LJ Sonic
7454235882 Merge branch 'mapmusname-fix' into 'next' 
Fix mapmusname not overwriting Lua-provided strings (resolves #880)

Closes #880

See merge request STJr/SRB2!1803
 2022-11-23 09:40:43 +00:00
James R
5411d522e5 r_bbox.c: use size_t to access column array 2022-11-22 18:13:40 -08:00
James R
8430dfa063 Fix copyright year in r_bbox.c 2022-11-22 18:13:40 -08:00
toaster
f7fa9fcc19 Fix compilation issue with nested defines for r_opengl.c UnSetShader 2022-11-22 18:13:40 -08:00
James R
7855bae8a1 Remove R_ThingVisibleWithinDist 
It's no longer used!
 2022-11-22 18:13:40 -08:00
James R
bfaf2bc6f3 OpenGL hitbox renderer 
I apologize for that vertex array.
 2022-11-22 18:13:38 -08:00
James R
5b53017a09 r_opengl: add PF_WireFrame and SHADER_NONE 
Draw lines instead of tris and disable shader entirely.
 2022-11-22 18:12:49 -08:00
James R
7527fdbb56 Remedy some quirky rendering of hitboxes if your viewpoint is too close 
It's not correct but it's better than before.
 2022-11-22 18:12:49 -08:00
James R
99653de134 Do not render viewmobj or skybox viewpoint hitbox 
If you are a spectator (or in first person), the hitbox
exists right ontop of you and hitboxes don't render
correctly if they are too close to the viewpoint.
 2022-11-22 18:12:49 -08:00
James R
694804cd96 Refactor hitbox renderer to project vissprites 
Properly accounts for portals (skyboxes).
 2022-11-22 18:12:49 -08:00
James R
356bdb25a1 Add a hitbox renderer to Software mode 
renderhitbox
- Tangible - collision activating objects, minus rings
- All - every object
- Intangible - the opposite of Tangible, also no rings
- Rings - rings
 2022-11-22 18:12:49 -08:00
Radicalicious
31520a1a5d Revert usage warning to an error 2022-11-22 16:21:13 +00:00
ashifolfi
7e2dee8796 attempt to get joystick support in snake 2022-11-20 20:17:13 -05:00
ashifolfi
d7b96df07b fix controller not working in download consent menu 2022-11-20 19:00:36 -05:00
ashifolfi
33b5f76045 fix controllers not working in snake game 2022-11-20 18:56:16 -05:00
ashifolfi
aa8410c612 fix statue being tangible for ~40 tics post burst mobj spawn 2022-11-20 18:46:41 -05:00
ashifolfi
47e981d2a8 actually check the right type in lua 2022-11-20 16:07:14 -05:00
ashifolfi
1b14dff0e9 add comments + better checktexturename if statement 2022-11-20 16:06:47 -05:00
ashifolfi
e48f7d1538 actually use correct names in the header 2022-11-20 16:06:43 -05:00
ashifolfi
3a2834e781 add R_TextureNameForNum and expose to lua 2022-11-20 15:25:53 -05:00
Zwip-Zwap Zapony
396db189e7 Draw the input prompt while the console is moving 2022-11-20 11:51:40 +01:00
Zwip-Zwap Zapony
435e1f6e7e Make con_height adjustable on the fly 2022-11-20 11:50:57 +01:00
Zwip-Zwap Zapony
256d9b5fdb Uncap console opening/closing animation 2022-11-20 11:50:01 +01:00
Zwip-Zwap Zapony
969dc4813a Allow cosmetic add-ons mid-save 2022-11-19 19:57:08 +01:00
Sally Coolatta
5103253e0b Allow unlockable executors again 2022-11-16 11:14:33 -05:00
Sally Coolatta
d3ff5342dd Minor adjustments 2022-11-16 11:14:32 -05:00
Sally Coolatta
947dbda045 Use savemoddata for ultimate file check 2022-11-16 11:14:32 -05:00
Sally Coolatta
f082acbbdb Don't allow Record Attack in cheated games 2022-11-16 11:14:31 -05:00
Sally Coolatta
a22fa1c455 Compromise on cheats setting modified game 
Instead of modifying the game, cheats now set a separate "cheats were used in this session" variable, which returns some of the old behavior.

HOWEVER, cheats will STILL allow spawning / collecting emblems & unlocking unlockables. Cheats will purely prevent saving progress. (It was always frustrating that devmode would make debugging unlockable features harder...)

Lastly, the function to set no-saving was exposed to Lua (`G_SetUsedCheats(silent)`). Just thought it'd be useful for large-scale gamedata-using mods that want to add their own cheat commands.
 2022-11-16 11:14:31 -05:00
Sally Coolatta
4a520e63c6 Don't allow a gamedata named the same as the default time attack folder 
That'd be kinda scary!
 2022-11-16 11:14:30 -05:00
Sally Coolatta
bcfe0da8fc Use old modded behavior when loading old files, instead of ignoring 
Let's not pretend script-kiddie edited old files are now perfectly A-OK :p
 2022-11-16 11:14:30 -05:00
Sally Coolatta
1b43cdddd5 Allow saving in modified games. 2022-11-16 11:14:29 -05:00
LJ Sonic
98d2dc4b71 No longer spam the console with viewpoint switching notices 2022-11-16 10:21:59 +01:00
LJ Sonic
d34d90b78b Enable reverse-iterating through viewpoints with shift+F12 2022-11-16 10:21:39 +01:00
LJ Sonic
aba5b953b2 Move viewpoint switching to its own function 2022-11-16 10:11:39 +01:00
Eidolon
e6780f2bee Merge branch 'comptime-no-fail' into 'master' 
Minor comptime refactoring.

See merge request STJr/SRB2!1776

(cherry picked from commit dc02339cc9)

9bfc82a1 Prevent comptime.* from failing compilation
a614865d Make comptime.sh conform to POSIX and less redundant, among other improvements
b7711b2b Pass argument list directly to functions that use them; quote arguments when used.
 2022-11-15 21:48:47 -05:00
Jaime Ita Passos
4a19294ca8 Merge these two loops together in Controller_GetFromID 2022-11-15 23:45:14 -03:00
Eidolon
dc02339cc9 Merge branch 'comptime-no-fail' into 'master' 
Minor comptime refactoring.

See merge request STJr/SRB2!1776
 2022-11-16 02:38:04 +00:00
Jaime Ita Passos
14065fb23f Properly make padrumble and padrumble2 CV_OnOff toggles 2022-11-15 23:37:57 -03:00
Jaime Ita Passos
3e088e4e78 Use displayplayer instead of consoleplayer in G_GetInputPlayer 2022-11-15 23:36:32 -03:00
Eidolon
84bc03d24e Merge branch 'po2-32x32-fix' into 'next' 
Add PO2 flat cases for sizes smaller than 32x32 (resolves #624)

Closes #624

See merge request STJr/SRB2!1873
 2022-11-16 01:40:54 +00:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Eidolon
8109514b73 Merge branch 'fix-udmf-boss3' into 'next' 
Use udmf mt arg 4 for pinch phase LE in boss 3

Closes #910

See merge request STJr/SRB2!1869
 2022-11-15 10:00:07 +00:00
Lactozilla
4558cc1c1f Fix HWR_SplitWall and sloped midtextures 
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
 2022-11-15 09:55:59 +00:00
Jaime Ita Passos
f0c3de6976 Add gamepad library and hooks for Lua scripting 2022-11-14 02:18:24 -03:00
Jaime Ita Passos
0516350bb4 Add haptic functions for Lua scripting 2022-11-14 01:52:20 -03: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
47ed0567b1 Use udmf mt arg 4 for pinch phase LE in boss 3 2022-11-13 21:28:36 -06: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
e0477a86b9 Merge branch 'multi-linkdraw' into 'next' 
Improve multiple MF2_LINKDRAW objects in Software

See merge request STJr/SRB2!1843
 2022-11-13 23:47:52 +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
eac8a54a55 Merge branch 'uncap-water-ripples' into 'next' 
Uncapped Water Ripples

See merge request STJr/SRB2!1868
 2022-11-13 23:29:10 +00:00
Eidolon
b93ae5a144 Merge branch 'fix-addfolder' into 'next' 
Fixed folder mods

Closes #889

See merge request STJr/SRB2!1820
 2022-11-13 23:21:19 +00:00
Eidolon
90489de517 Merge branch 'slope-fog-fix' into 'next' 
Fix slope planes not being able to render fog (fixes #664)

Closes #664

See merge request STJr/SRB2!1637
 2022-11-13 20:17:07 +00:00
Zwip-Zwap Zapony
59399e9fcf Uncap water ripples 2022-11-13 16:15:15 +01:00
Eidolon
6709100997 Merge branch 'emblem-drawing-hud' into 'next' 
Various changes to emblem drawing (menu changes only)

See merge request STJr/SRB2!1810
 2022-11-12 23:37:22 +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
Eidolon
d6640391e4 Merge branch 'very-lethal-lava-land' into 'next' 
Only interpolate shadowcasters if they exist

Closes #899

See merge request STJr/SRB2!1864
 2022-11-12 23:23:26 +00:00
Eidolon
3ff6c210db Merge branch 'fix-removed-mobj-interp-crash' into 'next' 
Remove mobj interpolator only after thinker

See merge request STJr/SRB2!1863
 2022-11-12 23:23:06 +00:00
X.organic
b03ef98753 Fix use-after-frees around mobjs 
# Conflicts:
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
 2022-11-12 17:04:25 -06:00
Eidolon
b2fa9e4bd7 Don't sleep w/ fpscap 0 and vsync enabled 2022-11-12 17:18:04 -05:00
Sally Coolatta
fa10530d37 Handle sorting against water FOFs properly 2022-11-12 17:00:45 -05:00
Sally Coolatta
ee9ebe6c54 Improve LINKDRAW with multiple objects 
Multiple objects with MF2_LINKDRAW will get sorted between each other, instead of purely done with dispoffset.
 2022-11-12 17:00:45 -05:00
Eidolon
e32b8a41e5 Only interpolate shadowcasters if they exist 2022-11-12 15:14:04 -06:00
Eidolon
88667400ee Merge branch 'fix-splat-interp' into 'next' 
Fix splat interp and sprite angle

See merge request STJr/SRB2!1858
 2022-11-12 21:05:44 +00:00
Eidolon
3bdfa3b9f4 Remove mobj interpolator only after thinker 2022-11-12 14:59:31 -06:00
Eidolon
147b3c925e Ensure st_time does not exceed 2.0 2022-11-12 11:45:10 -06:00
Eidolon
e59684b1a2 Merge branch 'bustablesoundz' into 'next' 
Start bustable FOF sounds at the correct height

Closes #846

See merge request STJr/SRB2!1818
 2022-11-11 23:15:26 -06:00
Eidolon
2aa9a92e7e Merge branch 'nodoublecrumble' into 'next' 
Prevent floating crumbling platforms from being triggered twice

Closes #797 and #594

See merge request STJr/SRB2!1817
 2022-11-11 23:13:16 -06:00
Eidolon
24ab858684 Merge branch 'fix-negative-lives-crash' into 'next' 
Fix a crash when scrolling away from a save file with a negative lives count.

See merge request STJr/SRB2!1822
 2022-11-11 23:11:44 -06:00
Eidolon
c489b8e2fe Merge branch 'udmf-splat-cut' into 'next' 
Cut inner walls of splat FOFs

Closes #891

See merge request STJr/SRB2!1829
 2022-11-11 23:03:08 -06:00
Eidolon
f3830b2934 Merge branch 'pandoras-letter' into 'next' 
Fix hidden 100% completion reward actually being obtained at 50% completion

See merge request STJr/SRB2!1842
 2022-11-11 23:00:24 -06:00
ashifolfi
60ab28c1ab improved down arrow check + t->b/b->t looping 2022-11-11 22:57:17 -06:00
ashifolfi
4c08daa01f remove down arrow at bottom of addon list 2022-11-11 22:57:17 -06:00
ashifolfi
e12db019d6 fix addon menu down arrow always being visible 2022-11-11 22:57:17 -06:00
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
c008dc4d1f Merge branch 'master' into 'master' 
Fix Typo

See merge request STJr/SRB2!1860
 2022-11-12 02:49:43 +00:00
Alam Ed Arias
9b4d6a2109 Fix Typo 2022-11-11 21:46:28 -05:00
Alam Ed Arias
bd2bfe462c Merge branch 'master' into 'master' 
Cleanup whitespaces and ignore build folders

See merge request STJr/SRB2!1859
 2022-11-12 02:35:53 +00:00
Alam Ed Arias
e1fd0dfca3 Cleanup whitespace changes from SRB2_release_2.1.23 2022-11-11 21:19:29 -05:00
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Alam Ed Arias
46186d7632 Cleanup whitespace changes from SRB2_release_2.2.2 2022-11-11 21:19:26 -05:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00
Alam Arias
1b5dd687d2 Cleanup whitespace changes from master branch 2022-11-11 20:31:41 -05:00
Alam Arias
ae112a3728 Update hu_stuff.c 
Fix NONET build
 2022-11-11 20:21:30 -05:00
James R
04855a85dc Use angle between viewz and mobj z to determine splat sprite angle 2022-11-11 17:35:31 -06:00
James R
877d5450d5 Use interpolated mobj x/y/z/angle for splats 
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
 2022-11-11 17:35:27 -06:00
Eidolon
7f913b5ace Merge branch 'registervar-sanity' into 'next' 
Plug up some holes with lib_cvRegisterVar

Closes #441

See merge request STJr/SRB2!1823
 2022-11-10 15:21:29 +00:00
Eidolon
0f406b8b8d Merge branch 'udmf-fof-brightness' into 'next' 
HWR transparent FoF plane brightness

See merge request STJr/SRB2!1857
 2022-11-10 15:05:49 +00:00
Monster Iestyn
6a6d92a824 Update credits 2022-11-10 14:08:11 +00:00
Eidolon
07665ae502 hwr: Use UDMF FOF_SPLAT for splat flats and walls 2022-11-09 17:40:43 -06:00
Eidolon
0f2fe5983e hwr: Use lightlevel on transparent planes 2022-11-09 17:31:49 -06: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
Eidolon
3597957af1 Merge branch 'cmake-zlib-internalized' into 'next' 
cmake: build zlib manually in internal build

See merge request STJr/SRB2!1856
 2022-11-09 02:30:35 +00:00
Eidolon
4037d04994 cmake: copy build shared internal libs to bin/ 2022-11-08 19:21:21 -06:00
Eidolon
6d1a3bfce0 Reset camera when moving player to spawn/starpost 2022-11-08 18:48:50 -06:00
James R
dc1beb8e5b Fix buffer overflow when pasting into chat 2022-11-07 22:35:18 -06:00
Eidolon
62b142f136 Uncap room list ellipsis animation 2022-11-07 20:08:33 -06:00
Eidolon
3c5855b64a Uncap sound test 2022-11-07 19:48:42 -06:00
Eidolon
4a580558f0 Tweak showfps alignment 2022-11-07 18:50:23 -06:00
toaster
0cd3629d00 Explicit pointer cast for R_InterpolatePrecipMobjState 2022-11-07 18:17:45 -06:00
Eidolon
5f6c56cf36 Use precip interp if gl sprite is for precip 2022-11-07 18:17:45 -06:00
Eidolon
64e063d4dc cmake: Port misc options from Makefiles 
- DEBUGMODE
- MOBJCONSISTANCY
- PACKETDROP
- ZDEBUG
- PROFILEMODE (likely moot, dunno how profiling with cmake works
though)
 2022-11-06 14:03:02 -06:00
Eidolon
00179e44ed Merge branch 'cmake-warning-config' into 'next' 
cmake: Port warning configuration from make

See merge request STJr/SRB2!1844
 2022-11-06 16:12:22 +00:00
Eidolon
106d115c3e cmake: Port warning configuration from make 
Adds SRB2_CONFIG_ERRORMODE to replace ERRORMODE too.
 2022-11-06 10:11:51 -06:00
Eidolon
0b4ceeb73b Merge branch 'scroller-fix' into 'next' 
Add_Scroller: Don't call IsSector3DBlock if affectee is a side

Closes #898

See merge request STJr/SRB2!1852
 2022-11-06 16:08:22 +00:00
Eidolon
e23be4eaed Merge branch 'spindash-platform-fix' into 'next' 
Fix typo in rising FOF binary-to-UDMF conversion

See merge request STJr/SRB2!1853
 2022-11-06 16:05:46 +00:00
MascaraSnake
812e154638 Fix typo in rising FOF binary-to-UDMF conversion 2022-11-06 07:52:54 +01:00
MascaraSnake
a5a7b20d95 Add_Scroller: Don't call IsSector3DBlock if affectee is a side 2022-11-06 07:48:05 +01:00
Eidolon
90b4f8720e cmake: Remove asset hashing, CMAKE_ASSETS_DIR 
Simplifies build setup for cmake.
 2022-11-05 23:56:43 -05:00
Monster Iestyn
b637df4ce0 removed a name from credits by request 2022-11-05 17:00:51 -05:00
Monster Iestyn
67fb09ec0d removed a name from credits by request 2022-11-05 21:20:53 +00:00
Eidolon
ce5c41d7eb Merge branch 'the-one-cmake' into 'next' 
Overhaul cmake build

See merge request STJr/SRB2!1832

(cherry picked from commit 4337205fa8)

# Conflicts:
#	src/sdl/CMakeLists.txt
 2022-11-05 03:09:38 -05:00
Eidolon
a015be2a54 cmake: Build all deps and static link 2022-11-05 00:12:09 -05:00
Eidolon
9277870fa2 Merge branch 'cmake-develop-flag' into 'next' 
cmake: Add SRB2_CONFIG_DEV_BUILD

See merge request STJr/SRB2!1837

(cherry picked from commit 896a7609a7)

518cb0b3 cmake: Add SRB2_CONFIG_DEV_BUILD
 2022-11-04 23:11:49 -04:00
Eidolon
896a7609a7 Merge branch 'cmake-develop-flag' into 'next' 
cmake: Add SRB2_CONFIG_DEV_BUILD

See merge request STJr/SRB2!1837
 2022-11-05 03:11:36 +00:00
katsy
a10b824e0d pandora's box is condition 28, not 27 2022-11-01 14:59:10 -05:00
Eidolon
f7bc03ad61 Use interp position in GL billboarding 2022-10-30 23:14:11 -05:00
Eidolon
af753b5268 Only call SetupFrame in T-1 hack with player->mo 2022-10-30 21:06:50 -05:00
Eidolon
fdd6550669 Only run view update hack in no-render mode 2022-10-30 21:05:59 -05:00
Eidolon
46603d607e Clear and draw all game hud hook calls to 1 list 
Fixes splitscreen issues with lua hud hooks
 2022-10-28 23:04:05 -05:00
Eidolon
8fa553a1d0 Ensure view interpolates between T-1 to T 2022-10-28 23:04:05 -05:00
sphere
ea329c93f7 Merge branch 'kill-TMatrix' into 'next' 
Kill old TMatrix and TVector code

See merge request STJr/SRB2!1821
 2022-10-28 09:13:40 +00:00
sphere
fa4394b3ad Merge branch 'udmf-conveyor-flip' into 'next' 
Automatically apply flipspecial to upside-down FOF conveyor belts

See merge request STJr/SRB2!1827
 2022-10-28 09:11:18 +00:00
sphere
fad7c429a5 Merge branch 'udmf-equation-slopes' into 'next' 
Fix equation slopes overflow

Closes #757

See merge request STJr/SRB2!1830
 2022-10-28 09:11:10 +00:00
spherallic
57cf1f870d Fix Pterabyte spawns, revert mashing requirement, increase grace period 2022-10-25 13:11:30 +02:00
Eidolon
518cb0b3fd cmake: Add SRB2_CONFIG_DEV_BUILD 2022-10-24 18:39:52 -05:00
Alam Ed Arias
7631d0f521 Merge branch 'next' into kill-TMatrix 2022-10-23 00:33:20 -04:00
Eidolon
56e48f1f5f make: Fix ifdef check from dummy target changes 2022-10-20 21:11:21 -05:00
Eidolon
deaa82aa7f make: Fix ifdef check from dummy target changes 2022-10-20 21:10:21 -05:00
Eidolon
89a6d81f53 Merge branch 'win32-dpi-awareness' into 'next' 
win32: Add dpi aware manifest config

See merge request STJr/SRB2!1835

(cherry picked from commit e37918ebb0)

bc44e792 win32: Add dpi aware manifest config
 2022-10-18 18:48:09 -04:00
Eidolon
bc44e792eb win32: Add dpi aware manifest config 2022-10-17 22:36:29 -05:00
James R
76879299f9 Restrict exec path to srb2 directories 2022-10-14 22:10:24 -07:00
James R
9761ab52d9 FIL_ReadFileTag: use fopenfile 
Fixes exec, for example, crashing the game if given
a directory. Test: `exec .`
 2022-10-14 21:57:14 -07:00
James R
3bd3369fdc Add fopenfile, alternative to fopen that does not ever open directories 2022-10-14 21:56:01 -07:00
James R
b1a86b0b34 Disallow adding files with absolute path or traversing upward 
(Except as part of srb2home, srb2path or addons_folder --
this lets addons menu work, primarily.)

- disallowed when using addfile or addfolder
- security check for xcmd receive
 2022-10-14 20:41:45 -07:00
James R
373af01092 Add startswith and endswith, functions that compare the beginning or ending of a string 2022-10-14 20:41:45 -07:00
Eidolon
ef2b9551d2 Add missing .mk for dummy target 
(cherry picked from commit d46c201332)
 2022-10-13 18:19:43 -05:00
Eidolon
d46c201332 Add missing .mk for dummy target 2022-10-13 18:18:18 -05:00
Eidolon
50ac745ed1 Merge branch 'dummy-revival' into 'next' 
Revive the dummy interface

See merge request STJr/SRB2!1831

(cherry picked from commit 3b8cb3982a)

ba55947e Make dummy compile again, if SDL is explicitly set to 0
 2022-10-13 19:00:04 -04:00
Eidolon
3b8cb3982a Merge branch 'dummy-revival' into 'next' 
Revive the dummy interface

See merge request STJr/SRB2!1831
 2022-10-13 22:59:26 +00:00
katsy
2714ac44b4 reallow score chains from rolling 2022-10-12 20:38:29 -05:00
sphere
31a6b7b365 Merge branch 'improve-439-again' into 'next' 
Allow linedef action 439 to set different back-side textures (again)

See merge request STJr/SRB2!1812
 2022-10-10 16:21:06 +00:00
MascaraSnake
a6a1b0a720 Refactor linedef type 439 a little 2022-10-10 07:39:34 +02:00
GoldenTails
ba55947ee6 Make dummy compile again, if SDL is explicitly set to 0 2022-10-10 00:30:23 -05:00
Eidolon
f43839ef8d uncapped: Reset cam interpolation on P_ResetCamera 2022-10-09 16:40:52 -05:00
Eidolon
41f17495c4 uncapped: Update closed captions only on new tics 2022-10-09 15:29:28 -05:00
spherallic
81b1526c2c Check the correct backside for textures, then go back to front textures. 2022-10-09 18:53:34 +02:00
MascaraSnake
049bfd7bd4 Minor code cleanup in P_ConvertBinaryLinedefTypes 2022-10-09 17:17:16 +02:00
MascaraSnake
496bd79f9b Cut inner walls of splat FOFs 2022-10-09 16:56:25 +02:00
MascaraSnake
6ad18e5aec Merge branch 'udmf-current-bugfix' into 'next' 
Don't require floor touch for currents in non-FOF sectors

Closes #893

See merge request STJr/SRB2!1826
 2022-10-09 13:39:22 +00:00
MascaraSnake
bfaa8ca5c6 Merge branch 'wildcanyon' into 'next' 
Check for SF_CANBUSTWALLS, not glide&climb (resolves #892)

Closes #892

See merge request STJr/SRB2!1825
 2022-10-09 13:38:58 +00:00
MascaraSnake
979bc471ba Conveyor belts: Only apply flipspecial if it's a 3D floor 2022-10-09 15:27:07 +02:00
MascaraSnake
2afea367cb Apply flipspecial automatically to ceiling carry effects 2022-10-08 11:06:14 +02:00
spherallic
c92a371aa9 Clean up the start of P_CheckQuicksand 2022-10-08 10:58:09 +02:00
MascaraSnake
d2f2c71685 Don't require floor touch for currents in non-FOF sectors unless it's a horizontal currents in binary (because backwards compatibility) 2022-10-08 10:20:20 +02:00
katsy
79e8e10e07 check for canbustwalls, not glide&climb 2022-10-04 16:22:07 -05:00
spherallic
73e2d8d1bc Fix CircleCI build error 2022-10-04 10:38:57 +02:00
SteelT
534b610a76 Plug up some holes with lib_cvRegisterVar 
* Error if a consvar is set to an empty string
* Error if a consvar is not given a defaultvalue
 2022-10-03 16:04:38 -04:00
GoldenTails
3244d6586d Fix a crash when scrolling away from a save file with a negative lives count. 2022-10-02 19:08:01 -05:00
Alam Ed Arias
f310d84766 replaced old TVector and TMatrix code 2022-10-01 15:40:45 -04:00
Lamibe
7785d66467 Fixed folder mods 2022-10-01 17:46:48 +02:00
Alam Ed Arias
d11fbe4504 New Fixed Point Matrix functions 2022-09-30 22:04:12 -04:00
SteelT
325675e277 Fix reading the value of stagefailed 2022-09-30 20:27:54 -04:00
spherallic
9da90cef8e Merge branch 'next' into gravityflipping 2022-09-30 21:27:32 +02:00
sphere
e08ebac5c8 Merge branch 'depth-buffer-24' into 'next' 
Request 24-bit depth buffer from SDL

See merge request STJr/SRB2!1635
 2022-09-30 14:01:33 +00: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
Alam Ed Arias
e5518a1241 replace TMatrix with matrix_t 2022-09-30 00:27:10 -04: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
sphere
bc5c65306b Merge branch 'table-len-metamethod' into 'next' 
Fix __len metamethod ignored on tables

See merge request STJr/SRB2!1328
 2022-09-28 21:54:07 +00:00
sphere
21808e883b Merge branch 'better-wad-search' into 'next' 
Clean up the WAD searching code a little.

See merge request STJr/SRB2!1678
 2022-09-28 21:33:30 +00:00
sphere
27f2b04109 Merge branch 'readhuditem-parse-fix' into 'next' 
readhuditem parse fixes

Closes #887

See merge request STJr/SRB2!1816
 2022-09-28 21:04:44 +00:00
sphere
a53d9b3788 Merge branch '457failuretagfix' into 'next' 
Fix action 457 (Track object angle) not triggering the 'failure' tag

Closes #883

See merge request STJr/SRB2!1814
 2022-09-28 21:04:02 +00:00
sphere
ac7f983c8a Merge branch 'exclusivescrollfix' into 'next' 
Fix 'exclusive' flag on plane scrollers being inverted

Closes #885

See merge request STJr/SRB2!1813
 2022-09-28 21:03:56 +00:00
sphere
8da4eab173 Merge branch 'udmf-fof-flags' into 'next' 
Fix UDMF FOF flags

See merge request STJr/SRB2!1802
 2022-09-28 21:03:44 +00:00
spherallic
2623649871 "That line shouldn't be there at all :v" -MascaraSnake 2022-09-28 22:57:34 +02:00
spherallic
78eae609cc Start bustable FOF sounds at the correct height 2022-09-26 23:51:51 +02:00
spherallic
1cf5bdf82b Prevent floating crumbling platforms from being triggered twice 2022-09-26 20:32:57 +02:00
spherallic
862fdaaa3d Revert "prevent immediate re-flipping", streamline P_GetMobjGravity 2022-09-26 13:41:37 +02:00
SteelT
fe8be242d0 readhuditem parse fixes 
Fix readhuditem not parsing flags correctly
Fix unknown word warning erroneously describing the HUD item as a level header
 2022-09-26 02:31:50 -04:00
spherallic
cc3d4acdcd Fix AppVeyor build failure 2022-09-20 20:42:19 +02:00
spherallic
00ecddf3e9 Fix action 457 reading the failure tag from the wrong offset field 2022-09-18 12:55:17 +02:00
spherallic
5f62af05f1 Fix 'exclusive' flag on plane scrollers being inverted 2022-09-18 11:21:00 +02:00
spherallic
cd85240ec3 Add toggle for action 439 to use backside textures 2022-09-17 11:40:44 +02:00
spherallic
fe8485cc2f Add flag to set wind/current/push/pull strength using X offset 2022-09-17 11:20:51 +02:00
spherallic
3da9fb636a Add plane scroller features to binary map format: 
- Added actions for scrolling floor + ceiling simultaneously
- Added flag to use X offset for speed, instead of line length
 2022-09-17 10:51:16 +02:00
sphere
cfdbc8f44a Merge branch 'vissprite-color' into 'next' 
Allow objects with MF2_LINKDRAW to use their own color

See merge request STJr/SRB2!1576
 2022-09-17 07:32:51 +00:00
spherallic
872a2001c8 Add new linedef executor trigger that checks gravity 2022-09-17 02:14:25 +02:00
spherallic
a85b820b44 Don't skip map completion emblems when skipping record attack emblems. 2022-09-17 00:59:35 +02:00
spherallic
4f744bc06f Various changes to emblem drawing: 
- Emblems in a row now have a little bit of spacing between them.
- Score/time/ring emblems are drawn only once in the pause menu.
- Record Attack & NiGHTS Mode show in-level emblems as well.
 2022-09-17 00:47:08 +02:00
sphere
aaae90a5e3 Merge branch 'soundflags' into 'next' 
Use sound flags for sfxinfo, fix SF_TOTALLYSINGLE checks

See merge request STJr/SRB2!1765
 2022-09-16 22:31:51 +00:00
spherallic
efc0f7a758 Correct SF_TOTALLYSINGLE checks. 2022-09-16 23:59:19 +02:00
spherallic
2664fc700a Check for sector special flag instead of special number 2022-09-16 23:05:24 +02:00
spherallic
b7dd3ac4bf Restore CR_FAN application for fan sectors 2022-09-16 22:56:26 +02:00
spherallic
612424e2e2 Merge branch 'next' into fancarry 2022-09-16 22:54:08 +02:00
spherallic
9e9e3f4cca Correct ceilingz handling in quicksand 2022-09-12 14:00:17 +02:00
spherallic
9499d16221 Fix quicksand in reverse gravity 2022-09-12 11:27:28 +02:00
spherallic
3427d4309f Prevent immediate re-flipping after a per-sector gravity flip 2022-09-11 23:12:51 +02:00
spherallic
42fc6c877b Remove hack in P_GetMobjGravity for spinfire, fix the underlying issue 2022-09-11 20:04:20 +02:00
spherallic
0ee81a1cc3 Support gravity override flag in UDMF 2022-09-11 19:46:57 +02:00
spherallic
5e6185abe2 Fix Elemental stomp's flames while Gravity Boots are active 2022-09-11 18:28:17 +02:00
spherallic
3d29e9770f Re-add momz inversion on dropped emeralds 2022-09-11 17:41:55 +02:00
krabs
295555d0d0 Fix issues with gravflip of dropped items (rings, ctf flag, weapons, emeralds) 2022-09-11 17:15:25 +02:00
spherallic
1f73c9cf99 Add flag to per-sector gravity for overriding MF2_OBJECTFLIP 2022-09-11 16:15:50 +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
spherallic
f0adc71f9b Add flag to invert current gravity to gravity flip executor 2022-09-08 16:56:35 +02:00
spherallic
ef35084d95 Merge remote-tracking branch 'public/master' into next 2022-09-08 16:52:54 +02:00
sphere
892ffbe01b Merge branch 'stop-wuse-after-free' into 'master' 
Stop -Wuse-after-free warnings

See merge request STJr/SRB2!1805
 2022-09-08 14:51:17 +00:00
spherallic
f564090c80 Two small renderer switching changes: 
- Allow renderer switching in resolution menu
- Fix "(F10)" suffix not being shown on the renderer option
 2022-09-07 14:00:56 +02:00
spherallic
541e2a4fe6 Merge branch 'next' into fullscreen-toggle 2022-09-07 13:48:52 +02:00
sphere
65fa93c4f7 Merge branch 'skin-set-fix' into 'next' 
Only set default skin/color when possible

See merge request STJr/SRB2!1772
 2022-09-06 15:19:18 +00:00
sphere
fc1cc9ffe5 Merge branch 'unknown-command-dedicated-print' into 'next' 
Fix "unknown command" not being printed on dedicated

See merge request STJr/SRB2!1771
 2022-09-06 15:19:11 +00:00
sphere
2d16ccf176 Merge branch 'fixmapconditions' into 'next' 
Fix map number checks when reading unlockable conditions

Closes #882

See merge request STJr/SRB2!1807
 2022-09-06 08:05:35 +00:00
spherallic
8a0f0237f2 Merge branch 'next' into udmf-fof-flags 2022-09-06 09:52:01 +02:00
sphere
5d7d19d2bf Merge branch 'more-whitelisting' into 'next' 
Add more menu graphics to the whitelist.

Closes #765

See merge request STJr/SRB2!1731
 2022-09-06 07:40:56 +00:00
sphere
9e2d8f059d Merge branch 'write-textmap-bruh' into 'next' 
Fix size_t compiler warnings in P_WriteTextmap

See merge request STJr/SRB2!1785
 2022-09-05 21:54:20 +00:00
sphere
d67e88ee0c Merge branch 'fix-parenttriestosleep-desc' into 'next' 
Fix description of A_ParentTriesToSleep

See merge request STJr/SRB2!1784
 2022-09-05 21:49:34 +00:00
spherallic
508536e3d7 Fix map number checks when reading unlockable conditions. 2022-09-05 20:41:09 +02:00
SMS Alfredo
e070880ec0 Do the thing 2022-08-25 15:29:54 -05:00
Jaime Ita Passos
c27d7f916f Stop -Wuse-after-free warnings 2022-08-11 04:30:03 -03:00
Jaime Ita Passos
07011a7044 Stop -Waddress warnings 2022-08-11 04:24:24 -03:00
Radicalicious
1edbbad2df Remove extra whitespace 2022-08-03 23:08:42 +00:00
Radicalicious
71caaf180c Fix mapmusname not overwriting Lua-provided strings 2022-08-02 20:59:13 -05:00
MascaraSnake
dff15fa678 Fix equation slopes overflow 2022-07-31 15:12:59 +02:00
MascaraSnake
ec119eac2f Merge branch 'next' into udmf-fof-flags 2022-07-31 13:27:03 +02:00
MascaraSnake
7389e2ceb6 Use the correct bustflags constant 2022-07-31 13:24:45 +02:00
MascaraSnake
1049eca15e Forgot to add fofflags to ffloor_opt 2022-07-31 13:01:45 +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
sphere
f8d2297e07 Merge branch 'colon-parenthesis' into 'next' 
Fix semibright/fulldark frame flags not working with 3D models

See merge request STJr/SRB2!1779
 2022-07-29 09:33:20 +00:00
Eidolon
955259d5c1 Remove win32 backend-specific files 2022-07-17 19:34:19 -05:00
Eidolon
69c5da2720 Merge branch 'next' into uncappedrevengeance 2022-07-15 00:14:27 -05:00
Eidolon
0e5b5bf5d9 cmake: Set plist properties for macOS bundle 
yay icon
 2022-07-14 23:57:53 -05:00
Eidolon
66ab96363c cmake: Fix rpath issues in macOS bundle fixup 2022-07-14 23:32:34 -05:00
Eidolon
a3ffd04223 cmake: Adjust linkage for macOS 
This properly links dylibs set during build instead of expecting
the libraries to be in the system path.
 2022-07-14 18:37:17 -05:00
Eidolon
af8bc3af7e Merge branch 'udmf-plane-displacement-fix' into 'next' 
UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68

Closes #868

See merge request STJr/SRB2!1790
 2022-06-05 23:13:04 +00:00
MascaraSnake
c9536ff4dc Fix copypaste error in P_GetMobjGravity 2022-06-04 17:46:00 +02:00
MascaraSnake
9971592dc6 UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68 2022-06-04 11:14:31 +02:00
MascaraSnake
fc4b79c0de Fix custom FOF flag conversion in binary maps 2022-06-04 10:59:42 +02:00
Eidolon
6829e4ae62 Merge branch 'sp-secfset-update-triggertag' into 'next' 
Update triggertag on sector tag fset

Closes #865

See merge request STJr/SRB2!1789
 2022-05-31 21:15:56 +00:00
Sally Coolatta
8b175398f8 Use old behavior when dipping below 35 with interp 2022-05-30 17:25:43 -05:00
MascaraSnake
af7c0f4d6c Allow linedef types 409/410 to change the trigger tag 2022-05-29 12:24:14 +02:00
MascaraSnake
37da148996 Update triggertag on Tag_SectorFSet if in binary map and the sector has a trigger special 2022-05-29 11:56:30 +02:00
Eidolon
f94c25c05c Change UDMF wall scroll scale to SCROLL_SHIFT 
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.

Fixes STJr/SRB2#862

Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
 2022-05-29 02:02:20 -05:00
Zwip-Zwap Zapony
d10ca13eb9 Apply 1 suggestion(s) to 1 file(s) 2022-05-28 12:18:09 +00:00
MascaraSnake
e1a5f48c51 Fix even more size_t printfs 2022-05-28 14:08:19 +02:00
MascaraSnake
fd2a097c34 Fix more size_t mishaps 2022-05-28 10:29:35 +02:00
Eidolon
35a5c82c42 Update triggertag on sector tag fset 
Fixes STJr/SRB2#865
 2022-05-27 13:36:55 -05:00
Eidolon
1ef40c9037 Update interpolation during objectplace 2022-05-21 14:38:32 -05:00
Eidolon
8040c8fe05 Tweaks for kart v1 MR comments 2022-05-21 12:36:21 -05:00
Sally Coolatta
79f736b75f Use double instead of precise_t for FPS counter 
Makes the displayed FPS more accurate to what it's actually displaying.

Also removed HUDTRANS from it -- stop it fading out during level transitions, it's annoying when I actually want to see the FPS during those bits.
 2022-05-19 16:08:42 -05:00
Eidolon
169f33a101 Defensively recreate title drawlist 
Avoids a crash when connecting to a server in the Intro
 2022-05-18 21:07:16 -05:00
Eidolon
516a5e8350 Remove hudlib getDeltaTime 2022-05-18 18:29:37 -05:00
Eidolon
32b166669e Don't interpolate during net lag 2022-05-17 19:57:31 -05:00
Eidolon
7c00cea1fc Add per-split player view resets 2022-05-05 20:11:37 -05:00
Eidolon
d511857675 Reset view interp in preticker 2022-05-05 19:43:55 -05:00
Eidolon
73930c655b Run UpdateMobjInterpolators in preticker 2022-05-05 19:27:51 -05:00
Eidolon
1920dba082 Run UpdateLevelInterpolators in preticker 
Fixes KartKrew/Kart-Public#10
 2022-05-05 18:51:49 -05:00
Sally Coolatta
4d18329946 Revert to before screenUpdate boolean was added 
Was done this way for the sake of an older version of uncapped's timing; now that the new timing is much better, I decided it should remain as close to pre-uncapped as it can be.
 2022-05-05 15:07:27 -05:00
katsy
c2e1b1be54 Restore deleted zofs (fixes signpost sparkles etc) 2022-05-05 13:18:01 -05:00
Eidolon
e3fd3dfa65 Only play emerald hunt sounds on new tics 2022-05-04 20:40:45 -05:00
Sally Coolatta
40c2f66a5a Move screenshot code before timing 2022-05-04 20:02:36 -05:00
Eidolon
bd73256390 Fix Marathon Mode menu for uncapped 2022-05-03 18:18:08 -05:00
Eidolon
1c11ddd6ae Only check VERTICALFLIP for old_z calc 2022-05-03 15:23:00 -05:00
Eidolon
7ec0420ce6 Adjust spawned mobj z by gravity inversion 2022-05-03 15:07:35 -05: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
MascaraSnake
28bdd7ef00 Fix size_t compiler warnings in P_WriteTextmap 2022-05-01 19:27:10 +02:00
Eidolon
f0d7d8467f Refactor timing code even more 
System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.
 2022-05-01 00:32:46 -05:00
Eidolon
7d7564b7f9 Disable sprite offset interpolation (for now) 2022-04-30 21:56:42 -05:00
Eidolon
48d8c83540 Ensure view is not interpolated on first frame 2022-04-30 19:10:07 -05:00
Eidolon
c0865e4faa Ensure mobj interpolators reset on level load 2022-04-30 17:59:32 -05:00
Eidolon
e79654a33a Completely refactor timing system 
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.

This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
 2022-04-30 16:33:23 -05:00
Eidolon
dcbe929baa Make renderisnewtic is false between tics 
I know what I'm doing! I swear
 2022-04-30 13:53:56 -05:00
ashi
c3001ac42a Fix description of A_ParentTriesToSleep 2022-04-30 14:21:51 +00:00
Eidolon
a41d042812 Rename drawerlib deltaTime to getDeltaTime 2022-04-30 01:57:46 -05:00
Eidolon
82310e0ae2 Add Lua HUD drawlists 
Buffers draw calls between tics to ensure hooks
run at the originally intended rate.
 2022-04-30 01:55:10 -05:00
Eidolon
56261d3e1e Fix offset copies for SpawnMobjFromMobj 
THANKS SAL
 2022-04-29 17:19:09 -05:00
Eidolon
1259f1be40 Interpolate spritescale/offset x/y 2022-04-29 14:21:30 -05:00
Eidolon
8f43b5afd0 Fix Mario block item placement 2022-04-28 22:32:35 -05:00
Eidolon
42ebf163e6 Don't interpolate mobj state if frac = 1.0 2022-04-28 21:07:06 -05:00
Sally Coolatta
7c41564362 Fix multiplayer character select 2022-04-28 20:44:22 -05:00
Eidolon
5d4f7f2ad2 Copy interp state in P_SpawnMobjFromMobj 2022-04-28 20:39:37 -05:00
Eidolon
1aebf41e82 Interp shadow scales 2022-04-28 20:14:04 -05:00
Eidolon
687d98eb4a Fix interp scale crash for hires sprites 2022-04-28 20:07:07 -05:00
Eidolon
50b0c29db9 Disable angle interp on fresh mobjs 2022-04-28 18:46:02 -05:00
Eidolon
34eebcb4b8 Reset interp scale when Lua sets .scale 2022-04-28 18:36:10 -05:00
katsy
5a7a63c2cc Fix interp scaling crashing software 2022-04-28 17:21:45 -05:00