Commit graph

18662 commits

Author SHA1 Message Date
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
James R
f10aa9645b Few more instances of fullbright colormap nullification 2022-01-20 23:39:58 -08:00
James R
b23c4abb83 Copy tripwire texture to opposite side and automatically mirror texture alignment 2022-01-20 21:52:10 -08:00
James R
6063a6eab8 Check both front and backside for tripwire 2022-01-20 21:51:47 -08:00
James R
223ef50acb Enable percentage speedometer by default; do not save 2022-01-20 20:07:52 -08:00
AJ Martinez
07498a122a clarify potential footgunnery in K_UpdateDirector 2022-01-20 16:00:51 -06:00
AJ Martinez
9366049c89 fix low-confidence switch behavior 2022-01-20 15:56:36 -06:00
AJ Martinez
daabde0981 fix double speed attack transfers 2022-01-20 15:35:26 -06:00
AJ Martinez
3ce1f71230 how is static formed 2022-01-20 15:29:13 -06:00
AJ Martinez
ef3ae2044a appease linker wrt internal functions 2022-01-20 15:26:32 -06:00
AJ Martinez
5efd706d3b general post-review unfuck 2022-01-20 15:23:32 -06:00
toaster
66d8989531 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into testers 2022-01-20 19:29:10 +00:00
toaster
93dfbf382c The "free" changes from framezero - the crash fixes that have no complexity and therefore no negative consequence to introduce 2022-01-20 19:27:02 +00:00
toaster
df1e808b6e Semibright has colormapping again 2022-01-20 19:14:44 +00:00
toaster
334d25d3ab Merge branch 'ld-460-ringlock' into 'master'
Linedef type 460: Don't award rings while SPB-locked

Closes #205

See merge request KartKrew/Kart!536
2022-01-20 18:36:34 +00:00
James R
26d231c43a Only ignore colormap for fullbright 2022-01-20 05:09:39 -08:00
AJ Martinez
5d3fb30a07 tabs, thank you vscode for not reading the room 2022-01-20 06:56:07 -06:00
James R
8a2be85563 Include k_director.h 2022-01-20 04:50:11 -08:00
James R
ecc3d031df Ignore colormap when overriding thing brightness 2022-01-20 03:57:58 -08:00
James R
ff70bd0d83 Fix opengl semibright
Adds back 3d models semibright.
2022-01-20 03:52:32 -08:00
AJ Martinez
24b05451f6 my workflow is beyond your understanding 2022-01-20 03:39:00 -06:00
SteelT
606eb28314 Linedef type 460: Don't award rings while SPB-locked 2022-01-20 03:20:53 -05:00
AJ Martinez
1e4bc482d0 very small tiny fixes 2022-01-20 02:07:48 -06:00
AJ Martinez
e949e3afb4 Write the rest of the owl 2022-01-19 23:56:23 -06:00
James R
b3e6030a9b Wrong condition 2022-01-19 01:17:54 -08:00
James R
8f8d34728b JUST SEARCH ALL FUCKING WADS 2022-01-19 01:17:12 -08:00
James R
ba6ee7eaa0 Do not count gfx.pk3 toward mainwads in testers build 2022-01-19 01:13:09 -08:00
AJ Martinez
be33a1b659 Director cam barebones functionality 2022-01-18 22:41:07 -06:00
Sally Coolatta
38e741af76 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:57:08 -05:00
James R
484ab4b5dc Merge branch 'fix-software-splitscreen-tilt' into 'master'
Fix splitscreen camera tilting in Software

See merge request KartKrew/Kart!531
2022-01-18 07:56:41 +00:00
James R
d67a074a01 Merge branch 'splitscreen-skybox' into 'master'
Keep track of skybox across splitscreen and change viewpoint

See merge request KartKrew/Kart!533
2022-01-18 07:56:16 +00:00
Sally Coolatta
8acdbf7df8 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:55:56 -05:00
James R
97d1a415ce Merge branch 'replay-branch-name' into 'master'
Save branch name in replay folder

See merge request KartKrew/Kart!505
2022-01-18 07:50:02 +00:00