Commit graph

1054 commits

Author SHA1 Message Date
James R
821fd41d70 Merge branch 'c99-pedantic' into 'master'
Switch compiler mode C90 to C99; enforce stricter standard conformance

See merge request KartKrew/Kart!554
2022-03-18 02:41:57 +00:00
toaster
6e7adedaa0 Make the Kart TICQUEUE system closer to the 2.2 BACKUPTICS system.
* Rename TICQUEUE to BACKUPTICS.
* Add CLIENTBACKUPTICS to limit the time gap players can send tics in at once
    * This likely means freezes are more possible, and this variable could be raised later, but prevents some potential duplication in the extrapolerated tic.
2022-03-14 19:24:07 +00:00
James R
82f4364eb4 pedantic: fix misc leniencies and GNU-isms 2022-02-20 03:28:22 -08:00
toaster
b158bfe37e Always stop the sounds, because we're always calling Z_FreeTags and that can lead to invalid memory. (Should fix Rai's crash) 2022-02-17 22:41:34 +00: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
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
AJ Martinez
ef6ff846d3 Merge branch 'master' into 'director-cam'
# Conflicts:
#   src/d_netcmd.h
2022-01-23 15:38:14 -06: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
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
AJ Martinez
5efd706d3b general post-review unfuck 2022-01-20 15:23:32 -06:00
Sally Coolatta
38e741af76 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:57:08 -05: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
James R
d06355018d Track skybox within player struct
TODO: Lua

Splitscreen and change viewpoint uses the proper skyboxes!
2022-01-17 22:46:01 -08:00
James R
fc103834af Cache terrain on levelflats 2022-01-11 22:49:01 -08:00
Sally Coolatta
c606e1e96b Force shrink can be toggled individually online
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-01-09 04:08:26 -05:00
James R
5da3dd94c0 Disable titlecard fade on join 2022-01-05 21:24:31 -08:00
James R
66094ec72d Replays: use git commit in DEVELOP, version string in release 2021-12-20 01:20:17 -08:00
James R
fa691c0ee4 Create folder with branch name when saving replays 2021-12-18 22:31:33 -08:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
Sally Coolatta
04c1a9dcb1 Brightmaps on walls 2021-12-16 09:40:14 -05:00
Sally Coolatta
b3d3135c58 Instead of embedding specific textures to be tripwire in hardcode ... make it a TERRAIN flag! 2021-12-09 15:54:22 -05:00
James R
54aaf6d98e Apply tripwire effect to TRIPWIRE and 4RIPWIRE 2021-11-28 16:23:37 -08:00
James R
0e6bb75230 Check TRIPWIRE texture at map load
So it can be animated.
2021-11-28 04:08:38 -08:00
Sal
f55605f2f8 Merge branch 'zdebug-always-on' into 'master'
ZDEBUG is default

See merge request KartKrew/Kart!434
2021-05-27 12:47:38 -04:00
Latapostrophe
f2f0a6cbe2 New titlecards 2021-04-30 18:11:36 +02:00
Sally Coolatta
44ed9fcd4c ZDEBUG is default
- ZDEBUG2 is now ZDEBUG ... although admittedly, it doesn't seem that useful, it just enables some CONS_Debug's ... but now there's a convenient way to enable them now I suppose
- Mostly just means the I_Errors give __FILE__ and __LINE__.
- Also enables a "memdump" command that just prints a bunch of zone memory info.

I don't think any of this should be guarded, so I went ahead and did this.
2021-04-26 14:49:45 -04:00
Sally Coolatta
e5d899412c FIX PARTIES 2021-04-23 03:53:35 -04:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
toaster
ebe38ff518 * Add a blend field to FOFs.
* Set via a fourth digit in the upper midtexture for transparent FOFs
        * For example - #2551 is additive solid, #1282 is subtractive half...
    * The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
2021-04-01 23:45:21 +01:00
katsy
f314bb73ef Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
katsy
9396edb245 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
James R
e18a3a1be0 Multiply thing scale by mobjscale 2021-03-01 22:04:13 -08:00
Sally Coolatta
1619efec82 Make it past kart & mixer files 2021-03-01 01:13:03 -05:00
Sally Coolatta
caa5314866 Get past some taglist stuff 2021-02-28 22:58:30 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sal
5ee4680c04 Merge branch 'skyswapping' into 'master'
Fixed Change Sky linedef type crashing the game (resolves #118)

Closes #118

See merge request KartKrew/Kart!387
2021-02-18 18:55:31 -05:00
Sal
cd57c0fefc Merge branch 'oop-starttime' into 'master'
"starttime" order of operations

See merge request KartKrew/Kart!374
2021-02-18 18:33:47 -05:00
toaster
7fb44bdb02 Tweakmaps!
Literally identical to Encore remapping, but *only applied when Encore mode is OFF*. Long-requested by Oni, and allows you to reuse textures and skies from other stages without having to duplicate them in different colours.
2021-02-17 10:21:58 +00:00
toaster
4efd1fdc8c minor typo 2021-02-16 17:16:22 +00:00
toaster
ac0e291db6 Fixed Change Sky linedef type crashing the game.
It was changed during v2 indev to operate off textures supplied rather than offsets. Unfortunately, she didn't bank on the 2.2 merge making it so that only linedefs of specific types would generate the necessary `->text` string from their texture fields. This branch corrects that issue, along with a bonus null-avoidance in P_SetupLevelSky just in case someone messes up the source linedef.
2021-02-16 17:08:49 +00:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
Sally Coolatta
e2dcc35bcd Reset properties on map load 2021-02-12 20:25:03 -05:00
Sally Coolatta
10319386c2 Do starttime calculation on second tick instead
Attempts to fix replays & adding bots.
2021-02-11 20:25:22 -05:00
Sally Coolatta
75dd970adc Beam objects
Place 2 to arbritrarily place the line anywhere. For sprint maps.
2021-02-05 01:58:34 -05:00
Sally Coolatta
90ca38acb0 Store where the finish line beam should be displayed
Instead of figuring out where it should be every tick while it's visible, store where it'll be at the start of the map.

Also moved finish line beam into a new file, k_race.c/h, for any Race-specific code.

A few unused variables for sprint map support later too
2021-02-05 01:24:23 -05:00