Commit graph

22042 commits

Author SHA1 Message Date
James R
b419184591 cmake/Comptime.cmake: exclude remote refs HEAD from current branch search
remotes/origin/HEAD is valid, exists in my repo and I do
not know why but it makes checking out origin/master show
up as HEAD in game so KILL.
2023-03-22 15:23:44 -07:00
AJ Martinez
312e847151 Merge branch 'fix-faulty-mobj-references' into 'master'
Fix faulty references for monitors and players

See merge request KartKrew/Kart!1071
2023-03-22 07:43:37 +00:00
Gunla
9b1179518a Merge branch 'blue-target' into 'master'
Give Drop Target a weaker state when thrown forward

Closes #471

See merge request KartKrew/Kart!1049
2023-03-22 00:37:44 +00:00
AJ Martinez
7868f21dd0 Merge branch 'controller-crudules' into 'master'
Controller Crudules

Closes #479 and #476

See merge request KartKrew/Kart!1066
2023-03-21 07:41:34 +00:00
James R
a396ffe676 Init mobj references before mobj specific spawning in P_SpawnMobj
Fixes MT_MONITOR leaking references due to
Obj_MonitorSpawnParts called before P_AddThinker.

Thanks to toaster
2023-03-20 20:00:10 -07:00
James R
d0719ef5ba Fix mobj reference management of player->mo
Thanks to toaster
2023-03-20 20:00:10 -07:00
AJ Martinez
8f77a1a975 Playable default controls 2023-03-19 16:02:16 -07:00
toaster
e27a15fd14 F_IntroResponder, G_Responder: Permit both Title Screen and Intro/titledemo to respond to trigger inputs over JOYAXISRANGE/2
Likewise, the author of this commit uses a trigger for A(ccel)
2023-03-19 18:06:19 +00:00
toaster
6832488117 G_MapEventsToControls: On second thought, only handle reassignment when a trigger axis is activated, to closer match button behaviour. 2023-03-19 18:00:18 +00:00
toaster
1acf00daa6 G_PlayerInputAnalog: Only attempt default binds for menu if no binds are reachable by GetValueFromControlTable for that button
- GetValueFromControlTable: Return 0 only if a single G_KeyIsAvailable returns true for any bind
    - Otherwise returns NO_BINDS_REACHABLE -- #define'd as (-1)
    - Does not cover the `menucontrolreserved` check, which could maybe be moved to the opposite end of the function if it causes problems.
2023-03-19 17:48:24 +00:00
toaster
22294c2c4d G_MapEventsToControls: Permit automagic controller reassignment for axis events greater than JOYAXISRANGE/2
The author of this commit uses a trigger for A(ccel) and was being misled by the absence of response.
2023-03-19 17:27:23 +00:00
toaster
5a7f7b58f0 HandleGamepadDeviceEvents: Call at all junctures where event_t are digested
Permits controllers to actually be added when starting with -server
2023-03-19 17:27:23 +00:00
toaster
dc63847e14 G_MapEventsToControls: Fix crash
- If G_GetDeviceGameKeyDownArray returns NULL, bail early.
- Also calls it once for all relevant event types, rather than possibly multiple times.
2023-03-19 17:27:23 +00:00
toaster
cd7d4f23c7 Merge branch 'eggman-drop-items' into 'master'
Drop items when hitting Egg Mark

See merge request KartKrew/Kart!1064
2023-03-19 17:27:02 +00:00
toaster
bfbbfc2842 Merge branch 'prison-ufos' into 'master'
Prison UFOs

See merge request KartKrew/Kart!1060
2023-03-19 13:00:31 +00:00
toaster
421896b939 Jart review: Whitespace reinsertion 2023-03-19 12:51:16 +00:00
James R
698225f625 Drop items when hitting Egg Mark 2023-03-19 04:04:01 -07:00
James R
dc024b874b Morph Drop Target from forward thrown white to lime
Blends from white into lime over 27 tics.
2023-03-19 03:52:25 -07:00
James R
05d80f9e92 Give Drop Target a weaker state when thrown forward
Uses color White. Adds no EXTRA knockback, normal object
bounce collision applies.
2023-03-19 02:43:38 -07:00
Gunla
c606ee8ef8 Merge branch 'try-fix-tripwire-alpha' into 'master'
Fix invisible tripwire post 1036

Closes #486

See merge request KartKrew/Kart!1063
2023-03-19 05:19:03 +00:00
James R
60c1f5706a Set tripwire line alpha to FRACUNIT
blame f72379e557
2023-03-18 19:53:18 -07:00
Gunla
03a4cc292c Merge branch 'stop-sounds-when-leaving' into 'master'
Stop sounds when exiting the game back to the Title Screen

See merge request KartKrew/Kart!1051
2023-03-18 23:24:44 +00:00
Gunla
b8f3c7e357 Merge branch 'fastfall-with-speed' into 'master'
Scale fast fall momentum with speed at time of trigger

See merge request KartKrew/Kart!1047
2023-03-18 23:00:06 +00:00
toaster
89be7b959e K_DrawTargetTracking: Fix x coordinate of tracked object's icon at the bottom of the screen.
This was designed to use the angle of the result directly, which was previously incorrect.
2023-03-18 21:33:21 +00:00
toaster
78636bd8d9 MT_CDUFO: Play a more generic initial destruction sound, because the one we were using is also played for getting a life in GP. 2023-03-18 21:31:29 +00:00
James R
cb0b4df186 Merge branch 'shield-overlay-no-splitscreen' into 'master'
S3K Shields: remove splitscreen-dependent mobj position behaviour

See merge request KartKrew/Kart!1058
2023-03-18 11:16:59 +00:00
James R
a216188fed Merge branch 'fix-scrambleremoved-on-dedicated' into 'master'
Fix scrambleremoved not being registered for dedicated servers

See merge request KartKrew/Kart!1057
2023-03-18 11:09:52 +00:00
James R
c503ef9492 Merge branch 'warn-duplicate-texture-names' into 'master'
Warn about duplicate textures in data files

Closes #456

See merge request KartKrew/Kart!1044
2023-03-18 11:09:28 +00:00
James R
8de2910dcb Merge branch 'file-fixems' into 'master'
File Fixems

See merge request KartKrew/Kart!1055
2023-03-18 11:09:11 +00:00
James R
d22f1dabf0 Merge branch 'fix-ghost-skip-ezt-itemdata' into 'master'
Fix ghosts crash in Time Attack

See merge request KartKrew/Kart!1061
2023-03-18 11:07:00 +00:00
James R
34e6ef5496 Merge branch 'special-stage-acs' into 'master'
ACS extensions for Special Stages

See merge request KartKrew/Kart!1036
2023-03-18 11:06:50 +00:00
Sally Coolatta
d83832f6e0 Fix linedef alpha in Software 2023-03-18 07:01:31 -04:00
James R
4974b04ddd g_demo.c: fix skip of EZT_ITEMDATA
blame f86f794d2
2023-03-18 03:41:23 -07:00
Sally Coolatta
c7fa8fc2bc Spec 500 uses the same speeds as other scrollers 2023-03-18 02:35:26 -04:00
Sally Coolatta
d4e1c6cd84 Remove p_sight assert
It's already returning false for an almost identical case. Just return false.
2023-03-18 01:27:32 -04:00
toaster
104f41f4a9 Annoying little bonus: Fix ghostly bot bodies in singleplayer Prisonbreak from command line not getting discarded
This happens ALL THE TIME while I'm testing CDSS1 remaster direct from ZB, and this is essentially the CDSS1 remaster branch
2023-03-18 00:52:27 +00:00
toaster
5232da8f24 HUD tracking polish
Inexplicably, all positional checks were inverted.
This wasn't causing too many problems because the onScreen condition was inverted too, but if it would be above your screen on the opposite side of you, it would be considered onscreen when facing 180 degrees away perfectly.
By swapping viewx/y/z and point->x/y/z, and inverting onScreen, we kill this annoying lack of polish for good.
2023-03-18 00:25:22 +00:00
toaster
81e880464a CD Special Stage UFO changes
- MT_CDUFO is now a valid type of Prison in Prison Break
    - Tracked on counter
    - Tracked on HUD
    - Tracked on minimap
- P_AddBrokenPrison in p_inter.c
    - Generalises behaviour on breaking a Prison Break object
- MT_CDUFO polish
    - Can now be broken with all damaging objects EXCEPT Shield Orbinaut/Shield Jawz
        - These two are exceptions to prevent them from denying you your on-contact item grab., which these will still give you if you touch them
    - Breaking the object by touching it now causes hitlag instead of fireworks
        - The fireworks were to make touching it feel good... but hitlag feels better :P
    - Now supports mapobjectscale directly.
    - Scaled 1.5x mapobjectscale
    - Hitbox now far closer to actual sprite (which was just replaced, but was inexplicably far away from the old one too)
2023-03-18 00:22:44 +00:00
toaster
fcfaf1321c Flame shield polish
- MT_FLAMESHIELD: Flicker dispoffset depending on whether frame is supposed to be behind or in front of player
- MT_FLAMESHILEDUNDERLAY: Use P_SpawnMobjFromMobj to match interpolation coordintes, any other relevant properties, etc
2023-03-17 21:31:50 +00:00
toaster
a134465e65 S3K Shields: remove splitscreen-dependent mobj position behaviour
Was especially egregrious for bubble shield, which literally has a hitbox and could've caused live desync.
2023-03-17 21:27:19 +00:00
SteelT
e5b595b846 Fix scrambleremoved not being registered for dedicated servers 2023-03-17 15:22:47 -04:00
James R
4a7e72482d Merge branch 'prisons-sound' into 'master'
Prison hitconfirm sound even in Time Attack

See merge request KartKrew/Kart!1056
2023-03-17 06:26:15 +00:00
James R
ba23836fc1 Merge branch 'f9-f10' into 'master'
Turn F9 into a dedicated WebM button, add F10 as "lossless recording" button

See merge request KartKrew/Kart!1045
2023-03-17 06:25:50 +00:00
James R
666837c620 Call R_PrintTextureDuplicates on I_Quit too
Fixes crash from thread terminating if the program exits
before the title screen.
2023-03-16 23:23:16 -07:00
Sally Coolatta
fd9ad6e17d Fix overlap for ACS_Execute args 2023-03-17 01:52:25 -04:00
Sally Coolatta
5332bff0aa Fix Sector_ToggleWaypoints crash 2023-03-17 01:31:53 -04:00
James R
6d43670673 Move R_PrintTextureDuplicates call to F_TitleScreenTicker 2023-03-16 05:39:27 -07:00
toaster
3d786646bf Merge branch 'fix-sneaker-ufo' into 'master'
Reset stacked sneaker counter when hitting UFO

See merge request KartKrew/Kart!1043
2023-03-16 12:14:21 +00:00
toaster
5c4044a943 Merge branch 'ufo-stumble' into 'master'
Non-damaging UFO-player collision

See merge request KartKrew/Kart!1042
2023-03-16 12:14:04 +00:00
toaster
acfd7855c8 Merge branch 'sliptide-improvements-improvements' into 'master'
More lenient minimum wavedash time

See merge request KartKrew/Kart!1052
2023-03-16 12:13:31 +00:00