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
18446 commits 1 branch 12 tags 205 MiB
Commit graph

1044 commits

Author SHA1 Message Date
SinnamonLat
7d342aed9b Fix conflict in Sourcefile 2021-12-18 08:20:04 +01:00
Sally Coolatta
04c1a9dcb1 Brightmaps on walls 2021-12-16 09:40:14 -05:00
James R
a64263c96d Merge remote-tracking branch 'origin/master' into new-menus 2021-12-03 14:56:48 -08: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
toaster
b4af07ffed Merge branch 'master' into new-menus 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
 2021-10-18 01:18:37 +01: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
Sally Coolatta
d627da7510 Fix lap executors not happening, and also edit it so they act like Each Time rather than Once 
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
 2021-02-01 14:34:48 -05:00
LJ Sonic
05a75758ab Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
Sally Coolatta
a14cf1f029 Merge branch 'master' into new-menus 2021-01-10 21:31:09 -05:00
Jaime Ita Passos
7367316c06 Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
Nev3r
0b6585b51d Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway). 2020-12-01 19:44:58 +01:00
Nev3r
f17cae1b5d Follow GZDoom's convention for stringargs. 2020-12-01 18:35:24 +01:00
toaster
762dfd3063 When resuming from a rewind, don't: 
* run wipes again
* run titlecards again
* stop the music
 2020-11-28 12:31:16 +00:00
Jaime Ita Passos
0a4a988a33 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Jaime Ita Passos
82b11c224a Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R
01e232ac3b Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
Nev3r
003f46c18e Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
c22dbe1d2e rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Nev3r
f94d9825b4 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
4f5d6f6197 Merge branch 'write-thingies' into 'next' 
The lump is not needed for P_WriteThings

See merge request STJr/SRB2!1231
 2020-11-08 20:35:51 -05:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
LJ Sonic
ebfa4aafbc Merge branch 'resend-gamestate' into 'next' 
Resend gamestate when resynching

See merge request STJr/SRB2!829
 2020-11-07 13:14:32 -05:00
James R
972b0c084e The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Monster Iestyn
41d8bc8020 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00