Commit graph

19893 commits

Author SHA1 Message Date
toaster
fe2757cb44 Fix special map usage
- Free header on `CLEAR LEVELS` even if it's `tutorialmap`
- `titlemap` infinite recursion prevention Z_Free's instead of leaking
2022-09-23 20:59:02 +01:00
toaster
f5998c7624 Skip over locked maps/cups when getting nextmap
(carve out an exception for marathon mode, although we will probably want to lock that behind all cups available)
2022-09-23 20:52:51 +01:00
toaster
3dd4394d70 Correct misconception in config 2022-09-23 17:47:21 +01:00
toaster
c1dbbdf801 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers 2022-09-23 17:38:49 +01:00
toaster
3786d9a33d Update configuration
- Support new map lump ordering (THANKS STEEL FOR FINDING THESE OPTIONS!!)
- Prevent rotating waypoints causing their IDs to become corrupted
- Rename to `D3R-Config.cfg`
- Synchronise with changelog-tracked resource
- Integrate relevant 2.2 changes
- Add new credits according to historical changelogs
- A whole bunch of other cleanup
2022-09-23 17:27:57 +01:00
Sal
2890ce500a Merge branch 'pivot-default' into 'master'
Upgrade SPRTINFO -- default pivot offsets + wildcard

See merge request KartKrew/Kart!691
2022-09-23 15:19:05 +00:00
Sal
619d33d8e7 Merge branch 'double-meme-taunt' into 'master'
Don't play boost taunt twice if meme voices are enabled

See merge request KartKrew/Kart!692
2022-09-23 15:17:55 +00:00
Sal
f89526c572 Merge branch 'fix-item-roulette-drawer' into 'master'
Refactor roulette drawer code and add missing items

See merge request KartKrew/Kart!695
2022-09-23 15:17:26 +00:00
toaster
a4c73b204a Kill spstage_start and spmarathon_start 2022-09-23 13:07:59 +01:00
toaster
1538055091 Skip over empty entries when populating vres, saving memory 2022-09-23 13:03:37 +01:00
James R
3d01fca41b K_GetRollingRouletteItem: support Battle 2022-09-23 04:48:30 -07:00
toaster
8afd9b03b2 Only allow W_CheckNumForMap to return lumpnums fitting certain criteria
- For PK3, if it's a .wad
- For .wad, if it's a header (0-length)
2022-09-23 12:26:32 +01:00
James R
375fb72de1 Add K_GetRollingRouletteItem, refactor item drawers
Roulette now cycles through all single items (that have
odds). Added missing shields and drop target.
2022-09-23 04:09:32 -07:00
toaster
959bb14f59 Fix an error that used map ID when lumpname is better for debugging 2022-09-23 11:55:11 +01:00
SteelT
89a22783b6 vres_GetMap: Count resources in folders up until next 0-length lump, instead of "MAPXX"
As having named map lumps means the lump being named "MAPXX" isn't guaranteed anymore.
2022-09-22 16:05:44 -04:00
toaster
bd965ccd50 Off by one for music name default generation 2022-09-22 18:02:14 +01:00
James R
937e1d10d4 Fix -Wformat 2022-09-22 09:56:50 -07:00
toaster
cb8becb2d3 Enforce maximum length of 63 for map lumpname
Also, in g_demo.c, use SKIPSTRING (instead of READSTRINGN into a discard buffer)
2022-09-22 17:34:02 +01:00
toaster
48e9138dda Refactoring ahoy
* Instead of doing constant G_MapNumbers when finding the relationship between maps and cups...
    * Add a cache of level IDs to cups, to go with the strings.
    * Add a cache of the cup pointer to maps, so we don't have to search through all cups to find our map. (done in P_InitMapData)
    * Pre-emptive work: G_IsSpecialStage and P_GetNextEmerald now reference cup data instead of a hardcoded ID set.
* Remove a bunch of old stuff from mapheaderinfo_t/associated, and reorder what stays
    * Countdowntimer? 💥
    * Startrings? 💥
    * sstimer/ssspheres? 💥
    * forcecharacter? 💥 (distinct from forceskin)
    * interscreen? 💥
    * sstage_start/end and smpstage_start/end? 💥💥💥💥
    * You've been blocked
* G_MapNumber now returns a special NEXTMAP_INVALID if not found, for more consistent reference.
* Incorporate a good chunk of the `edit-headers` branch. Can't clear maps individually because of the new restrictions on sequential mapheaders, but we can add a "disable in vote screen, not even for map hell/archive" flag to a map at some future juncture for equivalent functionality...
2022-09-22 17:14:41 +01:00
James R
966ccdd230 Don't play boost taunt twice if meme voices are enabled 2022-09-22 06:39:45 -07:00
toaster
077b23929b Adjust P_AllocMapHeader and associated
- Prints with more info
- No weird increment/decrement
2022-09-22 12:47:59 +01:00
toaster
abb567ab81 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers 2022-09-21 23:06:24 +01:00
toaster
574cc6049f NUMMAPS is dead
Dynamically allocated mapheaderinfo. 1035 reserved slots in a google doc is a thing of the past
2022-09-21 23:01:58 +01:00
toaster
a12a29e1e5 Demos now store map lumpname rather than mapheader ID
This was the last thing we needed to do before infinite maps. Stay tuned.
2022-09-21 22:37:30 +01:00
toaster
5a813cd94d Remove mapname buffer from serverinfo_pak 2022-09-21 22:19:51 +01:00
James R
43984aebd4 Lua spriteinfo default pivot support 2022-09-21 14:15:28 -07:00
James R
0912ebaaa3 Update and extend R_ParseSpriteInfo for default pivot
- Set default pivot with DEFAULT block
- Use wildcard star (*) with Sprite/Sprite2Info/Skin to
iterate over all sprites and/or skins
2022-09-21 14:15:28 -07:00
James R
5a631b302d Add SPRINFO_DEFAULT_PIVOT, change spriteinfo_t.available to bit array
Default is used if the bit is not set for a particular
frame.
2022-09-21 14:15:28 -07:00
James R
b0f84e99fc Refactor Lua spriteinfo
Fixes available not being set when pivot list is updated
on its own.
2022-09-21 14:15:28 -07:00
toaster
60355d9efd Move two of the three remaining NUMMAPS arrays part of the mapheader_t struct
- mapvisited and recorddata_t (previously mainrecords)
- Changed how gamedata is saved and loaded
- Change the versioncheck (funny hex provided by chengi) AND call it `developringdata.dat` in develop builds
- Fix a bunch of off-by-ones in condition and emblem data
ALSO, for Time Attack:
- Fix menu not showing off your times
- Now save times even when gamedata modified, since the menu didn't care (come back to it?)
- Don't save times or do intermission screen if the Capsule Attack ended because you lost all your bumpers
- Fix a crash adding ghosts in Capsule Attack
2022-09-21 22:12:36 +01:00
James R
58bc3294fa Refactor R_ParseSpriteInfo
Splits up the function, thus makes me want to kill myself
less.
2022-09-21 12:30:29 -07:00
James R
499c61a9f2 Kill SPRITE/SPRITEINFO, SPRITE2INFO SOC headers
Kill it because maintaining three parsers for the same
data is insane.
2022-09-21 12:15:21 -07:00
toaster
b8f3e64ca1 discord.c compilation warning 2022-09-21 19:22:33 +01:00
toaster
fc9697b2e1 Repair D_StartTitle component of netgame title fallthrough prevention 2022-09-21 19:22:05 +01:00
James R
794385dd63 Merge branch 'improve-profile-apply-startup' into 'master'
Improve profile applying during startup

See merge request KartKrew/Kart!689
2022-09-21 17:08:11 +00:00
Sally Coolatta
44a742b1aa r_things.c -> r_things.h 2022-09-21 11:51:43 -04:00
Sal
cb85e23422 Merge branch 'tumble-slope-fuck' into 'master'
Stumble + Smooth Landing

See merge request KartKrew/Kart!571
2022-09-21 14:13:17 +00:00
VelocitOni
329aecd5e5 Made the circle solid for longer
Edited NUMTRANSMAPS to make it solid for 2 maps longer, adjusted fudge ANG to 15 from 10 (more visually lenient)
2022-09-21 10:12:10 -04:00
Sally Coolatta
e347fadf02 Add a fudge constant to the stumble indicator 2022-09-21 07:49:33 -04:00
VelocitOni
6d45e58425 Merge branch 'master' into tumble-slope-fuck 2022-09-21 07:04:37 -04:00
Oni
1b373cf0e8 Merge branch 'autocope' into 'master'
Offline input delay cvar

See merge request KartKrew/Kart!687
2022-09-21 10:56:22 +00:00
Sally Coolatta
1530c15db7 Fix visual not matching exact steep range 2022-09-21 02:01:38 -04:00
Sally Coolatta
3f66a8e72f Fix fast fall preventing stumble 2022-09-21 01:38:21 -04:00
AJ Martinez
51d46a2a8a Remove debug print 2022-09-20 21:32:45 -07:00
AJ Martinez
aaf18fb1cf Offline Input Delay -> Minimum Input Delay, default 0 -> 2 2022-09-20 21:29:17 -07:00
AJ Martinez
8525dfb502 Allow netgame clients to display and be affected by mindelay 2022-09-20 21:21:51 -07:00
AJ Martinez
bd83a9f3b1 Mindelay: Probably don't calculate ping outside of games period 2022-09-20 20:33:30 -07:00
AJ Martinez
ada40b421c Mindelay: Never draw ping outside of games 2022-09-20 20:29:34 -07:00
AJ Martinez
e1f72898f5 Mindelay: Update ping display even in local play 2022-09-20 20:15:02 -07:00
AJ Martinez
87b92a7127 Bump ping tiers by 1 tic 2022-09-20 20:05:00 -07:00