James R
8921a6fa96
Merge branch 'combob2' into 'master'
...
combob2
Closes #212
See merge request KartKrew/Kart!546
2022-02-17 05:04:33 +00:00
Sally Coolatta
39da886447
Merge branch 'master' into invinc-color-fix
2022-02-16 23:01:23 -05:00
Sally Coolatta
a750fdd810
Invincibility wasn't using K_RainbowColor anymore, what the function was designed for...
2022-02-16 23:01:07 -05:00
toaster
0b97d954ad
Tested with Chengi at one point, correct a few things from that.
...
* Fixed a few prints happening on resync that shouldn't.
* Fixed OGL loading not using levelfadecol.
2022-02-16 23:23:14 +00:00
James R
e28e67f84d
Fade out POSITION music at 3 2 1
2022-02-15 15:53:56 -08:00
James R
9095261a18
POSITION music
...
Play SA2 "shwing" at title card; play POSITION music once
camera is steady (instantly in 1v1).
Encore: play portal warp sound instead of "shwing"; play
portal drone instead of POSITION music, always start
instantly.
2022-02-15 15:51:47 -08:00
James R
62b5f9c90f
Leave introtime at 3 for 1v1
...
Preticker uses up a few tics, so setting it to 0 makes it
useless.
2022-02-15 15:38:11 -08:00
James R
418156bebf
Use float value for LOOPMS
...
Extra precision.
2022-02-15 14:19:28 -08:00
James R
f749424de7
Turn kstart into sfx
2022-02-14 15:04:30 -08:00
toaster
6d851f2bc8
P_LoadLevel is a mess, but attempt to fix a few things that shouldn't be happening with resyncs, including #209 . Untested.
2022-02-14 15:43:56 +00:00
toaster
42919044e9
Don't continue ticking the cecho timer infinitely into the negatives ( resolves #219 )
2022-02-14 14:52:04 +00:00
toaster
9ef2530e54
Fix HUD tracking being broken in non-green aspect ratios.
2022-02-14 14:42:31 +00:00
toaster
54cd540e5b
Fix the chat underlay being physically seperated from the chat text in non-green resolutions.
2022-02-14 14:41:34 +00:00
toaster
006b6f00ac
Rewrite the awayview reset for both Got_Teamchange and P_SpectatorJoinGame.
2022-02-11 12:09:00 +00:00
toaster
913610b1b7
Fixed P_RestoreMusic using displayplayers instead of local players (did not use any of the functions directly and so was missed).
2022-02-11 10:38:16 +00:00
toaster
03a47cfb5a
Prevent using a grow while invincible resetting the invincible music timer, when that SHOULDN'T be touched and will be set to grow properly once that's over.
2022-02-11 01:13:38 +00:00
toaster
4567d9c57f
Fix allowteamchange (although this code wasn't being run, it still SHOULD return early...)
2022-02-11 00:35:11 +00:00
toaster
93e4ef0ef1
Permit players to not bounce when colliding with ML_NOTBOUNCY walls (imperfect but better than the LITERALLY NO SUPPORT that was there beforehand)
2022-02-10 00:06:47 +00:00
toaster
8f4e8a4953
can't believe i messed up the brackets this bad, woops
2022-02-09 23:43:06 +00:00
toaster
c3e9eceda2
* Instead of checking for a player moving up, check for a player moving up that's only JUST been tumbled.
...
* Remove the DMG_WOMBO flag from PVP touch damage tumbles as that was restricting tumble combos in this branch, not allowing it.
2022-02-08 21:38:24 +00:00
toaster
c8517007c6
Only disable downloads in TESTER builds and -nodownload, not always.
2022-02-03 22:03:04 +00:00
toaster
ef7655d2e8
Fix a tables error with DMG_STEAL in Lua/SOC resolving to the wrong flag value.
2022-02-03 19:51:58 +00:00
toaster
766fce5857
Make some adjustments to the damage combo system for players.
...
* Prevent a player that is moving upwards from being DMG_TUMBLE'd again (resolves #212 ).
* Instead of having a special case for missiles there, make PIT_CheckThing toggle DMG_WOMBO instead.
* Allow hard hits (DMG_TUMBLE, DMG_EXPLODE, and DMG_KARMA) to have combos toggled off with DMG_WOMBO, too.
2022-02-03 19:51:17 +00:00
James R
0f4feb0161
Fix in game downloader confirmation
2022-01-28 04:43:18 -08:00
toaster
2e54e38607
Diagnose itemamount underflows easier (show the empty box and number if nonzero count but zero item type)
2022-01-25 17:02:19 +00:00
toaster
3f71251fd6
Fix a correctly timed Thunder Shield preventing you from using rings ( resolves #220 )
2022-01-24 23:19:35 +00:00
toaster
7508e0e198
P_IsLocalPlayer changes
...
This is the function that controls whether a bunch of music-related function (and also whether certain error messages get printed).
* P_IsLocalPlayer now supports party players (currently untested, but the code is pretty airtight).
* P_IsLocalPlayer now always returns false in replays.
* P_IsMachineLocalPlayer now exists for the one situation the game determines local players that actually has a net-related function (kicking illegal character changes).
* Invincibility/grow sfx now operates based on whether the player is NOT local (it used to be whether it was NOT a displayplayer).
* Refactored P_SpectatorJoinGame to make future team support easier, and also reset the relevant camera focus, rather than always the consoleplayer's.
* Fix viewpoints on non-local players having overlapping viewpoint text.
2022-01-24 22:03:40 +00:00
toaster
4b1cef0f20
Merge branch 'testers' into 'master'
...
Allow TESTERS builds to be made for any branch
See merge request KartKrew/Kart!529
2022-01-23 22:48:48 +00:00
toaster
2df53dd5a5
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into votefree
2022-01-23 22:46:11 +00:00
toaster
f69f002d17
Merge branch 'speedometer-default' into 'master'
...
Turn on speedometer by default
Closes #218
See merge request KartKrew/Kart!539
2022-01-23 22:43:49 +00:00
toaster
3823feb7d6
Merge branch 'director-cam' into 'master'
...
Automatic spectator "director" cam
See merge request KartKrew/Kart!537
2022-01-23 22:43:25 +00:00
AJ Martinez
337f7ebd27
Merge remote-tracking branch 'origin/master' into director-cam
2022-01-23 15:38:25 -06:00
AJ Martinez
ef6ff846d3
Merge branch 'master' into 'director-cam'
...
# Conflicts:
# src/d_netcmd.h
2022-01-23 15:38:14 -06:00
toaster
e7108cfde1
Resolve the replay crash issue :mike:
...
(Also no longer mess around with moving flags into booleans per my comment)
2022-01-23 21:35:29 +00:00
toaster
1ae256887e
Readd CV_SAVE per Oni request in vc (and also my desires)
...
Made using web IDE
2022-01-23 20:49:29 +00:00
toaster
28ee382587
ok this was supposed to be here
2022-01-23 20:40:59 +00:00
toaster
8c3fad058d
* Fix the Z_Free double-free issue (in two different ways, one ifdef'd out) that can sometimes occur on the vote screen.
...
* Fix a technically invalid read in D_SetupVote.
* If the third map on the voting screen has a different gametype, don't interact with the buffer.
* Fix the inttime 0 setting, since I was in y_inter.c and testing quick map changes.
2022-01-23 20:33:27 +00:00
SteelT
dbacdb4e63
Merge branch 'hitlag-flags' into 'master'
...
Hitlag flags
See merge request KartKrew/Kart!541
2022-01-23 19:02:43 +00:00
SteelT
fefb012134
Merge branch 'tripwire-both-sides' into 'master'
...
Consistently easy tripwire
See merge request KartKrew/Kart!540
2022-01-23 19:01:56 +00:00
SteelT
7dc6542a4f
Merge branch 'thing-bright-override-colormap' into 'master'
...
Fix OGL semibright and ignore colormap for fullbright/semibright/fulldark
See merge request KartKrew/Kart!538
2022-01-23 19:01:44 +00:00
SteelT
a793af47c5
Merge branch 'grow-shrink-shoe-polish' into 'master'
...
More extremely scaled grow & shrink players!
See merge request KartKrew/Kart!534
2022-01-23 18:59:39 +00:00
SinnamonLat
fafcf307d2
Add combo to bubble shield
2022-01-23 18:02:56 +01:00
SinnamonLat
14961f6127
Let ThunderShield combo players
2022-01-23 17:58:08 +01:00
SinnamonLat
d55e23d767
Add DMG_WOMBO to all player contact damage
2022-01-23 17:52:31 +01:00
SinnamonLat
2bc6a72c56
MF_NOHITLAGFORME shouldn't work on MT_PLAYER
2022-01-23 13:57:11 +01:00
SinnamonLat
6567219fec
Add MF_NOHITLAGFORME to spikes and wallspikes
2022-01-23 11:50:53 +01:00
James R
b30ffea49a
Hash name lookup for textures and lumps
2022-01-22 03:18:06 -08:00
SinnamonLat
191103fec1
Fix a dumb mistake, add DMG_WOMBO to orbinauts, jawz and banana hits
2022-01-22 11:41:49 +01:00
SinnamonLat
ba9ef23b31
Add MF_NOHITLAGFORME and DMG_WOMBO
2022-01-22 10:01:24 +01:00
AJ Martinez
3ccbc5c705
avoid wasteful player_t copy
2022-01-21 02:42:16 -06:00
