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

20608 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eidolon
0d49cc1768 Cherry-pick internal zlib MR from SRB2/next 
cmake: build zlib manually in internal build

See merge request STJr/SRB2!1856

(cherry picked from commit 3597957af13878854c02305a0aec5ca744209ef2)

# Conflicts:
#	thirdparty/CMakeLists.txt
 2022-12-12 13:18:17 -06:00
James R
32f747fd5a Merge branch 'voltage-damage' into 'master' 
Add voltage damage type, for Lightning Shield

See merge request KartKrew/Kart!804
 2022-12-09 04:14:31 +00:00
James R
f4a7aa487c Merge branch 'scale-smoldering-momz' into 'master' 
Mobj scale explosions smoldering rising momentum

See merge request KartKrew/Kart!803
 2022-12-09 04:14:15 +00:00
James R
70cf67bd15 Merge branch 'scale-speed-to-weight-buff' into 'master' 
Mobj scale weight buff from moving above top speed

See merge request KartKrew/Kart!802
 2022-12-09 04:13:54 +00:00
Sal
697daba74b Merge branch 'testrun-develop' into 'master' 
Start on Test Run by default, only in DEVELOP builds

See merge request KartKrew/Kart!797
 2022-12-06 10:22:44 +00:00
Sal
c5472a23f6 Merge branch 'spring-reset' into 'master' 
Reset pitch/roll on springs + trick panels

Closes #348

See merge request KartKrew/Kart!798
 2022-12-06 10:22:29 +00:00
Sal
b51769c015 Merge branch 'fix-solid-midtex' into 'master' 
Fix solid midtextures

Closes #349

See merge request KartKrew/Kart!799
 2022-12-06 10:22:16 +00:00
Sal
aa44e7682a Merge branch 'egg-capsules-solid-fix' into 'master' 
Egg Capsule fixes

See merge request KartKrew/Kart!800
 2022-12-06 10:22:00 +00:00
James R
90a4159acd Add IMON sprite definition 2022-12-05 13:45:26 -08:00
James R
cbb1f3c714 Fix NULL lump name guard for W_CheckNumForName 2022-12-05 13:06:52 -08:00
James R
3bc359e298 Mobj scale explosions smoldering rising momentum 2022-12-05 13:06:23 -08:00
James R
abdb2e3ac3 Set Lightning Shield attack to DMG_VOLTAGE 2022-12-05 13:04:47 -08:00
James R
7b2095f6a5 Scale player weight buff from speed to mobjscale 2022-12-05 13:03:46 -08:00
James R
5f42692b8f Merge branch 'S_ReducedFXSoundAtVolume-player_t-owner' into 'master' 
Use player_t parameter in S_ReducedVFXSoundAtVolume

See merge request KartKrew/Kart!790
 2022-12-05 21:00:36 +00:00
James R
c7ad1e659e Merge branch 'universal-typedef' into 'master' 
Move all typedef into one file

See merge request KartKrew/Kart!791
 2022-12-05 20:59:43 +00:00
Sally Coolatta
2140c2f616 Use P1-4 starts in Capsules Attack / Bonus Stage 
Rather than randomized Battle starts.
 2022-12-03 04:45:59 -05:00
Sally Coolatta
226cb7d736 Update capsule parts 
- The pieces do the positioning, instead of the capsule itself. This makes it so that the parts update after the capsule has applied its momentum.
- Use proper inradius instead, so the sides line up.
- Because of the above change, the capsule as a whole is bigger. This means...
- Increased hitbox again
- Changed a few of the sprites
 2022-12-03 04:25:34 -05:00
Sally Coolatta
d6bd869b92 Give Egg Capsules drop shadows 2022-12-03 03:08:44 -05:00
Sally Coolatta
e8e02058ef Bigger Egg Capsule hitbox 2022-12-02 04:21:23 -05:00
Sally Coolatta
bdbd79dd41 Fix Egg Capsule interp 2022-12-02 04:15:56 -05:00
Sally Coolatta
b62ed33655 Fix Battle mode Egg Capsules bumping 
Old vanilla-ass code for platform-like objects that is conflicting super hard with bumping / horizontal momentum. If we ever have a moving platform object this code should be brought back only for that object, and not solid objects as a whole.
 2022-12-02 03:56:15 -05:00
Sally Coolatta
dbedd66259 Fix solid midtextures 
UDMF's ML_MIDPEG == Binary's (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_MIDPEG)). This is converted in P_ConvertBinaryLinedefFlags
 2022-12-02 02:01:02 -05:00
Sally Coolatta
7794f0956e Reset pitch/roll on springs + trick panels 2022-12-02 00:27:34 -05:00
Sal
dbf11e228d Merge branch 'vsync-default-off' into 'master' 
Make vsync default to off

See merge request KartKrew/Kart!794
 2022-12-02 05:06:25 +00:00
Sal
4ae1309fd7 Merge branch 'cmake-fix-override-exe-name' into 'master' 
cmake: let SRB2_SDL2_EXE_NAME override git branch

See merge request KartKrew/Kart!796
 2022-11-30 00:55:45 +00:00
James R
3d500148cd Make Test Run the default map in DEVELOP builds 
This makes testing easy by starting the game with -server
 2022-11-29 16:54:31 -08:00
James R
ef442e06b7 cmake: let SRB2_SDL2_EXE_NAME override git branch 
SRB2_SDL2_EXE_NAME is now "" by default. Internally
defaults to ringracers.
 2022-11-28 22:02:33 -08:00
Sal
50a1dcf979 Merge branch 'cmake-overhaul' into 'master' 
cmake: Rollup of srb2-side changes

See merge request KartKrew/Kart!758
 2022-11-29 04:42:58 +00:00
SteelT
7b0361a6f2 Make vsync default to off 2022-11-28 23:05:54 -05:00
James R
404aa0b5fe Hide MT_OVERLAY with drawpickups 2022-11-27 21:19:04 -08:00
James R
479f9e4d57 S_ReducedVFXSoundAtVolume: use player_t* 2022-11-27 17:27:22 -08:00
James R
051b4f8935 Always use typedef name instead of struct name 
mobj_t instead of struct mobj_s
 2022-11-27 17:21:40 -08:00
James R
0d0310a140 typedef.h: typedef node_t 
d_net.c: rename node_t to netnode_t
 2022-11-27 17:21:40 -08:00
James R
b5310a1f68 Add typedef.h 
All typedefs for structs that were present in other header
files have been moved to here. (Except node_t because the
renderer and netcode both define node_t LOL.)
 2022-11-27 17:21:40 -08:00
Oni
bc2d4a2d83 Merge branch 'more-bot-crudules' into 'master' 
More bot crudules

See merge request KartKrew/Kart!788
 2022-11-28 01:15:45 +00:00
James R
ebd9ea579f Merge branch 'fix-499' into 'master' 
Fix linedef type 499 binary->UDMF conversion

See merge request KartKrew/Kart!787
 2022-11-27 22:14:22 +00:00
James R
8742150f2f cmake: change library link name casing 
Fixes linux mingw cross compile
 2022-11-27 03:42:43 -08:00
James R
a8ccedbbc0 cmake: remove -Waggregate-return 2022-11-27 03:27:10 -08:00
James R
63069ce710 cmake: set C std and enable pedantic warnings 
see d262190faf and cd5946be73
 2022-11-27 03:20:37 -08:00
Eidolon
93aaa77de3 cmake: disallow in-source builds 2022-11-27 02:44:11 -08:00
Eidolon
adfbdbf10d cmake: gitignore /build 
Too common of a build pattern to ignore
 2022-11-27 02:44:11 -08:00
Eidolon
9fecb93c3a cmake: disable debug symbols for openmpt 2022-11-27 02:44:11 -08:00
Eidolon
757e3650eb cmake: copy build shared internal libs to bin/ 2022-11-27 02:44:11 -08:00
Eidolon
e52a13bf39 cmake: link Rpcrt4 (for uuid) to openmpt on win32 2022-11-27 02:44:11 -08:00
Eidolon
8116edc5a1 cmake: Port misc options from Makefiles 
- DEBUGMODE
- MOBJCONSISTANCY
- PACKETDROP
- ZDEBUG
- PROFILEMODE (likely moot, dunno how profiling with cmake works
though)
 2022-11-27 02:44:11 -08:00
Eidolon
146344e7de cmake: Port warning configuration from make 
Adds SRB2_CONFIG_ERRORMODE to replace ERRORMODE too.
 2022-11-27 02:44:11 -08:00
Eidolon
d31037abc9 cmake: Remove asset hashing, CMAKE_ASSETS_DIR 
Simplifies build setup for cmake.

# Conflicts:
#	assets/CMakeLists.txt
#	src/config.h.in
#	src/sdl/i_system.c
 2022-11-27 02:44:10 -08:00
Eidolon
f0338d22d7 cmake: Use TheLartians' Ccache script on non-Win32 
Improves ccache support for Xcode
 2022-11-27 02:44:10 -08:00
Eidolon
04674ca93b Include exchndl with <> 2022-11-27 02:44:10 -08:00
James R
1dd25181a9 cmake: use SRB2_SDL2_EXE_NAME, append git branch, add SRB2_SDL2_EXE_SUFFIX 2022-11-27 02:44:10 -08:00