thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
20009 commits 1 branch 12 tags 205 MiB
Commit graph

20009 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
b6b7d7a93e Don't thrust orbinauts while airborne 
Fixes bonking against a wall transfer.
 2022-09-23 20:10:05 -07:00
James R
5f8901b033 Apply wall transfer to any object 2022-09-23 20:09:25 -07:00
Oni
70cfe6a228 Merge branch 'trick-fail-lose-drug-items' into 'master' 
Drop items being dragged behind you, like orbinaut shields, when failing a trick

See merge request KartKrew/Kart!696
 2022-09-24 02:57:45 +00:00
Sal
708012b35c Merge branch 'more-flats' into 'master' 
Allow smaller flat sizes

See merge request KartKrew/Kart!698
 2022-09-24 02:52:53 +00:00
Sal
6b354bf251 Merge branch 'menu-jams' into 'master' 
Menu jammin

See merge request KartKrew/Kart!699
 2022-09-24 02:38:56 +00:00
James R
ac55987d6b Merge branch 'oldcmd' 2022-09-23 19:32:38 -07:00
Sal
e9a87aaa43 Merge branch 'cycle-command' into 'master' 
Toggle cvar between multiple values

See merge request KartKrew/Kart!688
 2022-09-24 02:31:36 +00:00
AJ Martinez
3501ca7976 Match gate animation to Chengi's new visuals 2022-09-23 17:44:22 -07:00
toaster
75c8749939 Menu jammin 
- Menu uses one of three songs (already in music.pk3)
- Cycles between them every time you return to the title screen after starting a map
- Console-accessible. Do what you want
 2022-09-23 22:58:51 +01:00
Sally Coolatta
362bef7b3a Add new gate sounds 2022-09-23 17:19:15 -04:00
Sally Coolatta
0bd280a29c Fix SPB dust 
- Fix sliptide not using sliptide states
- Fix dust not dealing damage
 2022-09-23 16:44:21 -04:00
toaster
a5d0fc4123 Add newline to end of w_wad.c 2022-09-23 21:08:36 +01:00
toaster
859375ce3d Disable all staffghosts code since the lumpname stuff needs addressing (but that'll come later) 2022-09-23 21:08:26 +01:00
Sally Coolatta
8b160a996b SPB circles in place if it goes past on accident 2022-09-23 16:00:35 -04:00
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
Sally Coolatta
e202f244b9 Allow smaller flat sizes 
With mobj scale, smaller flats are pretty reasonable to want to use. Fixes a visual bug in Endless Mine.
 2022-09-23 15:25:42 -04:00
Sally Coolatta
117d791424 Merge branch 'master' into cheats-streamline 2022-09-23 14:38:54 -04: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
Sally Coolatta
cb54d9bb30 Use PR_ITEM_RINGS in P_PlayerRingBurst 2022-09-23 11:55:15 -04:00
Sally Coolatta
4952a2d2ae Merge branch 'master' into new-spb 2022-09-23 11:41:53 -04:00
Sally Coolatta
569021ba91 Update item debris for rng states 2022-09-23 11:30:10 -04:00
Sally Coolatta
d582cf0a3f Merge branch 'master' into rng-states-2 2022-09-23 11:23:49 -04: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
James R
c6e4a93e29 Drop items being dragged behind you, like orbinaut shields, when failing a trick 2022-09-23 06:15:19 -07: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
Sally Coolatta
e340d9b701 Remove itnext at top of MobjThinker also 2022-09-23 05:54:02 -04:00
Sally Coolatta
31009264ca NULL itnext in general on removal 2022-09-23 05:51:14 -04:00
Sally Coolatta
58f56de7cc fuck you NULL targets? 2022-09-23 05:30:19 -04:00
Sally Coolatta
43fa2ec19f Merge branch 'master' into new-spb 2022-09-23 04:21:25 -04:00
Sally Coolatta
d43a5d0554 Fix unused variables 2022-09-23 04:08:07 -04:00
Sally Coolatta
21bd7bf041 Reverse SPB distance scaling 2022-09-23 04:04:05 -04:00
Sally Coolatta
2786957fef Move Obj_SPBExplode to correct place 2022-09-23 03:52:14 -04:00
Sally Coolatta
fa63c67f04 Disable shrinking items into nothing 
No one feels strongly about it, it just feels weird
 2022-09-23 03:46:56 -04:00
Sally Coolatta
13caae7a0e Shrink does not remove SPB 2022-09-23 03:41:27 -04:00
Sally Coolatta
f89d8d15c2 Properly separate SPB & Shrink cooldowns 
Also refactors some of the result -> type & amount code
 2022-09-23 03:35:18 -04: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