Commit graph

138 commits

Author SHA1 Message Date
Arthur
2b8f49fd5e Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
SeventhSentinel
a595d0ba00 Load sounds.kart after patch.kart 2019-01-05 00:33:24 -05:00
Steel Titanium
a57626f828 Clean up the comments a bit 2019-01-04 19:55:05 -05:00
Steel Titanium
d2da1db6c8 Don't increment mainwads for sounds or music.kart 2019-01-04 00:32:01 -05:00
Sal
1b02805445 Merge branch 'map-palette-titlefix' into 'next'
Fix per-map palette not being reset properly when it should.

See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Steel Titanium
4e0f4ed709 Remove double brackets 2019-01-02 13:04:56 -05:00
Steel Titanium
b63f4a66e8 Comment this out again.
How did this even get reverted...
2018-12-31 18:34:04 -05:00
Steel Titanium
26a257eda7 Better attempt at fixing this 2018-12-31 18:19:18 -05:00
Steel Titanium
de6c2a84f3 Attempt 1 to properly fix 2018-12-31 14:18:00 -05:00
Steel Titanium
fddd6fb0d5 Revert "Fix per-map palette not being reset properly on title"
This reverts commit b63e6ab325.
2018-12-31 13:35:38 -05:00
Steel Titanium
b63e6ab325 Fix per-map palette not being reset properly on title 2018-12-30 23:38:38 -05:00
TehRealSalt
6d6b6a1e6b Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt
4e532b7ae5 I like working on Kart... 2018-11-27 19:00:48 -05:00
Steel Titanium
77d12473ae Take the command line params into account
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
91f2c4f8a7 Whitespace 2018-11-25 08:17:57 -05:00
mazmazz
22d0d8cb2e Print GPL license notice and SEGA disclaimer in console on start 2018-11-25 08:12:19 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Steel Titanium
97ea1966fd Make the error less confusing 2018-11-22 22:59:46 -05:00
TehRealSalt
48f3c27625 Remove music.dta from loading
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
Sryder
9350721d12 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master'
Compiling cleanup and fixes

See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
TehRealSalt
05ebf7f30c Fix connecting w/ -splitscreen set 2018-11-08 15:24:10 -05:00
Monster Iestyn
91a44addd9 d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0 2018-11-08 20:09:00 +00:00
Monster Iestyn
7c0fb1702f D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function. 2018-11-07 21:21:36 +00:00
TehRealSalt
c7b0df8172 Merge remote-tracking branch 'srb2public/next'
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
TehRealSalt
87f767fad0 Add textures.kart, re-define DEVELOP mode,
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
TehRealSalt
aeeedc2732 Merge branch 'master' into update-version 2018-11-02 23:57:28 -04:00
Monster Iestyn
7a43272e13 Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway) 2018-10-27 18:52:34 +01:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
TehRealSalt
1e4baa1a55 Merge branch 'master' into update-version 2018-10-17 20:31:56 -04:00
TehRealSalt
c5436ee2e5 Add more hash stuff
UNFINISHED, still need to add in legitimate hashes for non-CMake builds when we've finalized the content.
2018-10-17 20:30:34 -04:00
toaster
12d67e62bc Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
2018-10-14 21:52:05 +01:00
Monster Iestyn
34728b3031 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
TehRealSalt
b5f409fcb8 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
Sryder
db332478d5 Merge branch 'skill-option' into 'master'
-skill launcher option

See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
TehRealSalt
bd812b6ece -skill launcher option
Requested by Sev(?), for map editing; sets kartspeed using the same name as Doom's difficulty launcher option
2018-10-04 23:58:44 -04:00
TehRealSalt
59c4400a60 -splitscreen launcher option
Now you can join a game in splitscreen mode from a launcher
2018-10-04 23:55:28 -04:00
TehRealSalt
3b2728054d Always move the camera
According to wolfs, this improves fps. Let's confirm, shall we?
2018-10-04 17:50:50 -04:00
toaster
d2ca0d5bfe Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
# Conflicts:
#	src/m_menu.c
2018-09-22 23:00:46 +01:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
mazmazz
23acc47b39 nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
2018-09-14 10:35:51 -04:00
mazmazz
f41ad3073d Refactoring, music statues
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused

(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
2018-09-14 10:28:29 -04:00
toaster
dfe1f865fc * Make some minor performance improvements.
* Make the I_Errors in filesrch.c more descriptive.
* Fix up the loading of sounds.kart such that it has SOME protection against being loaded with game-modifying lumps.
* SERIOUSLY fix up the MD5/mainwads++ section in D_SRB2Main, since 1) I broke it and 2) it was already a little broken in the first place but we just didn't notice it because #ifndef DEVELOP.
2018-08-29 12:50:25 +01:00
toaster
530983e435 Addons menu.
Bitch.
2018-08-28 21:08:47 +01:00
toaster
9bea5525ff Merge branch 'sonicitems' into encore
# Conflicts:
#	src/d_main.c
2018-08-11 22:37:17 +01:00
toaster
95da13071d * Fix issue with palette not getting reset when heading to intermission.
* Make map hell maps MUCH less common by ignoring all but the three most recent maps in the buffer for the random option.
2018-08-11 22:36:14 +01:00
toaster
e8c436ab76 * Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes).
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 22:23:40 +01:00
toaster
670ad8cbd1 Merge branch 'sonicitems' into encore
# Conflicts:
#	src/st_stuff.c
2018-08-10 15:35:00 +01:00