Commit graph

20553 commits

Author SHA1 Message Date
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
Eidolon
0677d59d51 cmake: Build all deps and static link
Overhaul cmake build
2022-11-27 02:44:10 -08:00
Oni
340d3d53fb Merge branch 'shadows-gammaless' into 'master'
Shadows Gammaless

See merge request KartKrew/Kart!775
2022-11-27 04:10:05 +00:00
VelocitOni
e147d41ad4 Merge branch 'master' into shadows-gammaless 2022-11-26 22:52:35 -05:00
Oni
ba5c42452c Merge branch 'rankings-return' into 'master'
Re-add mid-game rankings

See merge request KartKrew/Kart!779
2022-11-27 03:47:10 +00:00
Oni
f292397993 Merge branch 'restartlevel-encore' into 'master'
Restartlevel respects cv_kartencore

See merge request KartKrew/Kart!780
2022-11-27 03:36:20 +00:00
Oni
a27e14ff21 Merge branch 'case-insensitive-wads' into 'master'
Fix instances of lump searching not being case insensitive

See merge request KartKrew/Kart!783
2022-11-27 03:31:13 +00:00
Oni
c91e46f25d Merge branch 'client-vfx' into 'master'
"Reduce VFX" toggle

Closes #343

See merge request KartKrew/Kart!786
2022-11-27 03:13:15 +00:00
Sally Coolatta
530012818f Merge branch 'master' into client-vfx 2022-11-26 21:08:59 -05:00
Oni
db621c4538 Merge branch 'waypoint-fixes' into 'master'
Big Waypoint Change

See merge request KartKrew/Kart!784
2022-11-27 02:01:43 +00:00
Oni
765bdab7f1 Merge branch 'rankpass-sfx' into 'master'
Rankpass SFX

Closes #340

See merge request KartKrew/Kart!785
2022-11-27 01:57:25 +00:00
Oni
e34b4f031b Merge branch 'double-bonus' into 'master'
Multiple BonusGame support

See merge request KartKrew/Kart!781
2022-11-27 01:57:13 +00:00
Sally Coolatta
678e674d65 Disable e-brake vfx 2022-11-26 20:55:06 -05:00
Sally Coolatta
e331910fe3 Reduce VFX toggle
Can be used to disable VFX, so it can only appear if its owner is a display player. If no owner is provided, then it will be removed entirely.

Applied to most things that Ivo asked for
2022-11-26 20:12:00 -05:00
toaster
3f1ba40246 Missing gamecontrolname 2022-11-26 23:24:02 +00:00
toaster
b1adc3d27c Fix chunky gap between Kart position numbers
There's still a big gap but that's a graphics lump size issue, code wouldn't solve it
2022-11-26 22:39:27 +00:00
toaster
1999cf0509 Rank num SFX tweak
- Add new sounds at various pitches depending on position
- Don't play sound if a pass has just happened
2022-11-26 22:25:15 +00:00
Sally Coolatta
0e654aa2f9 Fix missing currentwaypoint in saveg 2022-11-26 15:27:51 -05:00
toaster
400a7b5974 Move closed chat to behind rankings HUD 2022-11-26 16:49:57 +00:00
toaster
00e28b2915 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rankings-return 2022-11-26 16:43:21 +00:00
toaster
15a51e370a Restartmap respects encore Auto too
Per jart's suggestion
2022-11-26 16:40:50 +00:00
toaster
f8c6351847 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into restartlevel-encore 2022-11-26 16:28:16 +00:00
Oni
dbb548d8ad Merge branch 'ironman' into 'master'
HOSTCODE 'ironman'

See merge request KartKrew/Kart!745
2022-11-26 11:56:11 +00:00
Sally Coolatta
eef87c4676 Remove even more code dupe from p_sight.c 2022-11-26 03:15:03 -05:00
Sally Coolatta
fdd016eafc Smarter WRONG WAY again 2022-11-26 02:51:46 -05:00
Sally Coolatta
0053cda35c Don't allow nextwaypoint to be past finish linedef 2022-11-26 02:51:46 -05:00
Sally Coolatta
cb580031ca Condense all of the P_CheckSight copy-paste
For something for my next commit
2022-11-26 02:51:45 -05:00
Sal
a3d395c72f Merge branch 'hide-items' into 'master'
drawpickups command to hide collectible items

Closes #336

See merge request KartKrew/Kart!782
2022-11-26 07:48:54 +00:00
Sally Coolatta
d5b62886d2 Change distance to finish calculation
It now calculates it from a position clamped inbetween lines formed by the waypoints.
2022-11-26 02:46:53 -05:00
Sally Coolatta
b55c67c29d Add currentwaypoint 2022-11-26 02:46:52 -05:00
James R
9abb5c0e62 Fix instances of lump searching not being case insensitive 2022-11-25 16:30:11 -08:00
James R
e2be36c343 drawpickups command to hide collectible items 2022-11-25 16:05:11 -08:00
Sal
90e3d01395 Merge branch 'waterstep-2' into 'master'
Waterstep 2

Closes #329 and #327

See merge request KartKrew/Kart!774
2022-11-25 22:42:19 +00:00
Sal
df68b87e93 Merge branch 'gremlin-fix' into 'master'
Evict the wall gremlin

Closes #326

See merge request KartKrew/Kart!777
2022-11-25 22:39:17 +00:00
Sal
6e791d5c8b Merge branch 'tm-as-struct' into 'master'
Put tm* variables into a struct

See merge request KartKrew/Kart!776
2022-11-25 22:39:04 +00:00
toaster
08a9f69ed6 Multiple BonusGame support
- Comma-separated (exactly the same as levellist)
- Not REQUIRED, you can still make cups with one or zero BonusGame entries
- Happens every (numlevels+1)/(numbonus+1) - 5 and 2 makes after rounds 2 and 4, for example
2022-11-25 22:31:55 +00:00
toaster
5b10fd8d93 Restartlevel respects cv_kartencore 2022-11-25 18:21:19 +00:00
toaster
db95e3144d Re-add mid-game rankings
- gc_rankings, bound to TAB by default
- Now a toggle, rather than a hold behaviour
- Rearrange HU_Drawer to have chat (and cecho/music credits) render over everything else (like, say, tab rankings)
- Update PROFILEVER to 2 so we can add the new control to old profiles
2022-11-25 17:59:18 +00:00
toaster
86813b96a3 Adjust how properties are handled in G_PlayerReborn a little.
For consistency, all conditionals are done when data is being preserved in local variables, not on write back to player struct.
2022-11-23 18:11:50 +00:00
toaster
c2183a626c Actually track lastfakeskin!
Tremendous whoopsie: turns out there's no code that actually saves it outside of netsync. This is now fixed.
Also now allows you to roll Eggman as your first skin, and doesn't cause immediate characterswaps for midgame joiners.
2022-11-23 18:03:27 +00:00