Commit graph

185 commits

Author SHA1 Message Date
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
3e93180d3d Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
TehRealSalt
d82fa7eb60 Merge branch 'v1' into no-limits 2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
wolfs
ab8006ea1d Merge branch 'md3-vanilla-kart' into 'next'
MD2/MD3 support rewritten + optimizations [GCC port]

See merge request KartKrew/Kart-Public!19
2019-04-30 15:22:30 -04:00
James R
6a5bb9f23f Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-04-18 23:50:29 -07:00
TehRealSalt
a3d2b48329 Fix up more stuff
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
7253f0e499 Strip out things that limit wad files added by filename 2019-04-17 23:09:10 -05:00
fickleheart
25f55b6351 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
fickleheart
25ff05fdd0 Add demo rewinding
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
c466412902 Begin work on playback menu 2019-04-05 02:38:48 -05:00
Monster Iestyn
4f58d00eec Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
James R
7ebf19fd00 Don't close console when starting title screen 2019-03-26 13:05:19 -07:00
James R
841daf940f Don't close console when changing map 2019-03-26 13:04:11 -07:00
fickleheart
91868fc3a4 Allow entering a title for replays on save 2019-03-24 22:40:52 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
f162dc0270 Use demo title as filename for multiplayer replays 2019-03-24 20:36:22 -05:00
wolfy852
963cbf4671 Merge branch 'next' into md3-vanilla-kart
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
fickleheart
ba6975607a Move modified check on -file addons later in startup 2019-03-10 19:44:31 -05:00
wolfy852
f526955783 Fix the game getting flagged as modified by default
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
2019-03-10 19:27:45 -05:00
wolfy852
a24fe5e22d Attempt to fix replaced maps not marking the game as modified
What this ACTUALLY does is mark the game as modified by default.
2019-03-10 18:55:55 -05:00
fickleheart
acf1827d9e Handle capslock in just one place...? 2019-03-09 16:55:18 -06:00
fickleheart
1da3d7cc48 Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
wolfy852
736bc77330 Incomplete: Split files added with -file into their own array
Compiles with no errors but the game errors on launch. With no files added, it gives "W_InitMultipleFiles: no files found". With files loaded via -file it gives "W_GetNumForName: PLAYPAL not found!"
2019-02-16 08:16:56 -06:00
james
66af5ce558 Do not start sound system when disabled 2019-02-06 17:24:13 -08:00
Steel Titanium
34920c2951 Setup the tables even eariler.
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
toaster
0eca0e6613 Turns out modifiedgame was getting set during startup because of making it use G_SetGameModified. Uh, woops? 2019-01-18 13:01:40 +00:00
toaster
4a87838f06 * Refactor all instances of majormods = true; to route through G_SetGameModified, and catch a few spots I missed in the process.
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
toaster
0037f5c91d First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master. 2019-01-15 19:01:55 +00:00
mazmazz
aae6eb945d Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart 2019-01-10 22:08:37 -05:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
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
716ce5c343 Merge remote-tracking branch 'next' into merge-srb2 2019-01-06 02:02:33 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -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
mazmazz
8877d888cb Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00