Commit graph

1420 commits

Author SHA1 Message Date
toaster
a6690e02fa Revert "Add flag to line slopes for copying their slopes to the other side."
This reverts commit 7f969705b4.
2022-03-27 20:46:07 +01:00
toaster
982c6d9a2e Merge branch 'boss-code-extras' into 'master'
Extra code changes for boss

See merge request KartKrew/Kart!563
2022-03-22 13:06:15 +00:00
MascaraSnake
b42715a5ca Fix offset calculation for segs that represent linedef backsides 2022-03-18 20:34:29 +00:00
toaster
5783c5aace Only load map lumps that are WADs or have no extension
# Conflicts:
#	src/w_wad.c
2022-03-18 20:31:17 +00:00
Vincent Robinson
1d7fa9e0f5 Make linedef 96 apply to tags from 97-99, but not to itself 2022-03-18 20:20:39 +00:00
toaster
78b8def506 Allow fromnetsave to be used in P_SpawnSpecialsThatRequireObjects (missed element of the level load executor fix). 2022-03-18 19:59:28 +00:00
toaster
7f969705b4 Add flag to line slopes for copying their slopes to the other side.
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 18:30:40 +00:00
toaster
3794bea729 Accidentially killed P_InitSpecials whilst handling a previous commit; correct. 2022-03-18 18:18:48 +00:00
Nev3r
65a339ec12 Fix the equation constant fields not being filled properly. 2022-03-18 17:54:13 +00:00
Nev3r
c7b7079ec6 Let equation slopes be read from textmaps. 2022-03-18 17:54:03 +00:00
toaster
dd8acd4c61 Initialize slopes before the map loads.
# Conflicts:
#	src/p_setup.c
#	src/p_slopes.h
2022-03-18 17:53:45 +00:00
sphere
167d30efc2 Ignore a linedef tag of 0 when using linedef action 96. 2022-03-18 17:22:28 +00:00
toaster
1289e08887 Enhance the multitagging functionality added in previous commits.
* Flattened version of commits from SRB2 repository's flarn2006:multitagging_plus/merge request 1524.
* New linedef special 96: "Apply Tag to Tagged Sectors".
* New flags for linedef specials 97-99
2022-03-18 17:06:22 +00:00
toaster
9deeb79ac4 My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit
# Conflicts:
#	src/p_setup.c
2022-03-18 16:58:00 +00:00
toaster
5fa9ba1be0 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook
# Conflicts:
#	src/p_setup.c
2022-03-18 16:56:39 +00:00
toaster
487103bc47 Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros.
Declare the position counters inside the for loops instead; RIP C90.

# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
2022-03-18 16:43:03 +00:00
toaster
5ac3709d43 make a few messages more helpful
# Conflicts:
#	src/d_clisrv.c
2022-03-18 16:27:48 +00:00
toaster
19a4ef23c2 Add more actions for slope copying & update the ZB config.
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 13:32:48 +00:00
toaster
857330f74f Add linedef specials for multitagging in binary maps
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 13:16:55 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
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
James R
93bd404072 Incorporate few more instances of Z_Free NULL no-op 2022-03-17 12:17:51 -07:00
toaster
8de92e8dca Merge branch 'master' into boss
# Conflicts:
#	src/k_bot.c
2022-03-17 16:58:42 +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
toaster
31db72256d Merge branch 'master' into boss
# Conflicts:
#	src/y_inter.c
2022-03-12 19:24:23 +00:00
toaster
9fe2184c08 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into fast-addfile 2022-03-12 17:39:18 +00:00
toaster
bf43784d22 This is a doozy...
HUD:
* Miniaturised Spheres and Emeralds HUD for 3P/4P.
* Repair 3P minimap.
* Move accessibility icons in 3P/4P to next to the lap/bumper sticker (currently only kickstartaccel exists)
* Change language on menu retry to be more generalised.
* Adjust HUD code structuring a bit.

MECHANICAL:
* Now correctly set number of bumpers in Break the Capsules to 1 (from 3).
* The above required reworking K_SpawnBattleCapsules into K_BattleInit, which is a good staging ground to handle more battle-specific setup in future.
* Do not spawn Emeralds or Sphereboxes in Break the Capsules.
* If everyone is WANTED... nobody is.
* Try to handle exceptions to timelimits a little more thoroughly (still not perfect).
* Disable pointlimits in bosses.
2022-03-05 22:31:43 +00:00
toaster
61577e5026 * Re-enable kickstartaccel in battle.
* Add a little "ding" sound and HUD dorito bounce when your kickstartaccel reaches max, so you can let go of accelerate/know when you need to tap to stop.
* Make the name on top of the boss healthbar only show up once the titlecard is over.
* Properly reset boss healthbar fill between maploads.
2022-03-01 18:18:01 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +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
SinnamonLat
3deba803ae Conflicts from merging profiles back 2022-02-15 01:38:43 +01: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
James R
6e08e67986 Copy tripwire texture to opposite side and automatically mirror texture alignment 2022-02-14 14:29:54 +01:00
James R
3759f88cb3 Check both front and backside for tripwire 2022-02-14 14:29:54 +01:00
Sally Coolatta
fd7c377043 Force shrink can be toggled individually online
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-02-14 14:29:50 +01:00
AJ Martinez
8c28b094a1 general post-review unfuck 2022-02-14 14:27:31 +01:00
James R
196dc77e6f Track skybox within player struct
TODO: Lua

Splitscreen and change viewpoint uses the proper skyboxes!
2022-02-14 14:26:43 +01:00
James R
43bd6cd664 Replays: use git commit in DEVELOP, version string in release 2022-02-14 14:26:43 +01:00
James R
912f9eaa15 Create folder with branch name when saving replays 2022-02-14 14:26:43 +01:00
James R
11dee8d25e Cache terrain on levelflats 2022-02-14 14:26:41 +01:00
James R
c68e8fac97 Disable titlecard fade on join 2022-02-14 14:26:41 +01:00
Sally Coolatta
867ddb143d Instead of embedding specific textures to be tripwire in hardcode ... make it a TERRAIN flag! 2022-02-14 14:26:04 +01:00
toaster
87d797a45a Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
# Conflicts:
#	src/Sourcefile
#	src/d_main.c
#	src/m_menu.c
#	src/v_video.c
#	src/v_video.h
2022-02-14 13:10:36 +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